Author: jmcconnell
Date: Tue Sep 12 17:35:45 2006
New Revision: 442771
URL: http://svn.apache.org/viewvc?view=rev&rev=442771
Log:
applied patch from joakim that cleaned up some jsp, thanks!
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=442771&r1=442770&r2=442771
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Tue Sep 12 17:35:45 2006
@@ -59,8 +59,8 @@
<div id="breadcrumbs">
<div class="xleft">
- <ww:url id="loginUrl" action="login" namespace="/" includeParams="none"/>
- <ww:url id="registerUrl" action="register" namespace="/"
includeParams="none"/>
+ <ww:url id="loginUrl" action="login" method="input" namespace="/"
includeParams="none"/>
+ <ww:url id="registerUrl" action="register" method="input" namespace="/"
includeParams="none"/>
<ww:if test="${sessionScope.authStatus != true}">
<ww:a href="%{loginUrl}">Login</ww:a> - <ww:a
href="%{registerUrl}">Register</ww:a>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp?view=diff&rev=442771&r1=442770&r2=442771
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/login.jsp
Tue Sep 12 17:35:45 2006
@@ -27,50 +27,46 @@
<div id="contentArea">
<div id="searchBox">
- <div style="float: right">
- <a href="#">Forgotten your Password?</a>
-
+
+ <div id="results">
+ <%-- This is where the "Account Created Successfully" type message goes.
--%>
+ <div class="success">
+ <ww:actionmessage />
+ </div>
+ <%-- This is where errors from the action and other non-form field
specific errors appear. --%>
+ <div class="errors">
+ <ww:actionerror />
+ </div>
</div>
- <p>
- <ww:actionmessage/>
- <ww:actionerror/>
- </p>
-
<h2>Login</h2>
- <ww:form action="login" method="post">
- <table class="bodyTable">
- <tr class="a">
- <th>
- Username
- </th>
- <td>
- <ww:textfield name="username" size="30"/>
- </td>
- </tr>
- <tr class="b">
- <th>
- Password
- </th>
- <td>
- <ww:password name="password" size="20"/>
- </td>
- </tr>
- <tr class="a">
- <td></td>
- <td>
- <ww:submit value="Login"/>
- </td>
- </tr>
- </table>
+ <%-- You don't need a table to wrap form elements in,
+ the ww:form creates the table, labels, context sensitive
actionerrors, requirements indicators, etc...
+ - Joakim --%>
+ <ww:form action="login" method="post">
+ <ww:textfield label="Username" name="username" size="30" required="true"
/>
+ <ww:password label="Password" name="password" size="20" required="true"
/>
+ <ww:submit value="Login"/>
</ww:form>
-
- <p>
- <ww:url id="registerUrl" action="register"/>
- Need an Account? <ww:a href="%{registerUrl}">Register!</ww:a>
- </p>
+
+ <ul class="tips">
+ <li>
+ Forgot your Username?
+ <ww:url id="forgottenAccount" action="findAccount" />
+ <ww:a href="%{forgottenAccount}">Email me my account
information.</ww:a>
+ </li>
+ <li>
+ Forgot your Password?
+ <ww:url id="forgottenPassword" action="resetPassword" />
+ <ww:a href="%{forgottenPassword}">Request a password reset.</ww:a>
+ </li>
+ <li>
+ Need an Account?
+ <ww:url id="registerUrl" action="register" />
+ <ww:a href="%{registerUrl}">Register!</ww:a>
+ </ul>
</div>
</div>
Modified:
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp?view=diff&rev=442771&r1=442770&r2=442771
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
(original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/register.jsp
Tue Sep 12 17:35:45 2006
@@ -27,63 +27,31 @@
<div id="contentArea">
<div id="searchBox">
- <p>
- <ww:actionmessage/>
- <ww:actionerror/>
- </p>
+
+ <div id="results">
+ <%-- This is where the "Account Created Successfully" type message goes.
--%>
+ <div class="success">
+ <ww:actionmessage />
+ </div>
+ <%-- This is where errors from the action and other non-form field
specific errors appear. --%>
+ <div class="errors">
+ <ww:actionerror />
+ </div>
+ </div>
<h2>Register for an Account</h2>
- <ww:form action="register" method="post">
- <table class="bodyTable">
- <tr class="b">
- <th>
- Username
- </th>
- <td>
- <ww:textfield name="username" size="30"/>
- </td>
- </tr>
- <tr class="a">
- <th>
- Password
- </th>
- <td>
- <ww:password name="password" size="20"/>
- </td>
- </tr>
- <tr class="b">
- <th>
- Confirm Password
- </th>
- <td>
- <ww:password name="confirmPassword" size="20"/>
- </td>
-
- </tr>
- <tr class="a">
- <th>
- Full Name
- </th>
- <td>
- <ww:textfield name="fullName" size="30"/>
- </td>
- </tr>
- <tr class="b">
- <th>
- Email
- </th>
- <td>
- <ww:textfield name="email" size="50 "/>
- </td>
- </tr>
- <tr class="a">
- <td></td>
- <td>
- <ww:submit value="Register"/>
- </td>
- </tr>
- </table>
+ <%-- You don't need a table to wrap form elements in,
+ the ww:form creates the table, labels, context sensitive
actionerrors, requirements indicators, etc...
+ - Joakim --%>
+
+ <ww:form action="register" method="post">
+ <ww:textfield label="Username" name="username"
size="30" required="true"/>
+ <ww:password label="Password" name="password"
size="20" required="true"/>
+ <ww:password label="Confirm Password" name="confirmPassword"
size="20" required="true"/>
+ <ww:textfield label="Full Name" name="fullName" size="30"
required="true"/>
+ <ww:textfield label="Email Address" name="email" size="50"
required="true"/>
+ <ww:submit value="Register"/>
</ww:form>
</div>
