morciuch 2002/12/05 10:05:19
Modified: docs/site changes.html
xdocs changes.xml
Added: webapp/WEB-INF/templates/jsp/screens/html
AccountDisabled.jsp ChangePassword.jsp
NewUserAwaitingAcceptance.jsp NewUserRejected.jsp
Log:
JSP clean up part 2 (see Bugzilla issues 5441 and 5442)
Layout, navigation and screen templates have been modified to match look, feel and
functionality of their Velocity counterparts. Removed redundant language specific
templates (en and de).
From now on, we should perform double maintenance on all layout, navigation, and
screen templates to keep Velocity and Jsp in synch.
Revision Changes Path
1.78 +6 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- changes.html 5 Dec 2002 17:06:43 -0000 1.77
+++ changes.html 5 Dec 2002 18:05:19 -0000 1.78
@@ -133,6 +133,12 @@
</li>
-->
<li>
+ Fixed - Bug 5441 - 2002/12/05 - Remove redundant JSP files in the template
directory (MO)
+</li>
+<li>
+ Fixed - Bug 5442 - 2002/12/05 - Update the JSP templates so they are in parity
with the Velocity (MO)
+</li>
+<li>
Add - 2002/12/05 - PsmlBrowser now supports pattern searches (MO)
</li>
<li>
1.1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/AccountDisabled.jsp
Index: AccountDisabled.jsp
===================================================================
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
<%@ page import = "org.apache.turbine.util.RunData" %>
<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %>
<%
RunData data = (RunData)request.getAttribute("rundata");
%>
<div>
<center>
<table cellpadding="2" cellspacing="0" border="1" width="50%">
<tr>
<td align="center" colspan="3" class="INPUTFORMTITLE">
<jetspeed:l10n key="LOGINHELP_TITLE"/>
</td>
</tr>
<tr>
<td class="INPUTFORM">
<% if (data.getMessage() != null) {
// Message include account creation failure messages. %>
<p><b><%=data.getMessage()%></b></p>
<%}%>
</td>
</tr>
<tr>
<td align="left" colspan="3" class="INPUTFORM">
<p>
<jetspeed:l10n key="LOGINHELP_NOTICE"/>
</p>
<center>
<a
href="mailto:<%=JetspeedResources.getString("mail.support")%>"><%=JetspeedResources.getString("mail.support")%></a>
</center>
</td>
</tr>
</table>
</center>
</div>
1.1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/ChangePassword.jsp
Index: ChangePassword.jsp
===================================================================
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
<%@ page import = "org.apache.turbine.util.RunData" %>
<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %>
<%
RunData data = (RunData)request.getAttribute("rundata");
String username = data.getParameters().getString("username");
if (username == null)
{
username = data.getUser().getUserName();
}
if
(!username.equals(JetspeedResources.getString("services.JetspeedSecurity.user.anonymous")))
{
%>
<div>
<center>
<table cellpadding="2" cellspacing="0" border="1" width="50%">
<tr>
<td align="center" colspan="3" class="INPUTFORMTITLE">
<jetspeed:l10n key="PASSWORDFORM_TITLE"/>
</td>
</tr>
<tr>
<td class="INPUTFORM">
<% if (data.getMessage() != null) {
// Message include account creation failure messages. %>
<p><b><%=data.getMessage()%></b></p>
<%}%>
<form accept-charset="UTF-8, ISO-8859-1"
method="POST"
action="<jetspeed:dynamicUri/>"
enctype="application/x-www-form-urlencoded">
<input name="action" type="hidden" value="ChangePassword">
<input name="username" type="hidden" value="<%=username%>">
<center>
<table cellpadding="0" cellspacing="1" border="0">
<tr>
<td><jetspeed:l10n key="PASSWORDFORM_USERNAMEMSG"/></td>
<td> </td>
<td align="left">
<%=username%>
</td>
</tr>
<tr>
<td><jetspeed:l10n key="PASSWORDFORM_OLDPASSWORDMSG"/></td>
<td> </td>
<td align="left">
<input name="old_password" type="PASSWORD" value="">
</td>
</tr>
<tr>
<td><jetspeed:l10n key="PASSWORDFORM_PASSWORDMSG"/></td>
<td> </td>
<td align="left">
<input name="password" type="PASSWORD" value="">
</td>
</tr>
<tr>
<td><jetspeed:l10n key="PASSWORDFORM_PASSWORDCONFIRMMSG"/></td>
<td> </td>
<td align="left">
<input name="password_confirm" type="PASSWORD" value="">
</td>
</tr>
<tr>
<td colspan="3"> </td>
</tr>
<tr>
<td colspan="3">
<table width="100%">
<tr>
<td align="right" width="40%">
<input name="<jetspeed:l10n key="PASSWORDFORM_CANCEL"/>"
type="submit" value="<jetspeed:l10n key="PASSWORDFORM_CANCEL"/>">
</td>
<td width="10%"> </td>
<td align="left" width="40%">
<input name="<jetspeed:l10n key="PASSWORDFORM_CHANGE"/>"
type="submit" value="<jetspeed:l10n key="PASSWORDFORM_CHANGE"/>">
</td>
</tr>
</table>
</td>
</tr>
</table>
</center>
</form>
</td>
</tr>
</table>
</center>
</div>
<%} else {%>
<h3>Sorry, cannot change password for anonymous user.<h3>
<%}%>
1.1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/NewUserAwaitingAcceptance.jsp
Index: NewUserAwaitingAcceptance.jsp
===================================================================
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %>
<div>
<center>
<table cellpadding="2" cellspacing="0" border="1" width="50%">
<tr>
<td align="center" colspan="3" class="INPUTFORMTITLE">
<jetspeed:l10n key="LOGIN_TITLE"/>
</td>
</tr>
<tr>
<td class="INPUTFORM">
<p><jetspeed:l10n key="JLOGINUSER_REQUEST_RECORDED"/></p>
</td>
</tr>
<tr>
<td align="left" colspan="3" class="INPUTFORM">
<p>
<jetspeed:l10n key="LOGINHELP_NOTICE"/>
</p>
<center>
<a
href="mailto:<%=JetspeedResources.getString("mail.support")%>"><%=JetspeedResources.getString("mail.support")%></a>
</center>
</td>
</tr>
</table>
</center>
</div>
1.1
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/NewUserRejected.jsp
Index: NewUserRejected.jsp
===================================================================
<%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %>
<div>
<center>
<table cellpadding="2" cellspacing="0" border="1" width="50%">
<tr>
<td align="center" colspan="3" class="INPUTFORMTITLE">
<jetspeed:l10n key="LOGIN_TITLE"/>
</td>
</tr>
<tr>
<td class="INPUTFORM">
<p><jetspeed:l10n key="JLOGINUSER_REQUEST_REJECTED"/></p>
</td>
</tr>
<tr>
<td align="left" colspan="3" class="INPUTFORM">
<p>
<jetspeed:l10n key="LOGINHELP_NOTICE"/>
</p>
<center>
<a
href="mailto:<%=JetspeedResources.getString("mail.support")%>"><%=JetspeedResources.getString("mail.support")%></a>
</center>
</td>
</tr>
</table>
</center>
</div>
1.99 +7 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- changes.xml 5 Dec 2002 17:06:44 -0000 1.98
+++ changes.xml 5 Dec 2002 18:05:19 -0000 1.99
@@ -23,6 +23,12 @@
</li>
-->
<li>
+ Fixed - Bug 5441 - 2002/12/05 - Remove redundant JSP files in the template
directory (MO)
+</li>
+<li>
+ Fixed - Bug 5442 - 2002/12/05 - Update the JSP templates so they are in parity
with the Velocity (MO)
+</li>
+<li>
Add - 2002/12/05 - PsmlBrowser now supports pattern searches (MO)
</li>
<li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
