Index: CustomizeSetAction.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.39
diff -u -r1.39 CustomizeSetAction.java
--- CustomizeSetAction.java	19 Feb 2003 17:39:45 -0000	1.39
+++ CustomizeSetAction.java	9 Apr 2003 03:59:28 -0000
@@ -528,6 +528,16 @@
            duri = link.setTemplate("Customize").
                addQueryData("start", String.valueOf(queryStart)).
                addQueryData("mtype", mtype);
+           String language = rundata.getParameters().getString("language");
+           if(language != null)
+           {
+                duri = duri.addQueryData("language",language);
+                String country = rundata.getParameters().getString("country");
+                if(country != null)
+				{
+                    duri = duri.addQueryData("country", country);
+                }
+           }
        }
        JetspeedLinkFactory.putInstance(link);
        rundata.setRedirectURI(duri.toString());
@@ -550,6 +560,16 @@
            duri = link.setTemplate("Customize").
                addQueryData("start", String.valueOf(queryStart)).
                addQueryData("mtype", mtype);
+           String language = rundata.getParameters().getString("language");
+           if(language != null)
+           {
+               duri = duri.addQueryData("language",language);
+               String country = rundata.getParameters().getString("country");
+               if(country != null)
+               {
+                   duri = duri.addQueryData("country", country);
+               }
+           }
        }
        JetspeedLinkFactory.putInstance(link);
        rundata.setRedirectURI(duri.toString());
@@ -1236,6 +1256,16 @@
         else
         {
             duri = link.setTemplate("Customize").addQueryData("start", "0").addQueryData("mtype", mtype);
+			String language = rundata.getParameters().getString("language");
+            if(language != null)
+            {
+                duri = duri.addQueryData("language",language);
+                String country = rundata.getParameters().getString("country");
+                if(country != null)
+                {
+                    duri = duri.addQueryData("country", country);
+                }
+            }
         }
         JetspeedLinkFactory.putInstance(link);
         rundata.setRedirectURI(duri.toString());


Index: card-customize.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
retrieving revision 1.13
diff -u -r1.13 card-customize.vm
--- card-customize.vm	25 Mar 2003 18:39:56 -0000	1.13
+++ card-customize.vm	9 Apr 2003 04:00:16 -0000
@@ -55,14 +55,14 @@
   ## Portlet is not used - use blank image!
   #if (!$FF)
     #set ($portletcount = $portletcount + 1)
-    <a href="$jslink.getAction("controls.Customize",$entry.Id)">
+    <a href="#psmlLink($jslink.getAction("controls.Customize",$entry.Id))">
       <img src="images/is_pane.gif" alt="$l10n.CUSTOMIZER_CUSTOMIZABLEPANE" width=14" height="14" border="0" hspace="2" >
     </a></TD>
   #end
 
     <td valign="top">
   #if (!$FF)
-    <a href="$jslink.getAction("controls.Customize",$entry.Id)">
+    <a href="#psmlLink($jslink.getAction("controls.Customize",$entry.Id))">
       <b>$title</b>
     </a>
   #else


Index: browser-client.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-client.vm,v
retrieving revision 1.1
diff -u -r1.1 browser-client.vm
--- browser-client.vm	30 Oct 2002 15:55:51 -0000	1.1
+++ browser-client.vm	9 Apr 2003 04:00:49 -0000
@@ -5,6 +5,7 @@
     <th>Pattern</th>
     <th>Mime Types</th>
     <th>Capabilities</th>
+    <th colspan="2">Actions</th>
   </tr>
 #foreach ( $entry in $registry )
   <tr>
@@ -25,6 +26,8 @@
 	$capability<br />
 #end
     </td>
+    <td align="center"><a style="font-size:10" href="$jslink.setPaneByName("ClientForm").addQueryData("mode","update").addQueryData("client_name", $!entry.Name)">Edit</a>&nbsp;</td>
+    <td align="center"><a style="font-size:10" href="$jslink.setPaneByName("ClientForm").addQueryData("mode","delete").addQueryData("client_name", $!entry.Name)">Delete</a>&nbsp;</td>
   </tr>
 #end
 </table>
@@ -32,13 +35,20 @@
   <tr>
     <td align="right" width="50%">
 #if ($prev)
+      <input type="hidden" name="start" value="$prev">
       <input type="submit" value="&lt; &lt; Previous">
 #end
     </td>
     <td align="left" width="50%">
-#if ($prev)
+#if ($next)
       <input type="submit" value="Next &gt; &gt;">
+      <input type="hidden" name="start" value="$next">
 #end
+    </td>
+  </tr>
+  <tr>
+    <td colspan=6 align="left">
+    	<a style="font-size:10" href="$jslink.setPaneByName("ClientForm").addQueryData("mode","insert")">Add Client</a>&nbsp;
     </td>
   </tr>
 </table>

Index: customizer-portletset-add.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-add.vm,v
retrieving revision 1.15
diff -u -r1.15 customizer-portletset-add.vm
--- customizer-portletset-add.vm	27 Sep 2002 20:00:03 -0000	1.15
+++ customizer-portletset-add.vm	9 Apr 2003 04:00:50 -0000
@@ -1,11 +1,8 @@
 <!-- WEB-INF\templates\vm\portlets\html\customizer-portletset-add.vm -->
 <br>
 #set ($mtype = $!data.Parameters.getString("mtype"))
-#if ($!mtype) 
-    <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-#else
-    <form action="$jslink.Template" method="post">
-#end
+
+    <form action="#psmlLink($jslink.Template)" method="post">
   #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end 
   <center>
     <table width="80%" border="1" cellspacing="0">
Index: customizer-portletset-addref.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addref.vm,v
retrieving revision 1.1
diff -u -r1.1 customizer-portletset-addref.vm
--- customizer-portletset-addref.vm	8 Aug 2002 03:05:41 -0000	1.1
+++ customizer-portletset-addref.vm	9 Apr 2003 04:00:50 -0000
@@ -1,9 +1,7 @@
 #set ($mtype = $!data.Parameters.getString("mtype"))
-#if ($!mtype) 
-    <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-#else
-    <form action="$jslink.Template" method="post">
-#end
+
+    <form action="#psmlLink($jslink.Template)" method="post">
+
   #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action" > #end 
 
 <table width=100%" border="1" cellpadding="0" cellspacing="0">
@@ -194,13 +192,7 @@
     <tr>
       <td>
         #if ($prev)
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-            <a href="$jslink.setTemplate("Customize").addPathInfo("start",$prev).addQueryData('mtype', $mtype)">$l10n.CUSTOMIZER_PREVIOUSBTN</a>
-          #else
-            <a href="$jslink.setTemplate("Customize").addPathInfo("start",$prev)">$l10n.CUSTOMIZER_PREVIOUSBTN</a>
-          #end
-
+            <a href="#psmlLink($jslink.setTemplate("Customize").addPathInfo("start",$prev))">$l10n.CUSTOMIZER_PREVIOUSBTN</a>
         #else
         &nbsp;
         #end
@@ -213,12 +205,7 @@
       </td>
       <td>
         #if ($next)
-          #set ($mtype = $!data.Parameters.getString("mtype"))
-          #if ($!mtype) 
-          <a href="$jslink.setTemplate("Customize").addPathInfo("start",$next).addQueryData('mtype', $mtype)">$l10n.CUSTOMIZER_NEXTBTN</a>
-          #else
-          <a href="$jslink.setTemplate("Customize").addPathInfo("start",$next)">$l10n.CUSTOMIZER_NEXTBTN</a>
-          #end
+          <a href="#psmlLink($jslink.setTemplate("Customize").addPathInfo("start",$next))">$l10n.CUSTOMIZER_NEXTBTN</a>
         #else
         &nbsp;
         #end
Index: customizer-portletset-addset.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-addset.vm,v
retrieving revision 1.6
diff -u -r1.6 customizer-portletset-addset.vm
--- customizer-portletset-addset.vm	23 Jul 2002 00:03:56 -0000	1.6
+++ customizer-portletset-addset.vm	9 Apr 2003 04:00:50 -0000
@@ -1,11 +1,9 @@
 <!-- WEB-INF\templates\vm\portlets\html\customizer-portletset-addset.vm -->
 <br>
 #set ($mtype = $!data.Parameters.getString("mtype"))
-#if ($!mtype) 
-    <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-#else
-    <form action="$jslink.Template" method="post">
-#end
+
+    <form action="#psmlLink($jslink.Template)" method="post">
+
   #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
   <table width="100%" cellspacing="2" cellpadding="0">
     <tr>
Index: customizer-portletset-general.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-general.vm,v
retrieving revision 1.6
diff -u -r1.6 customizer-portletset-general.vm
--- customizer-portletset-general.vm	23 Jul 2002 00:03:56 -0000	1.6
+++ customizer-portletset-general.vm	9 Apr 2003 04:00:50 -0000
@@ -1,11 +1,8 @@
 <!-- WEB-INF\templates\vm\portlets\html\customizer-portletset-general.vm -->
 <br>
 #set ($mtype = $!data.Parameters.getString("mtype"))
-#if ($!mtype) 
-    <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-#else
-    <form action="$jslink.Template" method="post">
-#end
+    <form action="#psmlLink($jslink.Template)" method="post">
+
   #if ($action) <input name="$jslink.ActionKey" type="hidden" value="$action"> #end
   <table cellspacing="2" cellpadding="0">
     <tr>
Index: customizer-portletset.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm,v
retrieving revision 1.15
diff -u -r1.15 customizer-portletset.vm
--- customizer-portletset.vm	13 Jan 2003 17:24:35 -0000	1.15
+++ customizer-portletset.vm	9 Apr 2003 04:00:50 -0000
@@ -12,21 +12,13 @@
 #set ($mtype = $!data.Parameters.getString("mtype"))
 
     <td align="center"  width="20%" valign="middle">
-      #if ($!mtype) 
-        <form action="$jslink.Template.addPathInfo("mode","layout").addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
+        <form action="#psmlLink($jslink.Template.addPathInfo("mode","layout"))" method="post">
         <input type="submit" value="$l10n.CUSTOMIZER_EDITLAYOUT">
       </form>
     </td>
 
     <td nowrap align="center" width="20%">
-      #if ($!mtype) 
-        <form action="$jslink.Template.addPathInfo("mode","add").addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
+        <form action="#psmlLink($jslink.Template.addPathInfo("mode","add"))" method="post">
 
         #if ($allowportlet=="true")
           <input type="submit" value="$l10n.CUSTOMIZER_ADDPORTLET" >
@@ -37,12 +29,7 @@
    </td>
   
     <td nowrap align="center" width="20%">      
-      #if ($!mtype) 
-        <form action="$jslink.Template.addPathInfo("mode","addref").addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
-
+        <form action="#psmlLink($jslink.Template.addPathInfo("mode","addref"))" method="post">
         #if ($allowportlet=="true")
           $jetspeed.getPortletParameter($data, $customizer, "addRef", $l10n.CUSTOMIZER_ADDREFERENCE)
         #else
@@ -52,11 +39,8 @@
    </td>
 
    <td nowrap align="center" width="20%">
-      #if ($!mtype) 
-        <form action="$jslink.Template.addPathInfo("mode","addset").addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
+      
+        <form action="#psmlLink($jslink.Template.addPathInfo("mode","addset")" method="post">
         #if ($allowpane=="true")
           <input type="submit" value="$l10n.CUSTOMIZER_ADDPANE" >
         #else
@@ -66,12 +50,7 @@
     </td>
 
     <td nowrap align="center" width="20%">
-      #if ($!mtype) 
-        <form action="$jslink.Template.addPathInfo("mode","general").addQueryData('mtype', $mtype)" method="post">
-      #else
-        <form action="$jslink.Template" method="post">
-      #end
-
+        <form action="#psmlLink($jslink.Template.addPathInfo("mode","general"))" method="post">
         #if ($allowproperties=="true")
           <input type="submit" value="$l10n.CUSTOMIZER_EDITPROPERTIES">
         #else