taylor 2002/07/02 19:12:31
Modified: webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm
psml-form.vm
Log:
Cleaned up the UI and added functionality for add, delete and clone
Revision Changes Path
1.2 +82 -63
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-psml.vm
Index: browser-psml.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-psml.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- browser-psml.vm 2 Jul 2002 01:25:35 -0000 1.1
+++ browser-psml.vm 3 Jul 2002 02:12:30 -0000 1.2
@@ -1,6 +1,6 @@
-<table width="50%" border="0" cellpadding="0" cellspacing="0">
+<table width="50%" border="1" cellpadding="0" cellspacing="0">
#foreach ( $entry in $psml )
- <tr>
+
#if($!entry.GroupName)
#set ($category = "Group")
#set ($catName = $!entry.GroupName)
@@ -14,99 +14,118 @@
#set ($catName = $!entry.UserName)
#set ($link1 = $jslink.setUser($catName))
#else
- #set ($category = "Not Found")
- #set ($catName = "Not Found")
+ #set ($category = "null")
+ #set ($catName = "null")
#end
-
- #set ($mediaType = $!entry.MediaType)
- #set ($language = $!entry.Language)
- #set ($country = $!entry.Country)
- #set ($blank = 1)
- #if ($prevCategory == $category)
- <td style="font-size:10"> </td>
+ #if ($!entry.MediaType)
+ #set ($mediaType = $entry.MediaType)
+ #else
+ #set ($mediaType = "null")
+ #end
+
+ #if ($!entry.Language)
+ #set ($language = $!entry.Language)
+ #else
+ #set ($language = "null")
+ #end
+
+ #if ($!entry.Country)
+ #set ($country = $!entry.Country)
#else
- <td style="font-size:10">$!category</td>
+ #set ($country = "null")
#end
- </tr>
- #if ($!catName)
- <tr>
- #foreach ($index in [1..$blank])
- <td style="font-size:10"> </td>
+ #set ($blank = 1)
+
+ #if($!entry.GroupName)
+ #set ($link1 = $jslink.setGroup($catName,$entry.Name))
+ #elseif($!entry.RoleName)
+ #set ($link1 = $jslink.setRole($catName,$entry.Name))
+ #elseif($!entry.UserName)
+ #set ($link1 = $jslink.setUser($catName,$entry.Name))
+ #end
+
+ #if ($category != "null")
+ #if ($prevCategory == $category)
+ #else
+ <tr>
+ <td style="font-size:10">$!category</td>
+ </tr>
#end
- #set ($blank = $blank + 1 )
+ #end
+
+ #if ($catName != "null")
#if($prevCatName == $catName)
- <td style="font-size:10"> </td>
#else
- <td style="font-size:10">$!catName</td>
+ <tr>
+ <td style="font-size:10"> </td>
+ <td style="font-size:10">$!catName</td>
+ </tr>
#end
- </tr>
#end
-
- #if ($!mediaType)
- <tr>
- #foreach ($index in [1..$blank])
- <td style="font-size:10"> </td>
- #end
+
+ #if ($mediaType != "null")
+ #set ($link1 = $link1.addPathInfo("mediaType",$mediaType))
#set ($blank = $blank + 1 )
#if($prevMediaType == $mediaType)
- <td style="font-size:10"> </td>
#else
- <td style="font-size:10">$mediaType</td>
- #end
- </tr>
- #end
-
- #if ($!language)
- <tr>
- #foreach ($index in [1..$blank])
- <td style="font-size:10"> </td>
+ <tr>
+ #foreach ($index in [1..$blank])
+ <td style="font-size:10"> </td>
+ #end
+ <td style="font-size:10">$mediaType</td>
+ </tr>
#end
+ #end
+
+ #if ($language != "null")
+ #set ($link1 = $link1.addPathInfo("language",$language))
#set ($blank = $blank + 1 )
#if($prevLanguage == $language)
- <td style="font-size:10"> </td>
#else
+ <tr>
+ #foreach ($index in [1..$blank])
+ <td style="font-size:10"> </td>
+ #end
<td style="font-size:10">$language</td>
- #end
</tr>
- #end
-
- #if ($!country)
- <tr>
- #foreach ($index in [1..$blank])
- <td style="font-size:10"> </td>
#end
+ #end
+
+ #if ($country!= "null")
+ #set ($link1 = $link1.addPathInfo("country",$country))
#set ($blank = $blank + 1 )
#if($prevCountry == $country)
- <td style="font-size:10"> </td>
#else
+ <tr>
+ #foreach ($index in [1..$blank])
+ <td style="font-size:10"> </td>
+ #end
<td style="font-size:10">$country</td>
- #end
</tr>
- #end
-
- <tr>
- #if($!entry.GroupName)
- #set ($link1 =
$jslink.setGroup($catName,$entry.Name).setAction("controls.Customize"))
- #elseif($!entry.RoleName)
- #set ($link1 =
$jslink.setRole($catName,$entry.Name).setAction("controls.Customize"))
- #elseif($!entry.UserName)
- #set ($link1 =
$jslink.setUser($catName,$entry.Name).setAction("controls.Customize"))
#end
-
+ #end
+
+ #set ($link1 = $link1.setAction("controls.Customize"))
+ <tr>
+ #set ($blank = $blank + 1 )
#foreach ($index in [1..$blank])
- <td style="font-size:10"> </td>
+ <td style="font-size:10"> </td>
#end
<td>
<a style="font-size:10" href="$link1">$!entry.Name</a>
</td>
- #set ($link2 =
$jslink.setPage($entry.Name,"PsmlForm").addQueryData("mode","delete"))
+ #set ($link2 =
$jslink.setPaneByName("PsmlForm").addQueryData("mode","delete").addQueryData("entityid",
$!entry.Path))
+ <td>
+ <a style="font-size:10" href='$link2'>Delete</a>
+ </td>
+ #set ($link3 =
$jslink.setPaneByName("PsmlForm").addQueryData("mode","insert").addQueryData("entityid",
$!entry.Path))
<td>
- <a style="font-size:10" href='$link2'>X</a>
+ <a style="font-size:10" href='$link3'>Clone</a>
</td>
</tr>
-
+
#set ($prevCategory = $category)
#set ($prevCatName = $catName)
#set ($prevMediaType = $mediaType)
@@ -116,9 +135,9 @@
#end
<tr/>
<tr>
- #set ($link3 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","insert"))
+ #set ($link4 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","insert"))
<td>
- <a style="font-size:10" href='$link3'>Add</a>
+ <a style="font-size:10" href='$link4'>Add</a>
</td>
</tr>
</table>
1.2 +95 -24
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/psml-form.vm
Index: psml-form.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/psml-form.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- psml-form.vm 2 Jul 2002 01:25:35 -0000 1.1
+++ psml-form.vm 3 Jul 2002 02:12:30 -0000 1.2
@@ -6,15 +6,15 @@
@version $Id$
*#
-<form method="post"
action="$jslink.getPaneByName("PsmlBrowser").setAction("portlets.PsmlUpdateAction)">
+<form method="post"
action="$jslink.getPaneByName("PsmlBrowser").setAction("portlets.PsmlUpdateAction")">
<table bgcolor="#ffffff" cellpadding="5">
- #if ($errorTemplate)
+ #if ($msg)
<tr>
<td colspan="2">
<table bgcolor="#ffffff">
<tr>
<td>
- #parse ($errorTemplate)
+ $msg
</td>
</tr>
</table>
@@ -22,31 +22,102 @@
</tr>
#end
- <tr>
- #if ($!psml)
- #set ($Name = "")
- #set ($MediaType = "")
- #set ($Language = "")
- #set ($Country = "")
- #else
- #set ($Name = $!psml.Name)
- #set ($MediaType = $!psml.MediaType)
- #set ($Language = $!psml.Language)
- #set ($Country = $!psml.Country)
- #end
- </tr>
+ #if (($mode == "delete"))
+ <tr>
+ #formReadOnlyCell ("Id" "Id" $profile.Id)
+ </tr>
+ <tr>
+ #formReadOnlyCell ("Name" "Name" $profile.Name)
+ </tr>
+ #else
+
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font face="$ui.sansSerifFonts">Name</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="30" name="Name" value=$!profile.Name>
+ </font>
+ </td>
+ </tr>
+
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font face="$ui.sansSerifFonts">Media Type</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="30" name="MediaType"
value=$!profile.MediaType>
+ </font>
+ </td>
+ </tr>
+
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font face="$ui.sansSerifFonts">Language</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="30" name="Language" value=$!profile.Language>
+ </font>
+ </td>
+ </tr>
+
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font face="$ui.sansSerifFonts">Country</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="30" name="Country" value=$!profile.Country>
+ </font>
+ </td>
+ </tr>
+
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font face="$ui.sansSerifFonts">Category Name:</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <select name="CategoryName">
+ #if ($categoryName == "group")
+ <option value="group" selected>group</option>
+ #else
+ <option value="group">group</option>
+ #end
+
+ #if ($categoryName == "role")
+ <option value="role" selected>role</option>
+ #else
+ <option value="role">role</option>
+ #end
+
+ #if ($categoryName == "user")
+ <option value="user" selected>user</option>
+ #else
+ <option value="user">user</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ #formCell ("Category Value" "CategoryValue" $categoryValue)
+ </tr>
+ <tr>
+ #formCell ("Copy From" "CopyFrom" $copyFrom)
+ </tr>
+ #end
+
</table>
-
- <table bgcolor="#ffffff" cellpadding="5" width="100%">
+ <table border="0" cellpadding="5" width="100%">
<tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- Hello
+ <td>
#if ($mode == "insert")
<input type="submit" name="eventSubmit_doInsert" value="Add Psml"/>
+ #elseif ($mode == "delete")
+ <input type="submit" name="eventSubmit_doDelete" value="Delete"/>
#end
- </td>
- <td>
- $!msg
</td>
</tr>
</table>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
