You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/03/24 10:15:08 UTC
svn commit: r158894 - in lenya/trunk/src/webapp: WEB-INF/
lenya/usecases/admin/
Author: andreas
Date: Thu Mar 24 01:15:06 2005
New Revision: 158894
URL: http://svn.apache.org/viewcvs?view=rev&rev=158894
Log:
improved tab view for admin usecases
Modified:
lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx
lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx
lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx
lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx
lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx
lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx
lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx
lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx
lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx
lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx
lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx
lenya/trunk/src/webapp/lenya/usecases/admin/users.jx
Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Thu Mar 24 01:15:06 2005
@@ -244,37 +244,59 @@
</component-instance>
<component-instance name="admin.users" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.Users">
- <view template="admin/users" menu="true"/>
+ <view template="admin/users" menu="true">
+ <parameter name="tab" value="users"/>
+ </view>
</component-instance>
<component-instance name="admin.addUser" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.AddUser">
- <view template="admin/addUser" menu="true"/>
+ <view template="admin/addUser" menu="true">
+ <parameter name="tab" value="users"/>
+ </view>
</component-instance>
<component-instance name="admin.userProfile" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.UserProfile">
- <view template="admin/userProfile" menu="true"/>
+ <view template="admin/userProfile" menu="true">
+ <parameter name="tab" value="users"/>
+ </view>
</component-instance>
<component-instance name="admin.changePassword" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.UserPassword">
- <view template="admin/changePassword" menu="true"/>
+ <view template="admin/changePassword" menu="true">
+ <parameter name="tab" value="users"/>
+ </view>
</component-instance>
<component-instance name="admin.userGroups" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.UserGroups">
- <view template="admin/userGroups" menu="true"/>
+ <view template="admin/userGroups" menu="true">
+ <parameter name="tab" value="users"/>
+ </view>
</component-instance>
<component-instance name="admin.deleteUser" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.DeleteUser">
- <view template="admin/deleteUser" menu="true"/>
+ <view template="admin/deleteUser" menu="true">
+ <parameter name="tab" value="users"/>
+ </view>
</component-instance>
<component-instance name="admin.groups" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.Groups">
- <view template="admin/groups" menu="true"/>
+ <view template="admin/groups" menu="true">
+ <parameter name="tab" value="groups"/>
+ </view>
</component-instance>
<component-instance name="admin.addGroup" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.AddGroup">
- <view template="admin/addGroup" menu="true"/>
+ <view template="admin/addGroup" menu="true">
+ <parameter name="tab" value="groups"/>
+ </view>
</component-instance>
<component-instance name="admin.groupProfile" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.GroupProfile">
- <view template="admin/groupProfile" menu="true"/>
+ <view template="admin/groupProfile" menu="true">
+ <parameter name="tab" value="groups"/>
+ </view>
</component-instance>
<component-instance name="admin.groupMembers" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.GroupMembers">
- <view template="admin/groupMembers" menu="true"/>
+ <view template="admin/groupMembers" menu="true">
+ <parameter name="tab" value="groups"/>
+ </view>
</component-instance>
<component-instance name="admin.deleteGroup" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.DeleteGroup">
- <view template="admin/deleteGroup" menu="true"/>
+ <view template="admin/deleteGroup" menu="true">
+ <parameter name="tab" value="groups"/>
+ </view>
</component-instance>
<component-instance name="admin.ipRanges" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.IPRanges">
<view template="admin/ipRanges" menu="true"/>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,9 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Add Group</i18n:text></page:title>
<page:body>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Add Group</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -43,5 +44,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,11 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Add <jx:out value="${request.getParameter('userType')}"/></i18n:text></page:title>
<page:body>
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+
+ <h1><i18n:text>Add <jx:out value="${request.getParameter('userType')}"/></i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -67,5 +70,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,11 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Change Password</i18n:text></page:title>
<page:body>
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+
+ <h1><i18n:text>Change Password</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -42,5 +45,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,10 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Delete Group</i18n:text></page:title>
<page:body>
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Delete Group</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -36,5 +38,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx Thu Mar 24 01:15:06 2005
@@ -5,9 +5,10 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Delete User</i18n:text></page:title>
<page:body>
-
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Delete User</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
<input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
@@ -36,5 +37,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,10 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Group Affiliation</i18n:text></page:title>
<page:body>
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Group Affiliation</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -65,5 +67,6 @@
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,10 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Edit Group Profile</i18n:text></page:title>
<page:body>
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Edit Group Profile</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -40,5 +42,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx Thu Mar 24 01:15:06 2005
@@ -5,7 +5,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <jx:import uri="tab/head.jx"/>
<page:body>
<jx:import uri="admin/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx Thu Mar 24 01:15:06 2005
@@ -5,7 +5,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <jx:import uri="tab/head.jx"/>
<page:body>
<jx:import uri="admin/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx Thu Mar 24 01:15:06 2005
@@ -28,7 +28,7 @@
<tr>
<td>
<jx:choose>
- <jx:when test="${request.getParameter('lenya.usecase').equals('admin.users')}">
+ <jx:when test="${usecase.getView().getParameter('tab').equals('users')}">
<a href="?lenya.usecase=admin.users" class="lenya-tablink-active"><i18n:text>Users</i18n:text></a>
</jx:when>
<jx:otherwise>
@@ -38,7 +38,7 @@
</td>
<td>
<jx:choose>
- <jx:when test="${request.getParameter('lenya.usecase').equals('admin.groups')}">
+ <jx:when test="${usecase.getView().getParameter('tab').equals('groups')}">
<a href="?lenya.usecase=admin.groups" class="lenya-tablink-active"><i18n:text>Groups</i18n:text></a>
</jx:when>
<jx:otherwise>
@@ -48,7 +48,7 @@
</td>
<td>
<jx:choose>
- <jx:when test="${request.getParameter('lenya.usecase').equals('admin.ipRanges')}">
+ <jx:when test="${usecase.getView().getParameter('tab').equals('ipRanges')}">
<a href="?lenya.usecase=admin.ipRanges" class="lenya-tablink-active"><i18n:text>IP Ranges</i18n:text></a>
</jx:when>
<jx:otherwise>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx Thu Mar 24 01:15:06 2005
@@ -5,9 +5,10 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Group Affiliation</i18n:text></page:title>
<page:body>
-
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Group Affiliation</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
<input type="hidden" name="lenya.usecase" value="${request.getParameter('lenya.usecase')}"/>
@@ -65,5 +66,6 @@
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx Thu Mar 24 01:15:06 2005
@@ -5,8 +5,10 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <page:title><i18n:text>Edit User Profile</i18n:text></page:title>
<page:body>
+ <jx:import uri="admin/tabs.jx"/>
+ <div id="contentblock1" class="lenya-tab">
+ <h1><i18n:text>Edit User Profile</i18n:text></h1>
<form>
<input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
@@ -55,5 +57,6 @@
</tr>
</table>
</form>
+ </div>
</page:body>
</page:page>
Modified: lenya/trunk/src/webapp/lenya/usecases/admin/users.jx
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/admin/users.jx?view=diff&r1=158893&r2=158894
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/users.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/admin/users.jx Thu Mar 24 01:15:06 2005
@@ -5,7 +5,6 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
>
- <jx:import uri="tab/head.jx"/>
<page:body>
<jx:import uri="admin/tabs.jx"/>
<div id="contentblock1" class="lenya-tab">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org