Here's a patch to add client side validation via javascript to the portlet
registry editor. I have also internationalized the portlet editor as well.
The internationalization adds quite a few new entries into the properties
file. Also, this is only 1 editor. There will be more fields/patches as I
work on validation/internationalization of the other editors.
Also, there is a couple of source code fixes to fix a minor bug that I
found.
Any comments on naming conventions for internationalized fields is welcome.
Jeremy Ford
Index:
src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.31
diff -u -r1.31 JetspeedLocalization_en.properties
--- JetspeedLocalization_en.properties 22 May 2003 17:45:18 -0000 1.31
+++ JetspeedLocalization_en.properties 30 May 2003 02:38:45 -0000
@@ -206,5 +206,61 @@
BOTTOM_SUPPORT_MSG=Support and Additional Information
+#Registry Editor Translations
+REGISTRY_EDITOR_PORTLET_TAB_INFO=Information
+REGISTRY_EDITOR_PORTLET_TAB_MEDIATYPES=Media Types
+REGISTRY_EDITOR_PORTLET_TAB_CATEGORIES=Categories
+REGISTRY_EDITOR_PORTLET_TAB_PARAMETERS=Parameters
+
+
+#Buttons
+REGISTRY_EDITOR_PORTLET_CONFIRM_DELETE=Are you sure you want do delete this portlet?
+REGISTRY_EDITOR_PORTLET_DELETE=Delete Portlet
+REGISTRY_EDITOR_PORTLET_INSERT=Insert Portlet
+REGISTRY_EDITOR_PORTLET_CANCEL=Back to Browser
+REGISTRY_EDITOR_PORTLET_UPDATE=Update Portlet
+REGISTRY_EDITOR_PORTLET_ADDMEDIATYPE=Add Media Type
+REGISTRY_EDITOR_PORTLET_REMOVEMEDIATYPE=Remove Media Types
+REGISTRY_EDITOR_PORTLET_REMOVEPARAMETERS=Remove Parameters
+REGISTRY_EDITOR_PORTLET_UPDATEPARAMETERS=Update Parameters
+REGISTRY_EDITOR_PORTLET_UPDATEPARAMETER=Update Parameter
+REGISTRY_EDITOR_PORTLET_ADDPARAMETER=Add Parameter
+REGISTRY_EDITOR_PORTLET_REMOVECATEGORIES=Remove Categories
+REGISTRY_EDITOR_PORTLET_ADDCATEGORY=Add Category
+REGISTRY_EDITOR_PORTLET_HELP=Help
+REGISTRY_EDITOR_PORTLET_PORTLETCATALOG=Portlet Catalog
+
+#Validation
+REGISTRY_EDITOR_PORTLET_MISSING_NAME=Please specify the name of the portlet
+REGISTRY_EDITOR_PORTLET_CLASSNAME_REQUIRED=The class name is a required field for
instance and abstract portlets
+REGISTRY_EDITOR_PORTLET_PARENT_REQURIED=A parent must be set for portlets that are of
type 'ref'
+
+#Fields
+REGISTRY_EDITOR_PORTLET_NAME=Name
+REGISTRY_EDITOR_PORTLET_TYPE=Type
+REGISTRY_EDITOR_PORTLET_PARENT=Parent
+REGISTRY_EDITOR_PORTLET_CLASSNAME=Class Name
+REGISTRY_EDITOR_PORTLET_TITLE=Title
+REGISTRY_EDITOR_PORTLET_DESCRIPTION=Description
+REGISTRY_EDITOR_PORTLET_URL=URL
+REGISTRY_EDITOR_PORTLET_IMAGE=Image
+REGISTRY_EDITOR_PORTLET_SECURITYREF=Security Reference
+REGISTRY_EDITOR_PORTLET_HIDDEN=Hidden
+REGISTRY_EDITOR_PORTLET_APPLICATION=Application
+REGISTRY_EDITOR_PORTLET_CACHEDONURL=Cached on URL
+REGISTRY_EDITOR_PORTLET_MEDIATYPE=Media Type
+
+REGISTRY_EDITOR_PORTLET_PARAMETER_NAME=Name
+REGISTRY_EDITOR_PORTLET_PARAMETER_VALUE=Value
+REGISTRY_EDITOR_PORTLET_PARAMETER_TITLE=Title
+REGISTRY_EDITOR_PORTLET_PARAMETER_DESCRIPTION=Description
+REGISTRY_EDITOR_PORTLET_PARAMETER_SECURITYREF=Security Reference
+REGISTRY_EDITOR_PORTLET_PARAMETER_HIDDEN=Hidden
+REGISTRY_EDITOR_PORTLET_PARAMETER_CACHEDONNAME=Cached on Name
+REGISTRY_EDITOR_PORTLET_PARAMETER_CACHEDONVALUE=Cached On Value
+
+REGISTRY_EDITOR_PORTLET_CATEGORY_NAME=Category Name
+REGISTRY_EDITOR_PORTLET_CATEGORY_GROUP=Category Group
+
# Do not translate this into other languages - test purposes only
_TEST_=Do not translate
Index: webapp/WEB-INF/templates/vm/portlets/html/portlet-category-form.vm
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-category-form.vm,v
retrieving revision 1.1
diff -u -r1.1 portlet-category-form.vm
--- vm/portlets/html/portlet-category-form.vm 4 Mar 2003 17:39:42 -0000 1.1
+++ vm/portlets/html/portlet-category-form.vm 30 May 2003 02:40:16 -0000
@@ -1,74 +1,60 @@
<table bgcolor="#ffffff" cellpadding="5">
-<tr>
-<!--
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Categories</font></b>
- </td>
--->
- <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
- #if($entry.listCategories().hasNext())
+ <tr>
+ <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
+ #if($entry.listCategories().hasNext())
<form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
- <input type="hidden" name="mode" value="update"/>
- <input type="hidden" name="portlet_name" value="$!entry.Name"/>
- <input type="hidden" name="tab" value="categories"/>
+ <input type="hidden" name="mode" value="update"/>
+ <input type="hidden" name="portlet_name" value="$!entry.Name"/>
+ <input type="hidden" name="tab" value="categories"/>
<table bgcolor="#ffffff" cellpadding="5">
- <th>Select</th>
- <th>Name</th>
- <th>Group</th>
-
-
- #foreach($category in $entry.listCategories())
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <input type="checkbox" name="category_name"
value="$category.name"/>
- <input type="hidden"
name="$!{category.name}.category_group" value="$!category.group"/>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">$category.name</td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">$category.group</td>
-
- </tr>
- #end
+ <th> </th>
+ <th>$l10n.REGISTRY_EDITOR_PORTLET_CATEGORY_NAME</th>
+ <th>$l10n.REGISTRY_EDITOR_PORTLET_CATEGORY_GROUP</th>
+ #foreach($category in $entry.listCategories())
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <input type="checkbox" name="category_name" value="$category.name"/>
+ <input type="hidden" name="$!{category.name}.category_group"
value="$!category.group"/>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">$category.name</td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">$category.group</td>
+ </tr>
+ #end
</table>
-
- <input type="submit" name="eventSubmit_doRemovecategories" value="Remove
Categories"/>
-
- </form>
-
- #end
- </td>
- </tr>
-
- <tr>
- <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ <input type="submit" name="eventSubmit_doRemovecategories"
value="$l10n.REGISTRY_EDITOR_PORTLET_REMOVECATEGORIES"/>
+ </form>
+ #end
+ </td>
+ </tr>
+ <tr>
+ <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
+ <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
<input type="hidden" name="mode" value="update"/>
<input type="hidden" name="portlet_name" value="$!entry.Name"/>
<input type="hidden" name="tab" value="categories"/>
- <table bgcolor="#ffffff" cellpadding="5">
-
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Category Name</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <input type="text" name="category_name"/>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Category Group</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <input type="text" name="category_group"/>
- </td>
- </tr>
- <tr>
- <td align="center" colspan="2"
bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit"
name="eventSubmit_doAddcategory" value="Add Category"/></td>
- </tr>
- </table>
- </form>
-
- </td>
-</tr>
+ <table bgcolor="#ffffff" cellpadding="5">
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_CATEGORY_NAME</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <input type="text" name="category_name"/>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_CATEGORY_GROUP</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <input type="text" name="category_group"/>
+ </td>
+ </tr>
+ <tr>
+ <td align="center" colspan="2"
bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit"
name="eventSubmit_doAddcategory"
value="$l10n.REGISTRY_EDITOR_PORTLET_ADDCATEGORY"/></td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
</table>
Index: webapp/WEB-INF/templates/vm/portlets/html/portlet-form.vm
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-form.vm,v
retrieving revision 1.3
diff -u -r1.3 portlet-form.vm
--- vm/portlets/html/portlet-form.vm 2 May 2003 19:24:37 -0000 1.3
+++ vm/portlets/html/portlet-form.vm 30 May 2003 02:40:17 -0000
@@ -1,248 +1,275 @@
-<table bgcolor="#ffffff" cellpadding="5">
- #if ($msg)
- <tr>
- <td colspan="2">
- <table bgcolor="#ffffff">
- <tr>
- <td>
- $msg
- </td>
- </tr>
- </table>
- </td>
- </tr>
- #end
- #if($reason)
- <tr>
- <td colspan="2">
- <table bgcolor="#ffffff">
- <tr>
- <td>
- $reason
- </td>
- </tr>
- </table>
- </td>
- </tr>
- #end
-</table>
+<script>
+<!--
+ function validateAddPortlet() {
+ var result = true;
+
+ var f= document.AddPortletForm;
+ if(f.portlet_name.value.length == 0)
+ {
+ result = false;
+ alert("$l10n.REGISTRY_EDITOR_PORTLET_MISSING_NAME");
+ }
+
+ var className = f.class_name.value;
+
+ var index = f.portlet_type.selectedIndex;
+ var portletType = f.portlet_type.options[index].value;
+ if((portletType == "instance" || portletType == "abstract") && className.length
== 0)
+ {
+ result = false;
+ alert("$l10n.REGISTRY_EDITOR_PORTLET_CLASSNAME_REQUIRED");
+ }
+
+ var parentIndex = f.parent.selectedIndex;
+ var parent = f.parent.options[parentIndex].value;
+ if(portletType == "ref" && parent.length == 0) {
+ result = false;
+ alert("$l10n.REGISTRY_EDITOR_PORTLET_PARENT_REQURIED");
+ }
+
+ return result;
+ }
- #if (($mode == "delete"))
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletBrowser").setAction("portlets.PortletUpdateAction")">
- <table>
- <tr>
- <td colspan="2">Are you sure you want do delete this portlet?</td>
- </tr>
- <tr>
- #formReadOnlyCell ("Name" "portlet_name" $!entry.Name)
- <!--<input type="hidden" name="portlet_name" value="$!entry.Name"/>-->
- </tr>
- </table>
- <table border="0" cellspacing="0" cellpadding="5" width="30%">
- <tr>
- <td>
- <input type="submit" name="eventSubmit_doDelete" value="Delete Portlet"/>
- </td>
- ##<td>
- ## <input type="submit" name="eventSubmit_doCancel" value="Cancel"/>
- ##</td>
- </tr>
- </table>
- </form>
-
- #elseif ($mode == "insert")
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
- <table>
- <input type="hidden" name="mode" value="update"/>
- <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="portlet_name"
value="$!data.user.getTemp("portlet_name")"/>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Type</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- #set($portletTypes = ["abstract", "ref", "instance"])
- <select name="portlet_type">
- #foreach($portletType in $portletTypes)
- <option value="$portletType"
#if($!data.user.getTemp("portlet_type") == $portletType) selected="true"
#end>$portletType</option>
- #end
- </select>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Parent</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <select name="parent">
- <option value="">No Parent</option>
- #foreach($parent in $parents)
- <option value="$parent" #if($!data.user.getTemp("parent") ==
$parent) selected="true" #end>$parent</option>
- #end
- </select>
- </font>
- </td>
- </tr>
+-->
+</script>
+
+<table bgcolor="#ffffff" cellpadding="5">
+ #if ($msg)
+ <tr>
+ <td colspan="2">
+ <table bgcolor="#ffffff">
<tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Class Name</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="text" size="50" name="class_name"
value="$!data.user.getTemp("class_name")"/>
- </font>
+ <td>
+ $msg
</td>
</tr>
+ </table>
+ </td>
+ </tr>
+ #end
+ #if($reason)
+ <tr>
+ <td colspan="2">
+ <table bgcolor="#ffffff">
<tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Title</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="text" size="50" name="title"
value="$!data.user.getTemp("title")">
- </font>
+ <td>
+ $reason
</td>
</tr>
- <!--Consider making text area-->
- <tr>
+ </table>
+ </td>
+ </tr>
+ #end
+</table>
+
+#if (($mode == "delete"))
+<form name="DeletePortletForm" method="post"
action="$jslink.getPaneByName("PortletBrowser").setAction("portlets.PortletUpdateAction")">
+ <table>
+ <tr>
+ <td colspan="2">$l10n.REGISTRY_EDITOR_PORTLET_CONFIRM_DELETE</td>
+ </tr>
+ <tr>
+ #formReadOnlyCell ($l10n.REGISTRY_EDITOR_PORTLET_NAME "portlet_name"
$!entry.Name)
+ </tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="5" width="30%">
+ <tr>
+ <td>
+ <input type="submit" name="eventSubmit_doDelete"
value="$l10n.REGISTRY_EDITOR_PORTLET_DELETE"/>
+ </td>
+ </tr>
+ </table>
+</form>
+
+#elseif ($mode == "insert")
+<form name="AddPortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")"
onSubmit="return validateAddPortlet();">
+ <table>
+ <input type="hidden" name="mode" value="update"/>
+ <tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Description</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_NAME</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
- <textarea rows="10" cols="50" size="50"
name="description">$!data.user.getTemp("description")</textarea>
+ <input type="text" size="30" name="portlet_name"
value="$!data.user.getTemp("portlet_name")"/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_TYPE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ #set($portletTypes = ["abstract", "ref", "instance"])
+ <select name="portlet_type">
+ #foreach($portletType in $portletTypes)
+ <option value="$portletType"
#if($!data.user.getTemp("portlet_type") == $portletType) selected="true"
#end>$portletType</option>
+ #end
+ </select>
</font>
</td>
</tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARENT</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <select name="parent">
+ <option value="">No Parent</option>
+ #foreach($parent in $parents)
+ <option value="$parent" #if($!data.user.getTemp("parent") ==
$parent) selected="true" #end>$parent</option>
+ #end
+ </select>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_CLASSNAME</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="50" name="class_name"
value="$!data.user.getTemp("class_name")"/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_TITLE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="50" name="title"
value="$!data.user.getTemp("title")">
+ </font>
+ </td>
+ </tr>
+ <!--Consider making text area-->
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_DESCRIPTION</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <textarea rows="10" cols="50" size="50"
name="description">$!data.user.getTemp("description")</textarea>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_URL</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="50" name="url" value="$!data.user.getTemp("url")">
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_IMAGE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="50" name="image"
value="$!data.user.getTemp("image")">
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_SECURITYREF</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <select name="security_ref">
+ <option value="">None</option>
+ #foreach($security in $securitys)
+ <option value="$security.name" #if($security.name ==
$!data.user.getTemp("security_ref")) selected="true" #end>$security.name</option>
+ #end
+ </select>
+ </font>
+ </td>
+ </tr>
+
+ <!--Boolean checkboxes-->
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_HIDDEN</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="checkbox" size="30" name="is_hidden"
#if($!data.user.getTemp("is_hidden") == "on") checked="true" #end />
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_APPLICATION</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="checkbox" size="30" name="is_application"
#if($!data.user.getTemp("is_application") == "on") checked="true" #end />
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_CACHEDONURL</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="checkbox" size="30" name="is_cached_on_url"
#if($!data.user.getTemp("is_cached_on_url") == "on") checked="true" #end />
+ </font>
+ </td>
+ </tr>
+ </table>
+ <table border="0" cellspacing="0" cellpadding="5" width="30%">
+ <tr>
+ <td>
+ <input type="submit" name="eventSubmit_doInsert"
value="$l10n.REGISTRY_EDITOR_PORTLET_INSERT"/>
+ </td>
+ </tr>
+ </table>
+</form>
+#elseif($mode == "update")
+ #if(! $currentTab)
+ #set($currentTab = "info")
+ #end
+<table cellpadding="0" cellspacing="0" border="0" width="100%" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
+ <tr>
+ <td valign="top">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
+ #set($tabs = [[$l10n.REGISTRY_EDITOR_PORTLET_TAB_INFO, "info"],
[$l10n.REGISTRY_EDITOR_PORTLET_TAB_MEDIATYPES, "media_types"],
[$l10n.REGISTRY_EDITOR_PORTLET_TAB_CATEGORIES, "categories"],
[$l10n.REGISTRY_EDITOR_PORTLET_TAB_PARAMETERS, "parameters"]])
<tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">URL</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="text" size="50" name="url"
value="$!data.user.getTemp("url")">
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Image</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="text" size="50" name="image"
value="$!data.user.getTemp("image")">
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Security Reference</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <select name="security_ref">
- <option value="">None</option>
- #foreach($security in $securitys)
- <option value="$security.name" #if($security.name ==
$!data.user.getTemp("security_ref")) selected="true" #end>$security.name</option>
+ <td valign="top">
+ <table align="left" cellspacing="0" border="0" cellpadding="0" #if
(${skin.TabTitleStyleClass}) class="${skin.TabTitleStyleClass}" #end >
+ <tr width="100%">
+ #foreach ( $tab in $tabs )
+ #if ($tab.get(1) == $currentTab )
+ #set ($bgcolor = $!{skin.HighlightBackgroundColor} )
+ #set ($color = $!{skin.HighlightTextColor} )
+ #set ($titleclass = $!{skin.HighlightTitleStyleClass} )
+ #else
+ #set ($bgcolor = $!{skin.TitleBackgroundColor} )
+ #set ($color = $!{skin.TitleTextColor} )
+ #set ($titleclass = $!{skin.TitleStyleClass} )
#end
- </select>
- </font>
- </td>
- </tr>
-
- <!--Boolean checkboxes-->
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Hidden</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="checkbox" size="30" name="is_hidden"
#if($!data.user.getTemp("is_hidden") == "on") checked="true" #end />
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Application</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="checkbox" size="30" name="is_application"
#if($!data.user.getTemp("is_application") == "on") checked="true" #end />
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Cached On URL</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="checkbox" size="30" name="is_cached_on_url"
#if($!data.user.getTemp("is_cached_on_url") == "on") checked="true" #end />
- </font>
- </td>
- </tr>
- </table>
- <table border="0" cellspacing="0" cellpadding="5" width="30%">
- <tr>
- <td>
- <input type="submit" name="eventSubmit_doInsert" value="Insert Portlet"/>
- </td>
- ##<td>
- ## <input type="submit" name="eventSubmit_doCancel" value="Cancel"/>
- ##</td>
- </tr>
- </table>
- </form>
- #elseif($mode == "update")
- #if(! $currentTab)
- #set($currentTab = "info")
- #end
- <table cellpadding="0" cellspacing="0" border="0" width="100%" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
- <tr>
- <td valign="top">
- <table cellpadding="0" cellspacing="0" border="0" width="100%" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
- ##set($tabs = ["Info", "Media Types", "Categories", "Parameters"])
- #set($tabs = [["Info", "info"], ["Media Types", "media_types"],
["Categories", "categories"], ["Parameters", "parameters"]])
- <tr>
- <td valign="top">
- <table align="left" cellspacing="0" border="0" cellpadding="0" #if
(${skin.TabTitleStyleClass}) class="${skin.TabTitleStyleClass}" #end >
- <tr width="100%">
- #foreach ( $tab in $tabs )
- #if ($tab.get(1) == $currentTab )
- #set ($bgcolor = $!{skin.HighlightBackgroundColor} )
- #set ($color = $!{skin.HighlightTextColor} )
- #set ($titleclass = $!{skin.HighlightTitleStyleClass} )
- #else
- #set ($bgcolor = $!{skin.TitleBackgroundColor} )
- #set ($color = $!{skin.TitleTextColor} )
- #set ($titleclass = $!{skin.TitleStyleClass} )
- #end
-
- #if (${bgcolor})
- #if (${color})
- #set ($titlestyle = "background-color: $bgcolor; color: $color;" )
- #else
- #set ($titlestyle = "background-color: $bgcolor;" )
- #end
- #else
- #if (${color})
- #set ($titlestyle = "color: $color;" )
- #else
- #set ($titlestyle = "" )
- #end
- #end
- <td valign="middle" #if ($titleclass) class="$titleclass" #end #if
($titlestyle) style="${titlestyle}" #end >
+
+ #if (${bgcolor})
+ #if (${color})
+ #set ($titlestyle = "background-color: $bgcolor; color:
$color;" )
+ #else
+ #set ($titlestyle = "background-color: $bgcolor;" )
+ #end
+ #else
+ #if (${color})
+ #set ($titlestyle = "color: $color;" )
+ #else
+ #set ($titlestyle = "" )
+ #end
+ #end
+ <td valign="middle" #if ($titleclass) class="$titleclass" #end #if
($titlestyle) style="${titlestyle}" #end >
#if ($tab.get(1) != $currentTab)
<a
href="$jslink.getPaneByName("PortletForm").addQueryData("portlet_name",$entry.name).addQueryData("mode","update").addQueryData("tab",
$tab.get(1))" #if ($color) style="color: $color" #end>$tab.get(0)</a>
#else
@@ -250,44 +277,53 @@
#end
</td>
<td width="2"> </td>
- #end
- </tr>
- </table>
+ #end
+ </tr>
+ </table>
</td>
</tr>
- </table>
- <table cellspacing="0" width="100%" border="0" cellpadding="0" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
- <tr><td height="2" #if (${skin.HighlightBackgroundColor})
style="background-color: ${skin.HighlightBackgroundColor}" #end ><img height="2"
width="2" src="images/dot.gif" /></td></tr>
- <tr><td height="2" #if (${skin.BackgroundColor}) style="background-color:
${skin.BackgroundColor}" #end ><img height="2" width="2" src="images/dot.gif"
/></td></tr>
- </table>
- <table cellspacing="0" width="100%" border="0" cellpadding="0" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
- <tr>
- <td>
- <table cellspacing="0" width="100%" border="0" cellpadding="0" #if
(${skin.TabContentStyleClass}) class="${skin.TabContentStyleClass}" #end #if
(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end >
- <tr>
- <td valign="top" width="100%">
- #if($currentTab == "info")
+ </table>
+ <table cellspacing="0" width="100%" border="0" cellpadding="0" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
+ <tr><td height="2" #if (${skin.HighlightBackgroundColor})
style="background-color: ${skin.HighlightBackgroundColor}" #end ><img height="2"
width="2" src="images/dot.gif" /></td></tr>
+ <tr><td height="2" #if (${skin.BackgroundColor}) style="background-color:
${skin.BackgroundColor}" #end ><img height="2" width="2" src="images/dot.gif"
/></td></tr>
+ </table>
+ <table cellspacing="0" width="100%" border="0" cellpadding="0" #if
(${skin.TabStyleClass}) class="${skin.TabStyleClass}" #end >
+ <tr>
+ <td>
+ <table cellspacing="0" width="100%" border="0" cellpadding="0" #if
(${skin.TabContentStyleClass}) class="${skin.TabContentStyleClass}" #end #if
(${skin.BackgroundColor}) style="background-color: ${skin.BackgroundColor}" #end >
+ <tr>
+ <td valign="top" width="100%">
+ #if($currentTab == "info")
#parse("/portlets/html/portlet-info-form.vm")
- #elseif($currentTab == "media_types")
+ #elseif($currentTab == "media_types")
#parse("/portlets/html/portlet-mediatype-form.vm")
- #elseif($currentTab == "categories")
+ #elseif($currentTab == "categories")
#parse("/portlets/html/portlet-category-form.vm")
- #elseif($currentTab == "parameters" || $currentTab ==
"VerboseParameter")
+ #elseif($currentTab == "parameters" || $currentTab ==
"VerboseParameter")
#parse("/portlets/html/portlet-parameter-form.vm")
- #end
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- #end
- <table>
- <tr>
- <td>
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletBrowser").setAction("portlets.PortletUpdateAction")">
- <input type="submit" name="eventSubmit_doCancel" value="Back to
Browser"/>
- </form>
- </td>
- </tr>
+ #end
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
+ </td>
+ </tr>
+</table>
+#end
+<table>
+ <tr>
+ <td>
+ <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletBrowser").setAction("portlets.PortletUpdateAction")">
+ <input type="submit" name="eventSubmit_doCancel"
value="$l10n.REGISTRY_EDITOR_PORTLET_CANCEL"/>
+ </form>
+ </td>
+ <td> </td>
+ <td>
+ <form name="HelpForm" method="post"
action="$clink.setURI("docs/site/catalog.html")" target="_blank">
+ <input type="submit" value="$l10n.REGISTRY_EDITOR_PORTLET_PORTLETCATALOG"/>
+ </form>
+ </td>
+ </tr>
+</table>
Index: webapp/WEB-INF/templates/vm/portlets/html/portlet-info-form.vm
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-info-form.vm,v
retrieving revision 1.3
diff -u -r1.3 portlet-info-form.vm
--- vm/portlets/html/portlet-info-form.vm 22 Apr 2003 15:07:43 -0000 1.3
+++ vm/portlets/html/portlet-info-form.vm 30 May 2003 02:40:17 -0000
@@ -1,10 +1,30 @@
+<script>
+<!--
+
+ function validateModifyPortlet() {
+ var result = true;
+
+ var f = document.ModifyPortletForm;
+
+ var portletType = f.portlet_type.value;
+ var className = f.class_name.value;
+ if((portletType == "instance" || portletType == "abstract") && className.length
== 0) {
+ result = false;
+ alert("$l10n.REGISTRY_EDITOR_PORTLET_CLASSNAME_REQUIRED");
+ }
+
+ return result;
+ }
+
+-->
+</script>
+
<table width="50%" bgcolor="#ffffff" cellpadding="5">
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ <form name="ModifyPortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")"
onSubmit="return validateModifyPortlet();">
<input type="hidden" name="mode" value="update"/>
<input type="hidden" name="tab" value="info"/>
<tr>
- #formReadOnlyCell ("Name" "portlet_name" $!entry.Name)
- <!--<input type="hidden" name="portlet_name" value="$!entry.Name"/>-->
+ #formReadOnlyCell ($l10n.REGISTRY_EDITOR_PORTLET_NAME "portlet_name"
$!entry.Name)
</tr>
<tr>
#if(! $entry.parent || $entry.parent.length() == 0)
@@ -12,15 +32,14 @@
#else
#set($entryParent = $entry.parent)
#end
- #formReadOnlyCell ("Parent" "parent" "$!entryParent")
- <!--<input type="hidden" name="parent" value="$!entry.parent"/>-->
+ #formReadOnlyCell ($l10n.REGISTRY_EDITOR_PORTLET_PARENT "parent"
"$!entryParent")
</tr>
<tr>
- #formReadOnlyCell("Type" "portlet_type" "$!entry.type")
+ #formReadOnlyCell($l10n.REGISTRY_EDITOR_PORTLET_TYPE "portlet_type"
"$!entry.type")
</tr>
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Class Name</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_CLASSNAME</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -30,7 +49,7 @@
</tr>
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Title</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_TITLE</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -41,7 +60,7 @@
<!--Consider making text area-->
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Description</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_DESCRIPTION</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -51,7 +70,7 @@
</tr>
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">URL</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_URL</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -62,7 +81,7 @@
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Image</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_IMAGE</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -73,7 +92,7 @@
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Security Reference</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_SECURITYREF</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -90,7 +109,7 @@
<!--Boolean checkboxes-->
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Hidden</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_HIDDEN</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -100,7 +119,7 @@
</tr>
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Application</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_APPLICATION</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -110,7 +129,7 @@
</tr>
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Cached On URL</font></b>
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_CACHEDONURL</font></b>
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
@@ -119,7 +138,7 @@
</td>
</tr>
<tr>
- <td colspan="2" align="center"><input type="submit"
name="eventSubmit_doUpdate" value="Update Portlet"/></td>
+ <td colspan="2" align="center"><input type="submit"
name="eventSubmit_doUpdate" value="$l10n.REGISTRY_EDITOR_PORTLET_UPDATE"/></td>
</tr>
</form>
</table>
Index: webapp/WEB-INF/templates/vm/portlets/html/portlet-mediatype-form.vm
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-mediatype-form.vm,v
retrieving revision 1.2
diff -u -r1.2 portlet-mediatype-form.vm
--- vm/portlets/html/portlet-mediatype-form.vm 2 May 2003 19:24:37 -0000 1.2
+++ vm/portlets/html/portlet-mediatype-form.vm 30 May 2003 02:40:17 -0000
@@ -1,62 +1,53 @@
<table bgcolor="#ffffff" cellpadding="5">
<tr>
-<!--
- <td width="20%" bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Media Types</font></b>
- </td>
--->
<td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
- #if($entry.listMediaTypes().hasNext())
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ #if($entry.listMediaTypes().hasNext())
+ <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
<input type="hidden" name="mode" value="update"/>
<input type="hidden" name="portlet_name" value="$!entry.Name"/>
<input type="hidden" name="tab" value="media_types"/>
- <table bgcolor="#ffffff" cellpadding="5">
- <th>Select</th>
- <th>Media Type</th>
-
-
- #foreach($mediaType in $entry.listMediaTypes())
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <input type="checkbox" name="media_type"
value="$mediaType"/>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">$mediaType</td>
- </tr>
- #end
- </table>
- <input type="submit" name="eventSubmit_doRemovemediatypes"
value="Remove Media Types"/>
- </form>
+ <table bgcolor="#ffffff" cellpadding="5">
+ <th> </th>
+ <th>$l10n.REGISTRY_EDITOR_PORTLET_MEDIATYPE</th>
+ #foreach($mediaType in $entry.listMediaTypes())
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <input type="checkbox" name="media_type" value="$mediaType"/>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">$mediaType</td>
+ </tr>
#end
- </td>
- </tr>
+ </table>
+ <input type="submit" name="eventSubmit_doRemovemediatypes"
value="$l10n.REGISTRY_EDITOR_PORTLET_REMOVEMEDIATYPE"/>
+ </form>
+ #end
+ </td>
+</tr>
- <tr>
- <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
-
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
- <input type="hidden" name="mode" value="update"/>
- <input type="hidden" name="portlet_name" value="$!entry.Name"/>
- <input type="hidden" name="tab" value="media_types"/>
- <table bgcolor="#ffffff" cellpadding="5">
-
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Media Type</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <select name="media_type">
- #foreach($mediaType in $media_types)
- <option value="$mediaType">$mediaType</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td align="center" colspan="2"
bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit"
name="eventSubmit_doAddmediatype" value="Add Media Type"/></td>
- </tr>
- </table>
- </form>
+<tr>
+ <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
+ <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ <input type="hidden" name="mode" value="update"/>
+ <input type="hidden" name="portlet_name" value="$!entry.Name"/>
+ <input type="hidden" name="tab" value="media_types"/>
+ <table bgcolor="#ffffff" cellpadding="5">
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_MEDIATYPE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <select name="media_type">
+ #foreach($mediaType in $media_types)
+ <option value="$mediaType">$mediaType</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="center" colspan="2"
bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit"
name="eventSubmit_doAddmediatype"
value="$l10n.REGISTRY_EDITOR_PORTLET_ADDMEDIATYPE"/></td>
+ </tr>
+ </table>
+ </form>
</td>
</tr>
</table>
Index: webapp/WEB-INF/templates/vm/portlets/html/portlet-parameter-form.vm
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-parameter-form.vm,v
retrieving revision 1.2
diff -u -r1.2 portlet-parameter-form.vm
--- vm/portlets/html/portlet-parameter-form.vm 22 Apr 2003 15:07:43 -0000 1.2
+++ vm/portlets/html/portlet-parameter-form.vm 30 May 2003 02:40:17 -0000
@@ -2,15 +2,15 @@
<table bgcolor="#ffffff" cellpadding="5">
<tr>
<td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
- #if($entry.getParameterNames().hasNext())
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
- <input type="hidden" name="mode" value="update"/>
- <input type="hidden" name="portlet_name" value="$!entry.Name"/>
- <input type="hidden" name="tab" value="parameters"/>
+ #if($entry.getParameterNames().hasNext())
+ <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ <input type="hidden" name="mode" value="update"/>
+ <input type="hidden" name="portlet_name" value="$!entry.Name"/>
+ <input type="hidden" name="tab" value="parameters"/>
<table bgcolor="#ffffff" cellpadding="5">
- <th>Select</th>
- <th>Name</th>
- <th>Value</th>
+ <th> </th>
+ <th>$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_NAME</th>
+ <th>$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_VALUE</th>
#foreach($paramName in $entry.getParameterNames())
#set($parameter = $entry.getParameter($paramName))
<tr>
@@ -18,153 +18,144 @@
<input type="checkbox" name="parameter_name"
value="$!parameter.name"/>
</td>
<td
bgcolor="$!{skin.TitleBackgroundColor}">$!parameter.name</td>
- <input type="hidden" name="update_parameter_name"
value="$!parameter.name"/>
+ <input type="hidden" name="update_parameter_name"
value="$!parameter.name"/>
<td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text"
name="$!{parameter.name}.parameter_value" value="$!parameter.value"/></td>
<td><a href="$jslink.addQueryData("mode",
"update").addQueryData("tab","VerboseParameter").addQueryData("portlet_name",$entry.name).addQueryData("parameter_name",
$parameter.name).addQueryData("portlet_name", $entry.name)">More</a></td>
</tr>
#end
</table>
- <input type="submit" name="eventSubmit_doRemoveparameters" value="Remove
Parameters"/>
- <input type="submit" name="eventSubmit_doUpdateparametervalues"
value="Update Parameters"/>
- </form>
+ <input type="submit" name="eventSubmit_doRemoveparameters"
value="$l10n.REGISTRY_EDITOR_PORTLET_REMOVEPARAMETERS"/>
+ <input type="submit" name="eventSubmit_doUpdateparametervalues"
value="$l10n.REGISTRY_EDITOR_PORTLET_UPDATEPARAMETERS"/>
+ </form>
- #end
-</td>
- </tr>
-
- <tr>
- <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
- <input type="hidden" name="mode" value="update"/>
- <input type="hidden" name="portlet_name" value="$!entry.Name"/>
- <input type="hidden" name="tab" value="parameters"/>
- <table bgcolor="#ffffff" cellpadding="5">
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">Parameter Name</font></b></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text"
name="parameter_name"/></td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">Parameter Value</font></b></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text"
name="parameter_value"/></td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">Hidden</font></b></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="checkbox"
name="is_hidden"/></td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">Cached On Name</font></b></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="checkbox"
name="cached_on_name" checked="true"/></td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">Cached on Value</font></b></td>
- <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="checkbox"
name="cached_on_value" checked="true"/></td>
- </tr>
- <tr>
- <td align="center" colspan="2"
bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit"
name="eventSubmit_doAddparameter" value="Add Parameter"/></td>
- </tr>
- </table>
- </form>
+ #end
+ </td>
+</tr>
+<tr>
+ <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
+ <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ <input type="hidden" name="mode" value="update"/>
+ <input type="hidden" name="portlet_name" value="$!entry.Name"/>
+ <input type="hidden" name="tab" value="parameters"/>
+ <table bgcolor="#ffffff" cellpadding="5">
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_NAME</font></b></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text"
name="parameter_name"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_VALUE</font></b></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="text"
name="parameter_value"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_HIDDEN</font></b></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="checkbox"
name="is_hidden"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_CACHEDONNAME</font></b></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="checkbox"
name="cached_on_name" checked="true"/></td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_CACHEDONVALUE</font></b></td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}"><input type="checkbox"
name="cached_on_value" checked="true"/></td>
+ </tr>
+ <tr>
+ <td align="center" colspan="2"
bgcolor="$!{skin.TitleBackgroundColor}"><input type="submit"
name="eventSubmit_doAddparameter"
value="$l10n.REGISTRY_EDITOR_PORTLET_ADDPARAMETER"/></td>
+ </tr>
+ </table>
+ </form>
</td>
</tr>
</table>
#elseif($currentTab == "VerboseParameter")
-#set($parameter = $entry.getParameter($data.parameters.getString("parameter_name")))
-<table bgcolor="#ffffff" cellpadding="5">
- <tr>
- <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
-
- #if($entry.getParameterNames().hasNext())
- <form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
- <input type="hidden" name="mode" value="update"/>
- <input type="hidden" name="portlet_name" value="$!entry.Name"/>
- <input type="hidden" name="tab" value="parameters"/>
-
- <table bgcolor="#ffffff" cellpadding="5">
- #formReadOnlyCell ("Name" "update_parameter_name" $!parameter.name)
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Value</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="text" size="30"
name="$!{parameter.name}.parameter_value" value="$!parameter.value"/>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Title</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="text" size="30"
name="$!{parameter.name}.title" value="$!parameter.title"/>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Security
Reference</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <select name="$!{parameter.name}.security_ref">
- <option value="">None</option>
- #foreach($security in $securitys)
- <option value="$security.name"
#if($!parameter.securityRef.parent == $security.name) selected="true"
#end>$security.name</option>
- #end
- </select>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Description</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <textarea rows="10" cols="50" size="50"
name="$!{parameter.name}.description">$!parameter.description.trim()</textarea>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Hidden</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="checkbox"
name="$!{parameter.name}.is_hidden" #if($!parameter.hidden) checked="true" #end/>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Cached On Name</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="checkbox"
name="$!{parameter.name}.cached_on_name" #if($!parameter.cachedOnName) checked="true"
#end/>
- </font>
- </td>
- </tr>
- <tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Cached On Value</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- <input type="checkbox" name="$!{parameter.name}.cached_on_value"
#if($!parameter.cachedOnValue) checked="true" #end/>
- </font>
- </td>
- </tr>
- </table>
- <input type="submit" name="eventSubmit_doUpdateparameters"
value="Update Parameter"/>
- </form>
- #end
- </font>
- </td>
- </tr>
- </table>
+#set($parameter = $entry.getParameter($data.parameters.getString("parameter_name")))
+#if($entry.getParameterNames().hasNext())
+<form name="PortletForm" method="post"
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
+ <input type="hidden" name="mode" value="update"/>
+ <input type="hidden" name="portlet_name" value="$!entry.Name"/>
+ <input type="hidden" name="tab" value="parameters"/>
+
+ <table bgcolor="#ffffff" cellpadding="5">
+ #formReadOnlyCell ($l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_NAME
"update_parameter_name" $!parameter.name)
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_VALUE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="30" name="$!{parameter.name}.parameter_value"
value="$!parameter.value"/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_TITLE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="text" size="30" name="$!{parameter.name}.title"
value="$!parameter.title"/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_SECURITYREF</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <select name="$!{parameter.name}.security_ref">
+ <option value="">None</option>
+ #foreach($security in $securitys)
+ <option value="$security.name" #if($!parameter.securityRef.parent ==
$security.name) selected="true" #end>$security.name</option>
+ #end
+ </select>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_DESCRIPTION</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <textarea rows="10" cols="50" size="50"
name="$!{parameter.name}.description">$!parameter.description.trim()</textarea>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_HIDDEN</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="checkbox" name="$!{parameter.name}.is_hidden"
#if($!parameter.hidden) checked="true" #end/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_CACHEDONNAME</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="checkbox" name="$!{parameter.name}.cached_on_name"
#if($!parameter.cachedOnName) checked="true" #end/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <b><font
face="$ui.sansSerifFonts">$l10n.REGISTRY_EDITOR_PORTLET_PARAMETER_CACHEDONVALUE</font></b>
+ </td>
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <font face="$ui.sansSerifFonts">
+ <input type="checkbox" name="$!{parameter.name}.cached_on_value"
#if($!parameter.cachedOnValue) checked="true" #end/>
+ </font>
+ </td>
+ </tr>
+ </table>
+ <input type="submit" name="eventSubmit_doUpdateparameters"
value="$l10n.REGISTRY_EDITOR_PORTLET_UPDATEPARAMETER"/>
+</form>
+
+#end
#end
Index: src/java/org/apache/jetspeed/modules/actions/portlets/RegistryUpdateAction.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/RegistryUpdateAction.java,v
retrieving revision 1.1
diff -u -r1.1 RegistryUpdateAction.java
--- RegistryUpdateAction.java 2 May 2003 19:23:48 -0000 1.1
+++ RegistryUpdateAction.java 30 May 2003 02:42:21 -0000
@@ -1091,6 +1091,12 @@
.getPaneByName(pane)
.addPathInfo(SecurityConstants.PARAM_MODE, mode)
.addPathInfo(SecurityConstants.PARAM_MSGID, reason);
+
+ String entryName = rundata.getParameters().getString(registryEntryName);
+ if(entryName != null && entryName.length() > 0)
+ {
+ duri.addQueryData(registryEntryName, entryName);
+ }
JetspeedLinkFactory.putInstance(link);
Index: src/java/org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java
===================================================================
RCS file:
/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java,v
retrieving revision 1.3
diff -u -r1.3 PortletUpdateAction.java
--- PortletUpdateAction.java 2 May 2003 19:23:48 -0000 1.3
+++ PortletUpdateAction.java 30 May 2003 02:42:42 -0000
@@ -284,7 +284,6 @@
else
{
DynamicURI duri = redirect(rundata,
SecurityConstants.PARAM_MODE_UPDATE, SecurityConstants.MID_MISSING_PARAMETER);
- duri = duri.addQueryData(PORTLET_NAME, portletName);
rundata.setRedirectURI(duri.toString());
resetForm(rundata);
@@ -461,12 +460,12 @@
{
DynamicURI duri = super.redirect(rundata, mode, reason);
- String tab = rundata.getParameters().getString("tab");
+ String tab = rundata.getParameters().getString(TAB_PARAMETER);
if(tab != null && tab.length() > 0)
{
duri.addQueryData(TAB_PARAMETER, tab);
}
-
+
return duri;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
