portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r354180 - in /portals/jetspeed-2/trunk/applications/j2-admin/src: java/org/apache/jetspeed/portlets/security/groups/ java/org/apache/jetspeed/portlets/security/resources/ java/org/apache/jetspeed/portlets/security/roles/ webapp/WEB-INF/secu...
Date Mon, 05 Dec 2005 20:50:11 GMT
Author: ate
Date: Mon Dec  5 12:49:57 2005
New Revision: 354180

URL: http://svn.apache.org/viewcvs?rev=354180&view=rev
Log:
Fixes JS2-434: "Role and Group admin detail portlets are missing browser navigation ui".
I also cleaned up the layout of these portlets (including the role/group/user browser) a bit.

Modified:
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupDetails.java
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_en.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ja.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_en.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ja.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleDetails.java
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupDetails.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupDetails.java?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupDetails.java
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupDetails.java
Mon Dec  5 12:49:57 2005
@@ -76,8 +76,26 @@
     public void getRows(RenderRequest request, String sql, int windowSize)
     throws Exception
     {
+        getRows(request, sql, windowSize, null);        
+    }
+
+    public void getRows(RenderRequest request, String sql, int windowSize, String filter)
+    throws Exception
+    {
         List resultSetTitleList = new ArrayList();
         List resultSetTypeList = new ArrayList();
+        if ( filter != null )
+        {
+            if ( filter.length() == 0 )
+            {
+                filter = null;
+            }
+            else
+            {
+                filter = filter.toLowerCase();
+            }
+        }
+        
         try
         {
             List list = new ArrayList();
@@ -92,8 +110,11 @@
                 {
                     User user = (User)users.next();
                     Principal principal = SecurityUtil.getPrincipal(user.getSubject(),
-                            UserPrincipal.class);                
-                    list.add(principal.getName());
+                            UserPrincipal.class);
+                    if ( filter == null || principal.getName().toLowerCase().startsWith(filter))
+                    {
+                        list.add(principal.getName());
+                    }
                 }
             }
             BrowserIterator iterator = new DatabaseBrowserIterator(
@@ -136,6 +157,12 @@
             this.getContext(request).put("statusMsg", msg);            
         }
           
+        String filtered = (String)PortletMessaging.receive(request, SecurityResources.TOPIC_GROUPS,
SecurityResources.MESSAGE_FILTERED);
+        if (filtered != null)
+        {
+            this.getContext(request).put(FILTERED, "on");            
+        }        
+
         String refresh = (String)PortletMessaging.consume(request, SecurityResources.TOPIC_GROUPS_USERS,
SecurityResources.MESSAGE_REFRESH); 
         if (refresh != null)
         {        

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources.properties?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources.properties
Mon Dec  5 12:49:57 2005
@@ -20,3 +20,14 @@
 removecheckedusers=Remove Checked Users
 removegroup=Remove Group
 addNewGroup=Add New Group
+
+# browser navigation
+firstArrow=<<
+prevArrow=<
+go=Go
+nextArrow=>
+lastArrow=>>
+refresh=Refresh
+search=Search
+filter=Filter:
+numberseparator=of

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_en.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_en.properties?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_en.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_en.properties
Mon Dec  5 12:49:57 2005
@@ -26,3 +26,14 @@
 removecheckedusers=Remove Checked Users
 removegroup=Remove Group
 addNewGroup=Add New Group
+
+# browser navigation
+firstArrow=<<
+prevArrow=<
+go=Go
+nextArrow=>
+lastArrow=>>
+refresh=Refresh
+search=Search
+filter=Filter:
+numberseparator=of

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ja.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ja.properties?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ja.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/GroupDetailsResources_ja.properties
Mon Dec  5 12:49:57 2005
@@ -26,3 +26,14 @@
 removecheckedusers=\u9078\u629e\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
 removegroup=\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
 addNewGroup=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7\u306e\u8ffd\u52a0
+
+# browser navigation
+firstArrow=<<
+prevArrow=<
+go=\u5b9f\u884c
+nextArrow=>
+lastArrow=>>
+refresh=\u66f4\u65b0
+search=\u691c\u7d22
+filter=\u30d5\u30a3\u30eb\u30bf:
+numberseparator=/

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources.properties?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources.properties
Mon Dec  5 12:49:57 2005
@@ -20,3 +20,14 @@
 adduserstorole=Add Users to Role...
 removecheckedusers=Remove Checked Users
 removerole=Remove Role
+
+# browser navigation
+firstArrow=<<
+prevArrow=<
+go=Go
+nextArrow=>
+lastArrow=>>
+refresh=Refresh
+search=Search
+filter=Filter:
+numberseparator=of

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_en.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_en.properties?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_en.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_en.properties
Mon Dec  5 12:49:57 2005
@@ -25,4 +25,15 @@
 addnewrole=Add New Role
 adduserstorole=Add Users to Role...
 removecheckedusers=Remove Checked Users
-removerole=Remove Role
\ No newline at end of file
+removerole=Remove Role
+
+# browser navigation
+firstArrow=<<
+prevArrow=<
+go=Go
+nextArrow=>
+lastArrow=>>
+refresh=Refresh
+search=Search
+filter=Filter:
+numberseparator=of

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ja.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ja.properties?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ja.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/resources/RoleDetailsResources_ja.properties
Mon Dec  5 12:49:57 2005
@@ -25,4 +25,15 @@
 addnewrole=\u65b0\u898f\u30ed\u30fc\u30eb\u306e\u8ffd\u52a0
 adduserstorole=\u30ed\u30fc\u30eb\u3078\u30e6\u30fc\u30b6\u30fc\u306e\u8ffd\u52a0...
 removecheckedusers=\u9078\u629e\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fc\u306e\u524a\u9664
-removerole=\u30ed\u30fc\u30eb\u306e\u524a\u9664
\ No newline at end of file
+removerole=\u30ed\u30fc\u30eb\u306e\u524a\u9664
+
+# browser navigation
+firstArrow=<<
+prevArrow=<
+go=\u5b9f\u884c
+nextArrow=>
+lastArrow=>>
+refresh=\u66f4\u65b0
+search=\u691c\u7d22
+filter=\u30d5\u30a3\u30eb\u30bf:
+numberseparator=/
\ No newline at end of file

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleDetails.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleDetails.java?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleDetails.java
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleDetails.java
Mon Dec  5 12:49:57 2005
@@ -76,8 +76,26 @@
     public void getRows(RenderRequest request, String sql, int windowSize)
     throws Exception
     {
+        getRows(request, sql, windowSize, null);        
+    }
+
+    public void getRows(RenderRequest request, String sql, int windowSize, String filter)
+    throws Exception
+    {
         List resultSetTitleList = new ArrayList();
         List resultSetTypeList = new ArrayList();
+        if ( filter != null )
+        {
+            if ( filter.length() == 0 )
+            {
+                filter = null;
+            }
+            else
+            {
+                filter = filter.toLowerCase();
+            }
+        }
+        
         try
         {
             List list = new ArrayList();
@@ -92,8 +110,11 @@
                 {
                     User user = (User)users.next();
                     Principal principal = SecurityUtil.getPrincipal(user.getSubject(),
-                            UserPrincipal.class);                
-                    list.add(principal.getName());
+                            UserPrincipal.class);
+                    if ( filter == null || principal.getName().toLowerCase().startsWith(filter))
+                    {
+                        list.add(principal.getName());
+                    }
                 }
             }
             BrowserIterator iterator = new DatabaseBrowserIterator(
@@ -136,6 +157,12 @@
             this.getContext(request).put("statusMsg", msg);            
         }
           
+        String filtered = (String)PortletMessaging.receive(request, SecurityResources.TOPIC_ROLES,
SecurityResources.MESSAGE_FILTERED);
+        if (filtered != null)
+        {
+            this.getContext(request).put(FILTERED, "on");            
+        }
+
         String refresh = (String)PortletMessaging.consume(request, SecurityResources.TOPIC_ROLES_USERS,
SecurityResources.MESSAGE_REFRESH); 
         if (refresh != null)
         {        

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
Mon Dec  5 12:49:57 2005
@@ -31,6 +31,7 @@
 </script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
 
 #if ($statusMsg)
 #parse ('/WEB-INF/view/status-include.vm')
@@ -41,7 +42,7 @@
 #set ($newGroup = "true")
 #end
 
-<form name='groupForm' action="$renderResponse.createActionURL()" method="post">
+<form name='groupForm' action="$formAction" method="post">
 <table>
   <tr colspan="2" align="right">
     <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('groupname')&nbsp;</td>
@@ -60,16 +61,17 @@
 </form>	      
 
 #if ($newGroup == "false")
-<form name='securityform' action="$renderResponse.createActionURL()" method="post">
+<form name='usersInGroupForm' action="$formAction" method="post">
 <table cellpadding=0 cellspacing=1 border=0 width='100%' >
 #if ($tableSize > 0)
+   <input type="hidden" name="group" value="$!group">
+   <input type="submit" id="removeCheckedUsers" name="group.action.Remove_Checked_Users"
value="$MESSAGES.getString('removecheckedusers')" style="display:none"/>
   <tr>
     #foreach ($column in $title)      
-      <th align='center' class="portlet-section-header" nowrap width="260">
+     <th width="10"></th>
+      <th align='center' class="portlet-section-header" nowrap>
         $column
       </th>
-     <th class="portlet-section-header" width="10"></th>
-     <th width="100%"/>
     #end
   </tr>
 #end  
@@ -80,28 +82,124 @@
     #else
        #set($rowstyle = "portlet-section-alternate")
     #end  
-	  <td class="$rowstyle" nowrap width="260">
+    <td class="$rowstyle" width="10">
+        <input type="checkbox" name="box_$user"/>
+    </td>
+	  <td class="$rowstyle" nowrap>
 	    <div align="center">$user</div>
 	  </td>
-	  <td class="$rowstyle" width="10">
-  	    <input type="checkbox" name="box_$user"/>
-	  </td>
-     <td width="100%"/>	  
    </tr>
   #end
 </table>
+</form>
+
+#if ($tableSize > 0)
+<hr/>
+
+<!-- controls -->
+<table width="200" border="0" cellspacing="0" cellpadding="0" align="center">
+  <tr>
+    #if ($prev)
+      <td valign="middle" height="30">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='first' />        
           
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('firstArrow')">
+            <input type="hidden" name="start" value="0">
+          </form>
+        </div>
+      </td>  
+      <td valign="middle" height="30">
+        <div align="center">
+          <form action="$renderResponse.createActionURL()" method="post">
+            <input type='hidden' name='db.browser.action' value='prev'/>          
         
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('prevArrow')">
+            <input type="hidden" name="start" value="$prev">
+          </form>
+        </div>
+      </td>
+    #end
+    #if ($tableSize > 0)
+      <form action="$formAction" method="post">
+      <td valign="middle" height="30">
+        <div align="center">
+            <input type='hidden' name='db.browser.action' value='change'/>        
           
+            <input type="input" name='start' size='5' value="$start" class="portlet-form-field-label">
+        </div>
+      </td>  
+      <td valign="middle" height="30">
+        <div align="center">
+            <input type="input" readonly size='10' value="$MESSAGES.getString('numberseparator')
$tableSize" class="portlet-form-field-label">            
+        </div>
+      </td>  
+      <td valign="middle" height="30">
+        <div align="center">
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('go')">
           
+        </div>
+      </td>  
+
+      </form>
+      
+    #end    
+    #if ($next)
+      <td valign="middle">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='next'/>          
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('nextArrow')">
+            <input type="hidden" name="start" value="$next">
+          </form>
+        </div>
+      </td>
+      <td valign="middle" height="30">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='last'/>          
         
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('lastArrow')">
+            <input type="hidden" name="start" value="$tableSize">
+          </form>
+        </div>
+      </td>  
+    #end
+    #if ($tableSize > 0)
+      <td valign="middle">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='refresh'/>
+            <input class="portlet-form-button" type="submit" name="eventSubmit_doRefresh"
value="$MESSAGES.getString('refresh')" />
+          </form>
+        </div>
+      </td>
+    #end
+  </tr>
+</table>
+<form action="$formAction" method="post">
+    <input type='hidden' name='db.browser.action' value='search'/>                
   
+    <input type='hidden' name='searchColumn' value='1'/>                        
+    
+  <table>
+  <tr>
+    <td><input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')"></td>
+    <td><input type="text" name="searchString" size="30" value="" class="portlet-form-field-label"></td>
+    <td nowrap align="right" style="vertical-align:middle">&nbsp;$MESSAGES.getString('filter')</td>
+    <td style="vertical-align:middle"><input type="checkbox"  #if($filtered == "on")
checked=1 #end name="filtered"></td>
+  </tr>
+  </table>    
+</form>
+#end
 
+<form name="securityform" action="$formAction" method="post">
 <table>
 <tr>
   <td>
    <input type="submit" name="group.action.Add_New_Group" value="$MESSAGES.getString('addNewGroup')"
class="portlet-form-button"  />
   </td>
   <td>
-   <input onclick="javascript:openWindow('$userChooser')" type="submit" name="group.action.Add_Users_To_Group"
value="$MESSAGES.getString('adduserstogroup')" class="portlet-form-button"  />
+   <input onclick="javascript:openWindow('$userChooser')" type="button" name="group.action.Add_Users_To_Group"
value="$MESSAGES.getString('adduserstogroup')" class="portlet-form-button"  />
   </td>  
 #if ($tableSize > 0)  
   <td>
-   <input type="submit" name="group.action.Remove_Checked_Users" value="$MESSAGES.getString('removecheckedusers')"
class="portlet-form-button" />
+   <input type="button" onclick="javascript:document.forms.usersInGroupForm.removeCheckedUsers.click()"
value="$MESSAGES.getString('removecheckedusers')" class="portlet-form-button" />
   </td>    
 #end
   <td>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
Mon Dec  5 12:49:57 2005
@@ -1,6 +1,7 @@
 <script language='JavaScript' src='/idtb/scripts/idtb.js'></script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
 
 #if ($statusMsg)
 #parse ('/WEB-INF/view/status-include.vm')
@@ -48,7 +49,7 @@
     #if ($prev)
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='first' />         
          
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('firstArrow')">
             <input type="hidden" name="start" value="0">
@@ -57,7 +58,7 @@
       </td>  
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='prev'/>           
        
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('prevArrow')">
             <input type="hidden" name="start" value="$prev">
@@ -66,7 +67,7 @@
       </td>
     #end
     #if ($tableSize > 0)
-      <form action="$renderResponse.createActionURL()" method="post">
+      <form action="$formAction" method="post">
       <td valign="middle" height="30">
         <div align="center">
           	<input type='hidden' name='db.browser.action' value='change'/>         
          
@@ -91,7 +92,7 @@
     #if ($next)
       <td valign="middle">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='next'/>          
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('nextArrow')">
             <input type="hidden" name="start" value="$next">
@@ -100,7 +101,7 @@
       </td>
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='last'/>           
        
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('lastArrow')">
             <input type="hidden" name="start" value="$tableSize">
@@ -111,7 +112,7 @@
     #if ($tableSize > 0)
       <td valign="middle">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='refresh'/>
             <input class="portlet-form-button" type="submit" name="eventSubmit_doRefresh"
value="$MESSAGES.getString('refresh')" />
           </form>
@@ -120,17 +121,16 @@
     #end
   </tr>
 </table>
-<form action="$renderResponse.createActionURL()" method="post">
-  	<input type='hidden' name='db.browser.action' value='search'/>                 
  
-  	<input type='hidden' name='searchColumn' value='1'/>                      	
-    <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')">
-	<input type="text" name="searchString" size="30" value="" class="portlet-form-field-label">
   
-	<table>
-	<tr>
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('filter')&nbsp;&nbsp;&nbsp;</td>
-    <td>	
-	<input type="checkbox"  #if($filtered == "on") checked=1 #end name="filtered">
-	</td>
-	</tr>
-	</table>	
+<form action="$formAction" method="post">
+    <input type='hidden' name='db.browser.action' value='search'/>                
   
+    <input type='hidden' name='searchColumn' value='1'/>                        
+    
+  <table>
+  <tr>
+    <td><input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')"></td>
+    <td><input type="text" name="searchString" size="30" value="" class="portlet-form-field-label"></td>
+    <td nowrap align="right" style="vertical-align:middle">&nbsp;$MESSAGES.getString('filter')</td>
+    <td style="vertical-align:middle"><input type="checkbox"  #if($filtered == "on")
checked=1 #end name="filtered"></td>
+  </tr>
+  </table>    
 </form>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
Mon Dec  5 12:49:57 2005
@@ -31,6 +31,7 @@
 </script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
 
 #if ($statusMsg)
 #parse ('/WEB-INF/view/status-include.vm')
@@ -41,7 +42,7 @@
 #set ($newRole = "true")
 #end
 
-<form name='roleForm' action="$renderResponse.createActionURL()" method="post">
+<form name='roleForm' action="$formAction" method="post">
 <table>
   <tr colspan="2" align="right">
     <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('rolename')&nbsp;</td>
@@ -60,16 +61,17 @@
 </form>	      
 
 #if ($newRole == "false")
-<form name='securityform' action="$renderResponse.createActionURL()" method="post">
+<form name='usersInRoleForm' action="$formAction" method="post">
 <table cellpadding=0 cellspacing=1 border=0 width='100%' >
 #if ($tableSize > 0)
+   <input type="hidden" name="role" value="$!role">
+   <input type="submit" id="removeCheckedUsers" name="role.action.Remove_Checked_Users"
value="$MESSAGES.getString('removecheckedusers')" style="display:none"/>
   <tr>
     #foreach ($column in $title)      
-      <th align='center' class="portlet-section-header" nowrap width="260">
+     <th width="10"></th>
+      <th align='center' class="portlet-section-header" nowrap width="100%">
         $column
       </th>
-     <th class="portlet-section-header" width="10"></th>
-     <th width="100%"/>
     #end
   </tr>
 #end  
@@ -80,28 +82,124 @@
     #else
        #set($rowstyle = "portlet-section-alternate")
     #end  
-	  <td class="$rowstyle" nowrap width="260">
+    <td class="$rowstyle" width="10">
+        <input type="checkbox" name="box_$user"/>
+    </td>
+	  <td class="$rowstyle" nowrap width="100%">
 	    <div align="center">$user</div>
 	  </td>
-	  <td class="$rowstyle" width="10">
-  	    <input type="checkbox" name="box_$user"/>
-	  </td>
-     <td width="100%"/>	  
    </tr>
   #end
 </table>
+</form>
+
+#if ($tableSize > 0)
+<hr/>
+
+<!-- controls -->
+<table width="200" border="0" cellspacing="0" cellpadding="0" align="center">
+  <tr>
+    #if ($prev)
+      <td valign="middle" height="30">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='first' />        
           
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('firstArrow')">
+            <input type="hidden" name="start" value="0">
+          </form>
+        </div>
+      </td>  
+      <td valign="middle" height="30">
+        <div align="center">
+          <form action="$renderResponse.createActionURL()" method="post">
+            <input type='hidden' name='db.browser.action' value='prev'/>          
         
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('prevArrow')">
+            <input type="hidden" name="start" value="$prev">
+          </form>
+        </div>
+      </td>
+    #end
+    #if ($tableSize > 0)
+      <form action="$formAction" method="post">
+      <td valign="middle" height="30">
+        <div align="center">
+            <input type='hidden' name='db.browser.action' value='change'/>        
           
+            <input type="input" name='start' size='5' value="$start" class="portlet-form-field-label">
+        </div>
+      </td>  
+      <td valign="middle" height="30">
+        <div align="center">
+            <input type="input" readonly size='10' value="$MESSAGES.getString('numberseparator')
$tableSize" class="portlet-form-field-label">            
+        </div>
+      </td>  
+      <td valign="middle" height="30">
+        <div align="center">
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('go')">
           
+        </div>
+      </td>  
+
+      </form>
+      
+    #end    
+    #if ($next)
+      <td valign="middle">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='next'/>          
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('nextArrow')">
+            <input type="hidden" name="start" value="$next">
+          </form>
+        </div>
+      </td>
+      <td valign="middle" height="30">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='last'/>          
         
+            <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('lastArrow')">
+            <input type="hidden" name="start" value="$tableSize">
+          </form>
+        </div>
+      </td>  
+    #end
+    #if ($tableSize > 0)
+      <td valign="middle">
+        <div align="center">
+          <form action="$formAction" method="post">
+            <input type='hidden' name='db.browser.action' value='refresh'/>
+            <input class="portlet-form-button" type="submit" name="eventSubmit_doRefresh"
value="$MESSAGES.getString('refresh')" />
+          </form>
+        </div>
+      </td>
+    #end
+  </tr>
+</table>
+<form action="$formAction" method="post">
+    <input type='hidden' name='db.browser.action' value='search'/>                
   
+    <input type='hidden' name='searchColumn' value='1'/>                        
+    
+  <table>
+  <tr>
+    <td><input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')"></td>
+    <td><input type="text" name="searchString" size="30" value="" class="portlet-form-field-label"></td>
+    <td nowrap align="right" style="vertical-align:middle">&nbsp;$MESSAGES.getString('filter')</td>
+    <td style="vertical-align:middle"><input type="checkbox"  #if($filtered == "on")
checked="1" #end name="filtered"></td>
+  </tr>
+  </table>    
+</form>
+#end
 
+<form name="securityform" action="$formAction" method="post">
 <table>
 <tr>
   <td>
    <input type="submit" name="role.action.Add_New_Role" value="$MESSAGES.getString('addnewrole')"
class="portlet-form-button"  />
   </td>
   <td>
-   <input onclick="javascript:openWindow('$userChooser')" type="submit" name="role.action.Add_Users_To_Role"
value="$MESSAGES.getString('adduserstorole')" class="portlet-form-button"  />
+   <input type="button" onclick="javascript:openWindow('$userChooser')" name="role.action.Add_Users_To_Role"
value="$MESSAGES.getString('adduserstorole')" class="portlet-form-button"  />
   </td>  
 #if ($tableSize > 0)  
   <td>
-   <input type="submit" name="role.action.Remove_Checked_Users" value="$MESSAGES.getString('removecheckedusers')"
class="portlet-form-button" />
+   <input type="button" onclick="javascript:document.forms.usersInRoleForm.removeCheckedUsers.click()"
value="$MESSAGES.getString('removecheckedusers')" class="portlet-form-button" />
   </td>    
 #end
   <td>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
Mon Dec  5 12:49:57 2005
@@ -1,6 +1,7 @@
 <script language='JavaScript' src='/idtb/scripts/idtb.js'></script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
 
 #if ($statusMsg)
 #parse ('/WEB-INF/view/status-include.vm')
@@ -48,7 +49,7 @@
     #if ($prev)
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='first' />         
          
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('firstArrow')">
             <input type="hidden" name="start" value="0">
@@ -57,7 +58,7 @@
       </td>  
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='prev'/>           
        
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('prevArrow')">
             <input type="hidden" name="start" value="$prev">
@@ -66,7 +67,7 @@
       </td>
     #end
     #if ($tableSize > 0)
-      <form action="$renderResponse.createActionURL()" method="post">
+      <form action="$formAction" method="post">
       <td valign="middle" height="30">
         <div align="center">
           	<input type='hidden' name='db.browser.action' value='change'/>         
          
@@ -91,7 +92,7 @@
     #if ($next)
       <td valign="middle">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='next'/>          
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('nextArrow')">
             <input type="hidden" name="start" value="$next">
@@ -100,7 +101,7 @@
       </td>
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='last'/>           
        
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('lastArrow')">
             <input type="hidden" name="start" value="$tableSize">
@@ -111,7 +112,7 @@
     #if ($tableSize > 0)
       <td valign="middle">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='refresh'/>
             <input class="portlet-form-button" type="submit" name="eventSubmit_doRefresh"
value="$MESSAGES.getString('refresh')" />
           </form>
@@ -120,17 +121,16 @@
     #end
   </tr>
 </table>
-<form action="$renderResponse.createActionURL()" method="post">
-  	<input type='hidden' name='db.browser.action' value='search'/>                 
  
-  	<input type='hidden' name='searchColumn' value='1'/>                      	
-    <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')">
-	<input type="text" name="searchString" size="30" value="" class="portlet-form-field-label">
   
-	<table>
-	<tr>
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('filter')&nbsp;&nbsp;&nbsp;</td>
-    <td>	
-	<input type="checkbox"  #if($filtered == "on") checked=1 #end name="filtered">
-	</td>
-	</tr>
-	</table>		
+<form action="$formAction" method="post">
+    <input type='hidden' name='db.browser.action' value='search'/>                
   
+    <input type='hidden' name='searchColumn' value='1'/>                        
+    
+  <table>
+  <tr>
+    <td><input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')"></td>
+    <td><input type="text" name="searchString" size="30" value="" class="portlet-form-field-label"></td>
+    <td nowrap align="right" style="vertical-align:middle">&nbsp;$MESSAGES.getString('filter')</td>
+    <td style="vertical-align:middle"><input type="checkbox"  #if($filtered == "on")
checked=1 #end name="filtered"></td>
+  </tr>
+  </table>    
 </form>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm?rev=354180&r1=354179&r2=354180&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
Mon Dec  5 12:49:57 2005
@@ -23,6 +23,7 @@
 <script language='JavaScript' src='/j2-admin/scripts/jetspeed-security.js'></script>
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
 
 #if ($statusMsg)
 #parse ('/WEB-INF/view/status-include.vm')
@@ -70,7 +71,7 @@
     #if ($prev)
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='first' />         
          
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('firstarrow')">
             <input type="hidden" name="start" value="0">
@@ -79,7 +80,7 @@
       </td>  
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='prev'/>           
        
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('prevarrow')">
             <input type="hidden" name="start" value="$prev">
@@ -88,7 +89,7 @@
       </td>
     #end
     #if ($tableSize > 0)
-      <form action="$renderResponse.createActionURL()" method="post">
+      <form action="$formAction" method="post">
       <td valign="middle" height="30">
         <div align="center">
           	<input type='hidden' name='db.browser.action' value='change'/>         
          
@@ -113,7 +114,7 @@
     #if ($next)
       <td valign="middle">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='next'/>          
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('nextarrow')">
             <input type="hidden" name="start" value="$next">
@@ -122,7 +123,7 @@
       </td>
       <td valign="middle" height="30">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='last'/>           
        
             <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('lastarrow')">
             <input type="hidden" name="start" value="$tableSize">
@@ -133,7 +134,7 @@
     #if ($tableSize > 0)
       <td valign="middle">
         <div align="center">
-          <form action="$renderResponse.createActionURL()" method="post">
+          <form action="$formAction" method="post">
           	<input type='hidden' name='db.browser.action' value='refresh'/>
             <input class="portlet-form-button" type="submit" name="eventSubmit_doRefresh"
value="$MESSAGES.getString('refresh')" />
           </form>
@@ -142,17 +143,16 @@
     #end
   </tr>
 </table>
-<form action="$renderResponse.createActionURL()" method="post">
-  	<input type='hidden' name='db.browser.action' value='search'/>                 
  
-  	<input type='hidden' name='searchColumn' value='1'/>                      	
-    <input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')">
-	<input type="text" name="searchString" size="30" value="" class="portlet-form-field-label">
   
-	<table>
-	<tr>
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('filter')&nbsp;&nbsp;&nbsp;</td>
-    <td>	
-	<input type="checkbox"  #if($filtered == "on") checked=1 #end name="filtered">
-	</td>
-	</tr>
-	</table>
+<form action="$formAction" method="post">
+    <input type='hidden' name='db.browser.action' value='search'/>                
   
+    <input type='hidden' name='searchColumn' value='1'/>                        
+    
+  <table>
+  <tr>
+    <td><input class="portlet-form-button" type="submit" value="$MESSAGES.getString('search')"></td>
+    <td><input type="text" name="searchString" size="30" value="" class="portlet-form-field-label"></td>
+    <td nowrap align="right" style="vertical-align:middle">&nbsp;$MESSAGES.getString('filter')</td>
+    <td style="vertical-align:middle"><input type="checkbox"  #if($filtered == "on")
checked=1 #end name="filtered"></td>
+  </tr>
+  </table>    
 </form>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message