amyroh 2003/03/28 14:38:36
Modified: webapps/admin/users group.jsp groups.jspf roles.jspf
user.jsp
Log:
Fix tomcat-user page.
Revision Changes Path
1.6 +2 -1 jakarta-tomcat-catalina/webapps/admin/users/group.jsp
Index: group.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/group.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- group.jsp 12 Feb 2003 10:08:45 -0000 1.5
+++ group.jsp 28 Mar 2003 22:38:35 -0000 1.6
@@ -108,7 +108,8 @@
</table>
<bean:define id="checkboxes" scope="page" value="true"/>
-
+ <br>
+ <%@ include file="roles.jspf" %>
<%@ include file="../buttons.jsp" %>
1.4 +11 -9 jakarta-tomcat-catalina/webapps/admin/users/groups.jspf
Index: groups.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/groups.jspf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- groups.jspf 28 Mar 2003 02:51:07 -0000 1.3
+++ groups.jspf 28 Mar 2003 22:38:35 -0000 1.4
@@ -7,22 +7,23 @@
cellspacing="0" cellpadding="0" width="100%">
<tr class="header-row">
<logic:present name="checkboxes">
- <th scope="col" width="5%"><div align="left" class="table-header-text">
+ <td width="5%"><div align="left" class="table-header-text">
- </th>
+ </td>
</logic:present>
- <th scope="col" width="20%"><div align="left" class="table-header-text">
+ <td width="20%"><div align="left" class="table-header-text">
<bean:message key="users.list.groupname"/>
- </div></th>
- <th scope="col"><div align="left" class="table-header-text">
+ </div></td>
+ <td><div align="left" class="table-header-text">
<bean:message key="users.list.description"/>
- </div></th>
+ </div></td>
</tr>
+ <logic:present name="groupsForm">
<logic:iterate name="groupsForm" property="groups"
id="group" type="java.lang.String">
<tr class="line-row">
<logic:present name="checkboxes">
- <td scope="row"><div align="center" class="table-normal-text">
+ <td><div align="center" class="table-normal-text">
<logic:present name="userForm">
<label for="groups"></label>
<html:multibox property="groups" value="<%= group %>"
styleId="groups"/>
@@ -34,7 +35,7 @@
</logic:notPresent>
</td>
</logic:present>
- <td scope="row"><div align="left" class="table-normal-text">
+ <td><div align="left" class="table-normal-text">
<html:link page='<%= "/users/setUpGroup.do?objectName=" +
URLEncoder.encode(group) +
"&databaseName=" +
@@ -42,11 +43,12 @@
<controls:attribute name="group" attribute="groupname"/>
</html:link>
</div></td>
- <td scope="row"><div align="left" class="table-normal-text">
+ <td><div align="left" class="table-normal-text">
<controls:attribute name="group" attribute="description"/>
</div></td>
</tr>
</logic:iterate>
+ </logic:present>
</table>
</td></tr></table>
1.4 +9 -7 jakarta-tomcat-catalina/webapps/admin/users/roles.jspf
Index: roles.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/roles.jspf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- roles.jspf 28 Mar 2003 02:51:07 -0000 1.3
+++ roles.jspf 28 Mar 2003 22:38:35 -0000 1.4
@@ -11,18 +11,19 @@
</td>
</logic:present>
- <th scope="col" width="20%"><div align="left" class="table-header-text">
+ <td width="20%"><div align="left" class="table-header-text">
<bean:message key="users.list.rolename"/>
- </div></th>
- <th scope="col"><div align="left" class="table-header-text">
+ </div></td>
+ <td><div align="left" class="table-header-text">
<bean:message key="users.list.description"/>
- </div></th>
+ </div></td>
</tr>
+ <logic:present name="rolesForm">
<logic:iterate name="rolesForm" property="roles"
id="role" type="java.lang.String">
<tr class="line-row">
<logic:present name="checkboxes">
- <td scope="row"><div align="center" class="table-normal-text">
+ <td><div align="center" class="table-normal-text">
<logic:present name="groupForm">
<label for="roles"></label>
<html:multibox property="roles" value="<%= role %>" styleId="roles"/>
@@ -40,7 +41,7 @@
</logic:notPresent>
</td>
</logic:present>
- <td scope="row"><div align="left" class="table-normal-text">
+ <td><div align="left" class="table-normal-text">
<html:link page='<%= "/users/setUpRole.do?objectName=" +
URLEncoder.encode(role) +
"&databaseName=" +
@@ -48,11 +49,12 @@
<controls:attribute name="role" attribute="rolename"/>
</html:link>
</div></td>
- <td scope="row"><div align="left" class="table-normal-text">
+ <td><div align="left" class="table-normal-text">
<controls:attribute name="role" attribute="description"/>
</div></td>
</tr>
</logic:iterate>
+ </logic:present>
</table>
</td></tr></table>
1.6 +3 -0 jakarta-tomcat-catalina/webapps/admin/users/user.jsp
Index: user.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/user.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- user.jsp 12 Feb 2003 10:08:45 -0000 1.5
+++ user.jsp 28 Mar 2003 22:38:35 -0000 1.6
@@ -120,6 +120,9 @@
<bean:define id="checkboxes" scope="page" value="true"/>
<br>
+ <%@ include file="groups.jspf" %>
+ <br>
+ <%@ include file="roles.jspf" %>
<%@ include file="../buttons.jsp" %>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
