portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725991 [27/32] - in /portals/jetspeed-2/applications/j2-admin/trunk: src/main/java/ src/main/java/org/apache/jetspeed/portlets/ src/main/java/org/apache/jetspeed/portlets/admin/ src/main/java/org/apache/jetspeed/portlets/custom/ src/main/j...
Date Fri, 12 Dec 2008 13:05:40 GMT
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.tld?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.tld (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.tld Fri Dec 12 05:05:25 2008
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>Tags for portlets</shortname>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+    <tlibversion>1.0</tlibversion>
+    <jspversion>1.1</jspversion>
+    <shortname>Tags for portlets</shortname>
+    <tag>
+        <name>defineObjects</name>
+        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
+        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+    <tag>
+        <name>param</name>
+        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
+        <bodycontent>empty</bodycontent>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>actionURL</name>
+        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>renderURL</name>
+        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>namespace</name>
+        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/group-details.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/group-details.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/group-details.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/group-details.vm Fri Dec 12 05:05:25 2008
@@ -1,259 +1,259 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: group-details.vm 348264 2005-11-22 22:06:45Z taylor $
-
-*#
-#if ($groupTab == "users")
-#set ($target = "user")
-#set ($Target = "User")
-#set ($targets = "users")
-#set ($Targets = "Users")
-#else
-#set ($target = "role")
-#set ($Target = "Role")
-#set ($targets = "roles")
-#set ($Targets = "Roles")
-#end
-
-<script>
-function openWindow(pipeline)
-{ 
-    var vWin = window.open(pipeline, "${Target}Picker", 'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
-    vWin.opener = self;
-  vWin.focus();
-}
-</script>
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($formAction = $renderResponse.createActionURL())
-
-#if ($statusMsg)
-#parse ('/WEB-INF/view/status-include.vm')
-#end
-#if ($errorMessages)
-#parse ('/WEB-INF/view/errors-include.vm')
-#end
-#if ($group)
-#set ($newGroup = "false")
-#else
-#set ($newGroup = "true")
-#end
-
-<form name='groupForm' action="$formAction" method="post">
-<input type="hidden" name="groupTab" value="$groupTab"/>
-<table>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('groupname')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name='group' size="40" value="$!group" 
-       class="portlet-form-field-label"
-#if ($newGroup == "false") readonly #end
-      >
-    </td>
-  </tr>
-</table>
-
-#if ($newGroup == "true")
-<input type="submit" name="group.action.Save" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
-#end
-</form>       
-
-#if ($newGroup == "false")
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-#set ($tabTarget = $renderResponse.createActionURL()) 
-#if ($groupTab == "users")
-    $tabTarget.setParameter("switchTab", "roles")
-    <td class="LTabLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-    <td class="LTab" align="center" style="vertical-align:middle">$MESSAGES.getString('users')</td>
-    <td class="LTabRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-    <td class="LTabLeftLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-    <td class="LTabLow" align="center" style="vertical-align:middle"><a href="$tabTarget">$MESSAGES.getString('roles')</a></td>
-    <td class="LTabRightLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-#else
-    $tabTarget.setParameter("switchTab", "users")
-    <td class="LTabLeftLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-    <td class="LTabLow" align="center" style="vertical-align:middle"><a href="$tabTarget">$MESSAGES.getString('users')</a></td>
-    <td class="LTabRightLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-    <td class="LTabLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-    <td class="LTab" align="center" style="vertical-align:middle">$MESSAGES.getString('roles')</td>
-    <td class="LTabRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
-#end
-  </tr>
-</table>
-<br/>
-<form name="${targets}InGroupForm" action="$formAction" method="post">
-<input type="hidden" name="groupTab" value="$groupTab"/>
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <input type="hidden" name="group" value="$!group">
-  <input type="submit" id="removeChecked$Targets" name="group.action.Remove_Checked_$Targets" value='$MESSAGES.getString("removechecked$targets")' style="display:none"/>
-  <tr>
-#foreach ($column in $title)      
-     <th width="10"></th>
-      <th align='center' class="portlet-section-header" nowrap>
-        $MESSAGES.getString("$column")
-      </th>
-#end
-  </tr>
-#foreach ( $entry in $table )
-  <tr>
-#if ($velocityCount % 2 == 0)
-#set($rowstyle = "portlet-section-body")
-#else
-#set($rowstyle = "portlet-section-alternate")
-#end  
-    <td class="$rowstyle" width="10">
-        <input type="checkbox" name="box_$entry"/>
-    </td>
-    <td class="$rowstyle" nowrap>
-      <div align="center">$entry</div>
-    </td>
-   </tr>
-#end
-</table>
-</form>
-
-<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="groupTab" value="$groupTab"/>
-            <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="groupTab" value="$groupTab"/>
-            <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">
-      <input type="hidden" name="groupTab" value="$groupTab"/>
-      <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="groupTab" value="$groupTab"/>
-            <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="groupTab" value="$groupTab"/>
-            <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="groupTab" value="$groupTab"/>
-            <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="groupTab" value="$groupTab"/>
-    <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>
-
-
-<form name="securityform" action="$formAction" method="post">
-<input type="hidden" name="groupTab" value="$groupTab"/>
-<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('$popupChooser')" type="button" name="group.action.Add_${Targets}_To_Group" value='$MESSAGES.getString("add${targets}togroup")' class="portlet-form-button"  />
-  </td>  
-#if ($tableSize > 0)  
-  <td>
-   <input type="button" onclick="javascript:document.forms.${targets}InGroupForm.removeChecked${Targets}.click()" value='$MESSAGES.getString("removechecked$targets")' class="portlet-form-button" />
-  </td>    
-#end
-  <td>
-   <input type="submit" name="group.action.Remove_Group" value="$MESSAGES.getString('removegroup')" class="portlet-form-button" />
-  </td>  
-</tr>
-</table>
-<input type='hidden' name="${targets}"/>
-<input type='hidden' name='group' value='$group'/>
-
-</form>
-#end
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: group-details.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+#if ($groupTab == "users")
+#set ($target = "user")
+#set ($Target = "User")
+#set ($targets = "users")
+#set ($Targets = "Users")
+#else
+#set ($target = "role")
+#set ($Target = "Role")
+#set ($targets = "roles")
+#set ($Targets = "Roles")
+#end
+
+<script>
+function openWindow(pipeline)
+{ 
+    var vWin = window.open(pipeline, "${Target}Picker", 'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
+    vWin.opener = self;
+  vWin.focus();
+}
+</script>
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
+
+#if ($statusMsg)
+#parse ('/WEB-INF/view/status-include.vm')
+#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
+#if ($group)
+#set ($newGroup = "false")
+#else
+#set ($newGroup = "true")
+#end
+
+<form name='groupForm' action="$formAction" method="post">
+<input type="hidden" name="groupTab" value="$groupTab"/>
+<table>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('groupname')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name='group' size="40" value="$!group" 
+       class="portlet-form-field-label"
+#if ($newGroup == "false") readonly #end
+      >
+    </td>
+  </tr>
+</table>
+
+#if ($newGroup == "true")
+<input type="submit" name="group.action.Save" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
+#end
+</form>       
+
+#if ($newGroup == "false")
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+#set ($tabTarget = $renderResponse.createActionURL()) 
+#if ($groupTab == "users")
+    $tabTarget.setParameter("switchTab", "roles")
+    <td class="LTabLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+    <td class="LTab" align="center" style="vertical-align:middle">$MESSAGES.getString('users')</td>
+    <td class="LTabRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+    <td class="LTabLeftLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+    <td class="LTabLow" align="center" style="vertical-align:middle"><a href="$tabTarget">$MESSAGES.getString('roles')</a></td>
+    <td class="LTabRightLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+#else
+    $tabTarget.setParameter("switchTab", "users")
+    <td class="LTabLeftLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+    <td class="LTabLow" align="center" style="vertical-align:middle"><a href="$tabTarget">$MESSAGES.getString('users')</a></td>
+    <td class="LTabRightLow" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+    <td class="LTabLeft" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+    <td class="LTab" align="center" style="vertical-align:middle">$MESSAGES.getString('roles')</td>
+    <td class="LTabRight" style="font-size:1pt;" nowrap="true">&nbsp;</td>
+#end
+  </tr>
+</table>
+<br/>
+<form name="${targets}InGroupForm" action="$formAction" method="post">
+<input type="hidden" name="groupTab" value="$groupTab"/>
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <input type="hidden" name="group" value="$!group">
+  <input type="submit" id="removeChecked$Targets" name="group.action.Remove_Checked_$Targets" value='$MESSAGES.getString("removechecked$targets")' style="display:none"/>
+  <tr>
+#foreach ($column in $title)      
+     <th width="10"></th>
+      <th align='center' class="portlet-section-header" nowrap>
+        $MESSAGES.getString("$column")
+      </th>
+#end
+  </tr>
+#foreach ( $entry in $table )
+  <tr>
+#if ($velocityCount % 2 == 0)
+#set($rowstyle = "portlet-section-body")
+#else
+#set($rowstyle = "portlet-section-alternate")
+#end  
+    <td class="$rowstyle" width="10">
+        <input type="checkbox" name="box_$entry"/>
+    </td>
+    <td class="$rowstyle" nowrap>
+      <div align="center">$entry</div>
+    </td>
+   </tr>
+#end
+</table>
+</form>
+
+<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="groupTab" value="$groupTab"/>
+            <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="groupTab" value="$groupTab"/>
+            <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">
+      <input type="hidden" name="groupTab" value="$groupTab"/>
+      <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="groupTab" value="$groupTab"/>
+            <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="groupTab" value="$groupTab"/>
+            <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="groupTab" value="$groupTab"/>
+            <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="groupTab" value="$groupTab"/>
+    <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>
+
+
+<form name="securityform" action="$formAction" method="post">
+<input type="hidden" name="groupTab" value="$groupTab"/>
+<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('$popupChooser')" type="button" name="group.action.Add_${Targets}_To_Group" value='$MESSAGES.getString("add${targets}togroup")' class="portlet-form-button"  />
+  </td>  
+#if ($tableSize > 0)  
+  <td>
+   <input type="button" onclick="javascript:document.forms.${targets}InGroupForm.removeChecked${Targets}.click()" value='$MESSAGES.getString("removechecked$targets")' class="portlet-form-button" />
+  </td>    
+#end
+  <td>
+   <input type="submit" name="group.action.Remove_Group" value="$MESSAGES.getString('removegroup')" class="portlet-form-button" />
+  </td>  
+</tr>
+</table>
+<input type='hidden' name="${targets}"/>
+<input type='hidden' name='group' value='$group'/>
+
+</form>
+#end

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/group-details.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/groups-view.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/groups-view.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/groups-view.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/groups-view.vm Fri Dec 12 05:05:25 2008
@@ -1,157 +1,157 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-<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')
-#end
-#if ($errorMessages)
-#parse ('/WEB-INF/view/errors-include.vm')
-#end
-
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-     <th width='12'></th>
-    #foreach ($column in $title)      
-      <th align='center' class="portlet-section-header" width="100%" nowrap>
-        $MESSAGES.getString("$column")
-      </th>
-    #end
-  </tr>
-  #foreach ( $group in $table )
-  <tr>
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "portlet-section-body")
-    #else
-       #set($rowstyle = "portlet-section-alternate")
-    #end  
-	#set ($action = $renderResponse.createActionURL())
-	$action.setParameter("group", $group)           
-	   #if ($selected == $group)
-       <td class="$rowstyle" nowrap width='12'>
-         <img src="/j2-admin/images/selected.gif" />
-       </td>	 	
-       #else
-       <td class="$rowstyle" nowrap width='12'>
-         &nbsp;
-       </td>             
-       #end
-	  <td class="$rowstyle" nowrap width="100%">
-	    <div align="center"><a href='$action'>$group</a></div>
-	  </td>
-   </tr>
-  #end
-</table>
-
-<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="$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">
-          </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>
-  </tr>
-  <tr>
-    <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>
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+<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')
+#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
+
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+     <th width='12'></th>
+    #foreach ($column in $title)      
+      <th align='center' class="portlet-section-header" width="100%" nowrap>
+        $MESSAGES.getString("$column")
+      </th>
+    #end
+  </tr>
+  #foreach ( $group in $table )
+  <tr>
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "portlet-section-body")
+    #else
+       #set($rowstyle = "portlet-section-alternate")
+    #end  
+	#set ($action = $renderResponse.createActionURL())
+	$action.setParameter("group", $group)           
+	   #if ($selected == $group)
+       <td class="$rowstyle" nowrap width='12'>
+         <img src="/j2-admin/images/selected.gif" />
+       </td>	 	
+       #else
+       <td class="$rowstyle" nowrap width='12'>
+         &nbsp;
+       </td>             
+       #end
+	  <td class="$rowstyle" nowrap width="100%">
+	    <div align="center"><a href='$action'>$group</a></div>
+	  </td>
+   </tr>
+  #end
+</table>
+
+<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="$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">
+          </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>
+  </tr>
+  <tr>
+    <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>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/groups/groups-view.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/permissions/view.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-details.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-details.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-details.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-details.vm Fri Dec 12 05:05:25 2008
@@ -1,217 +1,217 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: role-details.vm 348264 2005-11-22 22:06:45Z taylor $
-
-*#
-
-<script>
-function openWindow(pipeline)
-{ 
-    var vWinUsers = window.open(pipeline, 'UserPicker', 'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
-    vWinUsers.opener = self;
-  vWinUsers.focus();
-}
-</script>
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set ($formAction = $renderResponse.createActionURL())
-
-#if ($statusMsg)
-#parse ('/WEB-INF/view/status-include.vm')
-#end
-#if ($errorMessages)
-#parse ('/WEB-INF/view/errors-include.vm')
-#end
-#if ($role)
-#set ($newRole = "false")
-#else
-#set ($newRole = "true")
-#end
-
-<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>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name='role' size="40" value="$!role" 
-       class="portlet-form-field-label"
-      #if ($newRole == "false") readonly #end
-      >
-    </td>
-  </tr>
-</table>
-
-#if ($newRole == "true")
-<input type="submit" name="role.action.Save" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
-#end
-</form>       
-
-#if ($newRole == "false")
-<form name='usersInRoleForm' action="$formAction" method="post">
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <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 width="10"></th>
-      <th align='center' class="portlet-section-header" nowrap width="100%">
-        $MESSAGES.getString("$column")
-      </th>
-    #end
-  </tr>
-  #foreach ( $user in $table )
-  <tr>
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "portlet-section-body")
-    #else
-       #set($rowstyle = "portlet-section-alternate")
-    #end  
-    <td class="$rowstyle" width="10">
-        <input type="checkbox" name="box_$user"/>
-    </td>
-    <td class="$rowstyle" nowrap width="100%">
-      <div align="center">$user</div>
-    </td>
-   </tr>
-  #end
-</table>
-</form>
-
-<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>
-
-<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 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="button" onclick="javascript:document.forms.usersInRoleForm.removeCheckedUsers.click()" value="$MESSAGES.getString('removecheckedusers')" class="portlet-form-button" />
-  </td>    
-#end
-  <td>
-   <input type="submit" name="role.action.Remove_Role" value="$MESSAGES.getString('removerole')" class="portlet-form-button" />
-  </td>  
-</tr>
-</table>
-<input type='hidden' name='users'/>
-<input type='hidden' name='role' value='$role'/>
-
-</form>
-
-
-#end
-
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: role-details.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+
+<script>
+function openWindow(pipeline)
+{ 
+    var vWinUsers = window.open(pipeline, 'UserPicker', 'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
+    vWinUsers.opener = self;
+  vWinUsers.focus();
+}
+</script>
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($formAction = $renderResponse.createActionURL())
+
+#if ($statusMsg)
+#parse ('/WEB-INF/view/status-include.vm')
+#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
+#if ($role)
+#set ($newRole = "false")
+#else
+#set ($newRole = "true")
+#end
+
+<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>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name='role' size="40" value="$!role" 
+       class="portlet-form-field-label"
+      #if ($newRole == "false") readonly #end
+      >
+    </td>
+  </tr>
+</table>
+
+#if ($newRole == "true")
+<input type="submit" name="role.action.Save" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
+#end
+</form>       
+
+#if ($newRole == "false")
+<form name='usersInRoleForm' action="$formAction" method="post">
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <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 width="10"></th>
+      <th align='center' class="portlet-section-header" nowrap width="100%">
+        $MESSAGES.getString("$column")
+      </th>
+    #end
+  </tr>
+  #foreach ( $user in $table )
+  <tr>
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "portlet-section-body")
+    #else
+       #set($rowstyle = "portlet-section-alternate")
+    #end  
+    <td class="$rowstyle" width="10">
+        <input type="checkbox" name="box_$user"/>
+    </td>
+    <td class="$rowstyle" nowrap width="100%">
+      <div align="center">$user</div>
+    </td>
+   </tr>
+  #end
+</table>
+</form>
+
+<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>
+
+<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 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="button" onclick="javascript:document.forms.usersInRoleForm.removeCheckedUsers.click()" value="$MESSAGES.getString('removecheckedusers')" class="portlet-form-button" />
+  </td>    
+#end
+  <td>
+   <input type="submit" name="role.action.Remove_Role" value="$MESSAGES.getString('removerole')" class="portlet-form-button" />
+  </td>  
+</tr>
+</table>
+<input type='hidden' name='users'/>
+<input type='hidden' name='role' value='$role'/>
+
+</form>
+
+
+#end
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-details.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm Fri Dec 12 05:05:25 2008
@@ -1,94 +1,94 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: user-multi-chooser.vm 348264 2005-11-22 22:06:45Z taylor $
-
-*#
-
-<script language="JavaScript" type="text/javascript">
-    <!--
-    function select(value)
-    {
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['roles'];
-        window.close();
-    }
-	function rowHover(row)
-	{
-	    row.oldClassName = row.className;
-	    row.className = 'jetdbLight';
-	    row.onmouseout = function()
-	    {
-	        this.className = this.oldClassName;
-	    }
-	}    
-	function sendChecks(form)
-	{
-		var result = "";
-		for(var i = 0; i < form.length; i++)
-		{
-		   var e = form.elements[i];
-		   if (e.type == "checkbox")
-		   {
-		       if (e.checked == true)
-		       {
-		       	   result = result + "," + e.name;
-		       }
-		   }
-		}
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['roles'];
-        openerEl.value = result;
-        window.close();
-        openerForm.submit();		
-	}
-    //-->
-</script>
-
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-<form name='roleform' onSubmit='sendChecks(this)'/>
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    #foreach ($column in $title)    
-      <td align='center' class="jetdbHeadNoLink" width="90%" nowrap>
-        $column
-      </td>
-      <th class="jetdbHeadNoLink" width="10"></th>     
-    #end
-  </tr>
-  #foreach ( $role in $table )
-  <tr>
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "jetdbEven")
-    #else
-       #set($rowstyle = "jetdbOdd")
-    #end   
-      <td class="$rowstyle" nowrap width="90%" onmouseover="rowHover(this)">
-        <div align="center">$role</div>
-      </td>
-	  <td class="$rowstyle" width="10">
-  	    <input type="checkbox" name="box_$role"/>
-	  </td>      
-   </tr>
-  #end
-</table>
- <input type="submit" name="add.roles" value="Add Roles" class="jetdbButton"  />
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: user-multi-chooser.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+
+<script language="JavaScript" type="text/javascript">
+    <!--
+    function select(value)
+    {
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['roles'];
+        window.close();
+    }
+	function rowHover(row)
+	{
+	    row.oldClassName = row.className;
+	    row.className = 'jetdbLight';
+	    row.onmouseout = function()
+	    {
+	        this.className = this.oldClassName;
+	    }
+	}    
+	function sendChecks(form)
+	{
+		var result = "";
+		for(var i = 0; i < form.length; i++)
+		{
+		   var e = form.elements[i];
+		   if (e.type == "checkbox")
+		   {
+		       if (e.checked == true)
+		       {
+		       	   result = result + "," + e.name;
+		       }
+		   }
+		}
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['roles'];
+        openerEl.value = result;
+        window.close();
+        openerForm.submit();		
+	}
+    //-->
+</script>
+
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+<form name='roleform' onSubmit='sendChecks(this)'/>
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    #foreach ($column in $title)    
+      <td align='center' class="jetdbHeadNoLink" width="90%" nowrap>
+        $column
+      </td>
+      <th class="jetdbHeadNoLink" width="10"></th>     
+    #end
+  </tr>
+  #foreach ( $role in $table )
+  <tr>
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "jetdbEven")
+    #else
+       #set($rowstyle = "jetdbOdd")
+    #end   
+      <td class="$rowstyle" nowrap width="90%" onmouseover="rowHover(this)">
+        <div align="center">$role</div>
+      </td>
+	  <td class="$rowstyle" width="10">
+  	    <input type="checkbox" name="box_$role"/>
+	  </td>      
+   </tr>
+  #end
+</table>
+ <input type="submit" name="add.roles" value="Add Roles" class="jetdbButton"  />
 </form>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/roles-view.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/roles-view.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/roles-view.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/roles-view.vm Fri Dec 12 05:05:25 2008
@@ -1,157 +1,157 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-<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')
-#end
-#if ($errorMessages)
-#parse ('/WEB-INF/view/errors-include.vm')
-#end
-
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-     <th width='12'></th>
-    #foreach ($column in $title)      
-      <th align='center' class="portlet-section-header" width="100%" nowrap>
-        $MESSAGES.getString("$column")
-      </th>
-    #end
-  </tr>
-  #foreach ( $role in $table )
-  <tr>
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "portlet-section-body")
-    #else
-       #set($rowstyle = "portlet-section-alternate")
-    #end  
-	#set ($action = $renderResponse.createActionURL())
-	$action.setParameter("role", $role)           
-	   #if ($selected == $role)
-       <td class="$rowstyle" nowrap width='12'>
-         <img src="/j2-admin/images/selected.gif" />
-       </td>	 	
-       #else
-       <td class="$rowstyle" nowrap width='12'>
-         &nbsp;
-       </td>             
-       #end
-	  <td class="$rowstyle" nowrap width="100%">
-	    <div align="center"><a href='$action'>$role</a></div>
-	  </td>
-   </tr>
-  #end
-</table>
-
-<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="$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">
-          </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>
-  </tr>
-  <tr>
-    <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>
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+<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')
+#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
+
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+     <th width='12'></th>
+    #foreach ($column in $title)      
+      <th align='center' class="portlet-section-header" width="100%" nowrap>
+        $MESSAGES.getString("$column")
+      </th>
+    #end
+  </tr>
+  #foreach ( $role in $table )
+  <tr>
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "portlet-section-body")
+    #else
+       #set($rowstyle = "portlet-section-alternate")
+    #end  
+	#set ($action = $renderResponse.createActionURL())
+	$action.setParameter("role", $role)           
+	   #if ($selected == $role)
+       <td class="$rowstyle" nowrap width='12'>
+         <img src="/j2-admin/images/selected.gif" />
+       </td>	 	
+       #else
+       <td class="$rowstyle" nowrap width='12'>
+         &nbsp;
+       </td>             
+       #end
+	  <td class="$rowstyle" nowrap width="100%">
+	    <div align="center"><a href='$action'>$role</a></div>
+	  </td>
+   </tr>
+  #end
+</table>
+
+<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="$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">
+          </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>
+  </tr>
+  <tr>
+    <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>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/roles/roles-view.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/edit-prefs.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/edit-prefs.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/edit-prefs.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/edit-prefs.vm Fri Dec 12 05:05:25 2008
@@ -1,4 +1,4 @@
-
+
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,15 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<h2 class="portlet-section-header">Edit Preferences</h2>
-
-<form action="$renderResponse.createActionURL()" method="post">
-<table>
-#foreach ($pref in $prefs)
-#prefField($pref.Key $pref.Value "40")
-#end
-</table>
-<input type="submit" name="Save" value="Save" />
-</form>
-
-
+<h2 class="portlet-section-header">Edit Preferences</h2>
+
+<form action="$renderResponse.createActionURL()" method="post">
+<table>
+#foreach ($pref in $prefs)
+#prefField($pref.Key $pref.Value "40")
+#end
+</table>
+<input type="submit" name="Save" value="Save" />
+</form>
+
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/edit-prefs.vm
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
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