craigmcc 02/02/09 19:15:04 Added: webapps/admin/users footer.jsp group.jsp header.jsp listGroups.jsp listRoles.jsp listUsers.jsp role.jsp roles.jspf user.jsp Log: Migrated (and new) JSP pages for listing and editing groups, roles, and users. Revision Changes Path 1.1 jakarta-tomcat-4.0/webapps/admin/users/footer.jsp <<Binary file>> 1.1 jakarta-tomcat-4.0/webapps/admin/users/group.jsp Index: group.jsp =================================================================== <!-- Standard Struts Entries --> <%@ page language="java" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %> <html:html locale="true"> <%@ include file="header.jsp" %> <!-- Body --> <body bgcolor="white"> <!--Form --> <html:errors/> <html:form method="POST" action="/users/saveGroup" focus="groupname"> <html:hidden property="databaseName"/> <html:hidden property="objectName"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr class="page-title-row"> <td align="left" nowrap> <div class="page-title-text"> <bean:write name="groupForm" property="nodeLabel"/> </div> </td> <td align="right" nowrap> <div class="page-title-text"> <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <!-- will add the urls later once those screens get implemented --> <%-- <controls:action url=""> <bean:message key="users.actions.group.create"/> </controls:action> <controls:action url=""> <bean:message key="users.actions.group.delete"/> </controls:action> --%> </controls:actions> </div> </td> </tr> </table> <%@ include file="../buttons.jsp" %> <br> <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%"> <tr> <td> <controls:table tableStyle="front-table" lineStyle="line-row"> <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> <controls:label> <bean:message key="users.group.properties"/> </controls:label> <controls:data> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.groupname"/> </controls:label> <controls:data> <logic:present name="groupForm" property="objectName"> <bean:write name="groupForm" property="groupname"/> <html:hidden property="groupname"/> </logic:present> <logic:notPresent name="groupForm" property="objectName"> <html:text property="groupname" size="24" maxlength="32"/> </logic:notPresent> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.description"/> </controls:label> <controls:data> <html:text property="description" size="24" maxlength="128"/> </controls:data> </controls:row> </controls:table> </td> </tr> </table> <%@ include file="../buttons.jsp" %> </html:form> <!-- Standard Footer --> <%@ include file="footer.jsp" %> </body> </html:html> 1.1 jakarta-tomcat-4.0/webapps/admin/users/header.jsp Index: header.jsp =================================================================== <!-- Copyright (c) 1999-2002 The Apache Software Foundation. All rights reserved. --> <head> <title><bean:message key="application.title"/></title> <html:base/> <link rel="stylesheet" type="text/css" href="../tree-control-test.css"> <link rel="stylesheet" type="text/css" href="../admin.css"> </head> 1.1 jakarta-tomcat-4.0/webapps/admin/users/listGroups.jsp Index: listGroups.jsp =================================================================== <!-- Standard Struts Entries --> <%@ page language="java" import="java.net.URLEncoder" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %> <html:html locale="true"> <%@ include file="header.jsp" %> <!-- Body --> <body bgcolor="white"> <!--Form --> <html:errors/> <html:form action="/users/listGroups"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> <td width="81%"> <div class="page-title-text" align="left"> <bean:message key="users.listGroups.title"/> </div> </td> <td width="19%"> <div align="right"> <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <controls:action url='<%= "/users/setUpGroup.do?databaseName=" + URLEncoder.encode(request.getParameter("databaseName")) %>'> <bean:message key="users.actions.group.create"/> </controls:action> <%-- <controls:action url=""> <bean:message key="users.actions.group.delete"/> </controls:action> --%> <!-- add the urls later once those screens get implemented --> </controls:actions> </div> </td> </tr> </table> </html:form> <%-- <%@ include file="../buttons.jsp" %> --%> <br> <%-- Groups List --%> <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%"> <tr> <td> <table class="front-table" border="1" cellspacing="0" cellpadding="0" width="100%"> <tr class="header-row"> <td><div align="left" class="table-header-text"> <bean:message key="users.list.groupname"/> </div></td> <td><div align="left" class="table-header-text"> <bean:message key="users.list.description"/> </div></td> </tr> <logic:iterate name="groups" id="group" type="java.lang.String"> <tr class="line-row"> <td><div align="left" class="table-normal-text"> <html:link page='<%= "/users/setUpGroup.do?objectName=" + URLEncoder.encode(group) %>'> <controls:attribute name="group" attribute="groupname"/> </html:link> </div></td> <td><div align="left" class="table-normal-text"> <controls:attribute name="group" attribute="description"/> </div></td> </tr> </logic:iterate> </table> </td> </tr> </table> <%-- <%@ include file="../buttons.jsp" %> --%> <br> <p> </p> </body> </html:html> 1.1 jakarta-tomcat-4.0/webapps/admin/users/listRoles.jsp Index: listRoles.jsp =================================================================== <!-- Standard Struts Entries --> <%@ page language="java" import="java.net.URLEncoder" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %> <html:html locale="true"> <%@ include file="header.jsp" %> <!-- Body --> <body bgcolor="white"> <!--Form --> <html:errors/> <html:form action="/users/listRoles"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> <td width="81%"> <div class="page-title-text" align="left"> <bean:message key="users.listRoles.title"/> </div> </td> <td width="19%"> <div align="right"> <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <controls:action url='<%= "/users/setUpRole.do?databaseName=" + URLEncoder.encode(request.getParameter("databaseName")) %>'> <bean:message key="users.actions.role.create"/> </controls:action> <%-- <controls:action url=""> <bean:message key="users.actions.role.delete"/> </controls:action> --%> <!-- add the urls later once those screens get implemented --> </controls:actions> </div> </td> </tr> </table> </html:form> <br> <%@ include file="roles.jspf" %> <br> </body> </html:html> 1.1 jakarta-tomcat-4.0/webapps/admin/users/listUsers.jsp Index: listUsers.jsp =================================================================== <!-- Standard Struts Entries --> <%@ page language="java" import="java.net.URLEncoder" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %> <html:html locale="true"> <%@ include file="header.jsp" %> <!-- Body --> <body bgcolor="white"> <!--Form --> <html:errors/> <html:form action="/users/listUsers"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> <td width="81%"> <div class="page-title-text" align="left"> <bean:message key="users.listUsers.title"/> </div> </td> <td width="19%"> <div align="right"> <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <controls:action url='<%= "/users/setUpUser.do?databaseName=" + URLEncoder.encode(request.getParameter("databaseName")) %>'> <bean:message key="users.actions.user.create"/> </controls:action> <%-- <controls:action url=""> <bean:message key="users.actions.user.delete"/> </controls:action> --%> <!-- add the urls later once those screens get implemented --> </controls:actions> </div> </td> </tr> </table> </html:form> <%-- <%@ include file="../buttons.jsp" %> --%> <br> <%-- Users List --%> <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%"> <tr> <td> <table class="front-table" border="1" cellspacing="0" cellpadding="0" width="100%"> <tr class="header-row"> <td><div align="left" class="table-header-text"> <bean:message key="users.list.username"/> </div></td> <td><div align="left" class="table-header-text"> <bean:message key="users.list.fullName"/> </div></td> </tr> <logic:iterate name="users" id="user" type="java.lang.String"> <tr class="line-row"> <td><div align="left" class="table-normal-text"> <html:link page='<%= "/users/setUpUser.do?objectName=" + URLEncoder.encode(user) %>'> <controls:attribute name="user" attribute="username"/> </html:link> </div></td> <td><div align="left" class="table-normal-text"> <controls:attribute name="user" attribute="fullName"/> </div></td> </tr> </logic:iterate> </table> </td> </tr> </table> <%-- <%@ include file="../buttons.jsp" %> --%> <br> <p> </p> </body> </html:html> 1.1 jakarta-tomcat-4.0/webapps/admin/users/role.jsp Index: role.jsp =================================================================== <!-- Standard Struts Entries --> <%@ page language="java" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %> <html:html locale="true"> <%@ include file="header.jsp" %> <!-- Body --> <body bgcolor="white"> <!--Form --> <html:errors/> <html:form method="POST" action="/users/saveRole" focus="rolename"> <html:hidden property="databaseName"/> <html:hidden property="objectName"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr class="page-title-row"> <td align="left" nowrap> <div class="page-title-text"> <bean:write name="roleForm" property="nodeLabel"/> </div> </td> <td align="right" nowrap> <div class="page-title-text"> <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <!-- will add the urls later once those screens get implemented --> <%-- <controls:action url=""> <bean:message key="users.actions.role.create"/> </controls:action> <controls:action url=""> <bean:message key="users.actions.role.delete"/> </controls:action> --%> </controls:actions> </div> </td> </tr> </table> <%@ include file="../buttons.jsp" %> <br> <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%"> <tr> <td> <controls:table tableStyle="front-table" lineStyle="line-row"> <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> <controls:label> <bean:message key="users.role.properties"/> </controls:label> <controls:data> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.rolename"/> </controls:label> <controls:data> <logic:present name="roleForm" property="objectName"> <bean:write name="roleForm" property="rolename"/> <html:hidden property="rolename"/> </logic:present> <logic:notPresent name="roleForm" property="objectName"> <html:text property="rolename" size="24" maxlength="32"/> </logic:notPresent> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.description"/>: </controls:label> <controls:data> <html:text property="description" size="24" maxlength="128"/> </controls:data> </controls:row> </controls:table> </td> </tr> </table> <%@ include file="../buttons.jsp" %> </html:form> <!-- Standard Footer --> <%@ include file="footer.jsp" %> </body> </html:html> 1.1 jakarta-tomcat-4.0/webapps/admin/users/roles.jspf Index: roles.jspf =================================================================== <%-- Roles List --%> <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td> <table class="front-table" border="1" cellspacing="0" cellpadding="0" width="100%"> <tr class="header-row"> <logic:present name="roleChecks"> <td><div align="left" class="table-header-text"> </td> </logic:present> <td><div align="left" class="table-header-text"> <bean:message key="users.list.rolename"/> </div></td> <td><div align="left" class="table-header-text"> <bean:message key="users.list.description"/> </div></td> </tr> <logic:iterate name="roles" id="role" type="java.lang.String"> <tr class="line-row"> <logic:present name="roleChecks"> <td><div align="left" class="table-normal-text"> <input type="checkbox" name="roles"> <%-- FIXME: checks --%> </td> </logic:present> <td><div align="left" class="table-normal-text"> <html:link page='<%= "/users/setUpRole.do?objectName=" + URLEncoder.encode(role) %>'> <controls:attribute name="role" attribute="rolename"/> </html:link> </div></td> <td><div align="left" class="table-normal-text"> <controls:attribute name="role" attribute="description"/> </div></td> </tr> </logic:iterate> </table> </td></tr></table> 1.1 jakarta-tomcat-4.0/webapps/admin/users/user.jsp Index: user.jsp =================================================================== <!-- Standard Struts Entries --> <%@ page language="java" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %> <html:html locale="true"> <%@ include file="header.jsp" %> <!-- Body --> <body bgcolor="white"> <!--Form --> <html:errors/> <html:form method="POST" action="/users/saveUser" focus="username"> <html:hidden property="databaseName"/> <html:hidden property="objectName"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr class="page-title-row"> <td align="left" nowrap> <div class="page-title-text"> <bean:write name="userForm" property="nodeLabel"/> </div> </td> <td align="right" nowrap> <div class="page-title-text"> <controls:actions> <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>---- </controls:action> <controls:action> --------------------------------- </controls:action> <!-- will add the urls later once those screens get implemented --> <%-- <controls:action url=""> <bean:message key="users.actions.user.create"/> </controls:action> <controls:action url=""> <bean:message key="users.actions.user.delete"/> </controls:action> --%> </controls:actions> </div> </td> </tr> </table> <%@ include file="../buttons.jsp" %> <br> <table class="back-table" border="0" cellspacing="0" cellpadding="1" width="100%"> <tr> <td> <controls:table tableStyle="front-table" lineStyle="line-row"> <controls:row header="true" labelStyle="table-header-text" dataStyle="table-header-text"> <controls:label> <bean:message key="users.user.properties"/> </controls:label> <controls:data> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.username"/> </controls:label> <controls:data> <logic:present name="userForm" property="objectName"> <bean:write name="userForm" property="username"/> <html:hidden property="username"/> </logic:present> <logic:notPresent name="userForm" property="objectName"> <html:text property="username" size="24" maxlength="32"/> </logic:notPresent> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.password"/> </controls:label> <controls:data> <html:text property="password" size="24" maxlength="32"/> </controls:data> </controls:row> <controls:row labelStyle="table-label-text" dataStyle="table-normal-text"> <controls:label> <bean:message key="users.prompt.fullName"/> </controls:label> <controls:data> <html:text property="fullName" size="24" maxlength="64"/> </controls:data> </controls:row> </controls:table> </td> </tr> </table> <%@ include file="../buttons.jsp" %> </html:form> <!-- Standard Footer --> <%@ include file="footer.jsp" %> </body> </html:html>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>