cmlenz 01/09/27 13:45:34
Modified: web/admin addUser.jsp editUser.jsp index.jsp locks.jsp
style.css users.jsp
web/admin/WEB-INF/classes slide-admin.properties
Log:
- Removed disabled root-role checkbox in editUser.jsp
- Some cleanup
Revision Changes Path
1.2 +9 -8 jakarta-slide/web/admin/addUser.jsp
Index: addUser.jsp
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/addUser.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addUser.jsp 2001/09/23 20:27:19 1.1
+++ addUser.jsp 2001/09/27 20:45:34 1.2
@@ -1,4 +1,3 @@
-<%@ page import="java.util.*,org.apache.struts.action.*" %>
<%@ page language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
@@ -9,7 +8,7 @@
<slide:namespace id='namespace'>
<head>
- <title><bean:message key="app.title"/>: <bean:message
key="addUser.title"/></title>
+ <title><bean:message key="app.title"/>: <bean:message key="users.title"/> -
<bean:message key="addUser.title"/></title>
<link rel='stylesheet' type='text/css' href='<html:rewrite
page="/style.css"/>'>
<html:base/>
</head>
@@ -17,13 +16,13 @@
<body bgcolor='#ffffff' marginwidth='0' marginheight='0'>
<table border='0' cellpadding='10' cellspacing='0' width='100%' height='100%'>
<tr>
- <td class='panel' align='right' colspan='2' width='100%'>
- <h1 class='headline1'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
- <h2 class='headline2'><font color='#eeeeee' size='1'>Namespace:
<i><bean:write name='namespace' property='name'/></i></font></h2>
+ <td class='panel' align='right' bgcolor='#023264' colspan='2'
width='100%'>
+ <h1 class='headline'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
+ <h2 class='headline'><font color='#eeeeee' size='1'><bean:message
key="namespace.label"/> <i><bean:write name='namespace'
property='name'/></i></font></h2>
</td>
</tr>
<tr>
- <td class='panel' align='center' bgcolor='#023264' height='100%'>
+ <td class='panel' align='center' bgcolor='#023264' height='100%'
valign='top'>
<hr>
<table border='0' cellpadding='0' cellspacing='0' class='panelMenu'>
<tr>
@@ -50,7 +49,7 @@
<br>
<br>
<html:form action='/addUser' focus='username' styleClass='dialog'>
- <h3 class='headline3'><font color='#555576' size='2'><bean:message
key="addUser.title"/></font></h3>
+ <h3 class='headline'><font color='#555576' size='2'><bean:message
key="addUser.title"/></font></h3>
<hr>
<table border='0'>
<tr>
@@ -86,7 +85,9 @@
<tr>
<td colspan='2' align='center'>
<hr>
- <html:submit><bean:message
key='button.add'/></html:submit> <html:reset><bean:message
key='button.reset'/></html:reset> <html:cancel><bean:message
key='button.cancel'/></html:cancel>
+ <html:submit><bean:message
key='button.add'/></html:submit>
+ <html:reset><bean:message
key='button.reset'/></html:reset>
+ <html:cancel><bean:message
key='button.cancel'/></html:cancel>
</td>
</tr>
</table>
1.2 +9 -16 jakarta-slide/web/admin/editUser.jsp
Index: editUser.jsp
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/editUser.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- editUser.jsp 2001/09/23 20:27:19 1.1
+++ editUser.jsp 2001/09/27 20:45:34 1.2
@@ -8,7 +8,7 @@
<slide:namespace id='namespace'>
<head>
- <title><bean:message key="app.title"/>: <bean:message
key="editUser.title"/></title>
+ <title><bean:message key="app.title"/>: <bean:message key="users.title"/> -
<bean:message key="editUser.title"/></title>
<link rel='stylesheet' type='text/css' href='<html:rewrite
page="/style.css"/>'>
<html:base/>
</head>
@@ -16,13 +16,13 @@
<body bgcolor='#ffffff' marginwidth='0' marginheight='0'>
<table border='0' cellpadding='10' cellspacing='0' width='100%' height='100%'>
<tr>
- <td class='panel' align='right' colspan='2' width='100%'>
- <h1 class='headline1'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
- <h2 class='headline2'><font color='#eeeeee' size='1'>Namespace:
<i><bean:write name='namespace' property='name'/></i></font></h2>
+ <td class='panel' align='right' bgcolor='#023264' colspan='2'
width='100%'>
+ <h1 class='headline'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
+ <h2 class='headline'><font color='#eeeeee' size='1'><bean:message
key="namespace.label"/> <i><bean:write name='namespace'
property='name'/></i></font></h2>
</td>
</tr>
<tr>
- <td class='panel' align='center' bgcolor='#023264' height='100%'>
+ <td class='panel' align='center' bgcolor='#023264' height='100%'
valign='top'>
<hr>
<table border='0' cellpadding='0' cellspacing='0' class='panelMenu'>
<tr>
@@ -49,7 +49,7 @@
<br>
<br>
<html:form action='/saveUser' focus='username' styleClass='dialog'>
- <h3 class='headline3'><font color='#555576' size='2'><bean:message
key="editUser.title"/></font></h3>
+ <h3 class='headline'><font color='#555576' size='2'><bean:message
key="editUser.title"/></font></h3>
<hr>
<html:hidden property='originalUri'/>
<table border='0'>
@@ -70,15 +70,6 @@
</td>
</tr>
<tr>
- <td align='right' valign='middle' class='dialogLabel'>
- <bean:message key='userForm.label.roles'/>
- </td>
- <td align='left' valign='middle'>
- <html:checkbox disabled='true' property='hasRootRole'/>
- <span class='dialogLabel'><bean:message
key='userForm.label.rootRole'/></span>
- </td>
- </tr>
- <tr>
<td align='left' colspan='2'>
<html:errors/>
</td>
@@ -86,7 +77,9 @@
<tr>
<td colspan='2' align='center'>
<hr>
- <html:submit><bean:message
key='button.save'/></html:submit> <html:reset><bean:message
key='button.reset'/></html:reset> <html:cancel><bean:message
key='button.cancel'/></html:cancel>
+ <html:submit><bean:message
key='button.save'/></html:submit>
+ <html:reset><bean:message
key='button.reset'/></html:reset>
+ <html:cancel><bean:message
key='button.cancel'/></html:cancel>
</td>
</tr>
</table>
1.2 +4 -4 jakarta-slide/web/admin/index.jsp
Index: index.jsp
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.jsp 2001/09/23 20:27:19 1.1
+++ index.jsp 2001/09/27 20:45:34 1.2
@@ -16,13 +16,13 @@
<body bgcolor='#ffffff' marginwidth='0' marginheight='0'>
<table border='0' cellpadding='10' cellspacing='0' width='100%' height='100%'>
<tr>
- <td class='panel' align='right' colspan='2' width='100%'>
- <h1 class='headline1'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
- <h2 class='headline2'><font color='#eeeeee' size='1'>Namespace:
<i><bean:write name='namespace' property='name'/></i></font></h2>
+ <td class='panel' align='right' bgcolor='#023264' colspan='2'
width='100%'>
+ <h1 class='headline'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
+ <h2 class='headline'><font color='#eeeeee' size='1'><bean:message
key="namespace.label"/> <i><bean:write name='namespace'
property='name'/></i></font></h2>
</td>
</tr>
<tr>
- <td class='panel' align='center' bgcolor='#023264' height='100%'>
+ <td class='panel' align='center' bgcolor='#023264' height='100%'
valign='top'>
<hr>
<table border='0' cellpadding='0' cellspacing='0' class='panelMenu'>
<tr>
1.2 +4 -4 jakarta-slide/web/admin/locks.jsp
Index: locks.jsp
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/locks.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.jsp 2001/09/23 20:27:19 1.1
+++ locks.jsp 2001/09/27 20:45:34 1.2
@@ -16,13 +16,13 @@
<body bgcolor='#ffffff' marginwidth='0' marginheight='0'>
<table border='0' cellpadding='10' cellspacing='0' width='100%' height='100%'>
<tr>
- <td class='panel' align='right' colspan='2' width='100%'>
- <h1 class='headline1'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
- <h2 class='headline2'><font color='#eeeeee' size='1'><bean:message
key="namespace.label"/><i><bean:write name='namespace'
property='name'/></i></font></h2>
+ <td class='panel' align='right' bgcolor='#023264' colspan='2'
width='100%'>
+ <h1 class='headline'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
+ <h2 class='headline'><font color='#eeeeee' size='1'><bean:message
key="namespace.label"/> <i><bean:write name='namespace'
property='name'/></i></font></h2>
</td>
</tr>
<tr>
- <td class='panel' align='center' bgcolor='#023264' height='100%'>
+ <td class='panel' align='center' bgcolor='#023264' height='100%'
valign='top'>
<hr>
<table border='0' cellpadding='0' cellspacing='0' class='panelMenu'>
<tr>
1.2 +1 -35 jakarta-slide/web/admin/style.css
Index: style.css
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- style.css 2001/09/23 20:27:19 1.1
+++ style.css 2001/09/27 20:45:34 1.2
@@ -7,18 +7,10 @@
padding: 0px;
}
-.headline1 {
+.headline {
font-family: sans-serif;
margin: 0cm;
}
-.headline2 {
- font-family: sans-serif;
- margin: 0cm;
-}
-.headline3 {
- font-family: sans-serif;
- margin: 0cm;
-}
.panel {
background-color: #023264;
@@ -56,39 +48,13 @@
font-size: 9pt;
text-decoration: none;
}
-.panelMenuItemActive {
- background-color: #5787b9;
- color: #023264;
- font-family: sans-serif;
- font-size: 9pt;
- text-decoration: none;
-}
-.toolbar {
- background-color: #ffffff;
- border-style: none;
- border-width: 0px;
- color: #000000;
- font-family: sans-serif;
- font-size: 9pt;
- padding: 0.15cm;
- vertical-align: bottom;
-}
-
.content {
background-color: #ffffff;
color: #000000;
font-size: 9pt;
padding: 0.25cm;
vertical-align: top;
-}
-.contentHeadline {
- color: #023264;
- font-family: sans-serif;
- font-size: 12pt;
- font-style: normal;
- font-weight: bold;
- text-align: left;
}
.contentText {
color: #000000;
1.3 +4 -4 jakarta-slide/web/admin/users.jsp
Index: users.jsp
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/users.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- users.jsp 2001/09/24 16:14:04 1.2
+++ users.jsp 2001/09/27 20:45:34 1.3
@@ -16,13 +16,13 @@
<body bgcolor='#ffffff' marginwidth='0' marginheight='0'>
<table border='0' cellpadding='10' cellspacing='0' width='100%' height='100%'>
<tr>
- <td class='panel' align='right' colspan='2' width='100%'>
- <h1 class='headline1'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
- <h2 class='headline2'><font color='#eeeeee' size='1'>Namespace:
<i><bean:write name='namespace' property='name'/></i></font></h2>
+ <td class='panel' align='right' bgcolor='#023264' colspan='2'
width='100%'>
+ <h1 class='headline'><font color='#ffffff' size='3'><bean:message
key="app.title"/></font></h1>
+ <h2 class='headline'><font color='#eeeeee' size='1'><bean:message
key="namespace.label"/> <i><bean:write name='namespace'
property='name'/></i></font></h2>
</td>
</tr>
<tr>
- <td class='panel' align='center' bgcolor='#023264' height='100%'>
+ <td class='panel' align='center' bgcolor='#023264' height='100%'
valign='top'>
<hr>
<table border='0' cellpadding='0' cellspacing='0' class='panelMenu'>
<tr>
1.4 +1 -1 jakarta-slide/web/admin/WEB-INF/classes/slide-admin.properties
Index: slide-admin.properties
===================================================================
RCS file: /home/cvs/jakarta-slide/web/admin/WEB-INF/classes/slide-admin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slide-admin.properties 2001/09/24 16:14:04 1.3
+++ slide-admin.properties 2001/09/27 20:45:34 1.4
@@ -3,7 +3,7 @@
app.title=Slide Administration
app.welcome=You can use this web application to manage users and locks in the
namespace.
home.title=Home
-namespace.label=Namespace:
+namespace.label=Namespace:
button.add=Add
button.cancel=Cancel
