portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld template.tld
Date Wed, 04 Dec 2002 15:40:26 GMT
morciuch    2002/12/04 07:40:26

  Modified:    webapp/WEB-INF/templates/jsp/layouts/html default.jsp
               webapp/WEB-INF/templates/jsp/navigations/html
                        top_default.jsp top_loggedIn.jsp
               webapp/WEB-INF/templates/jsp/screens/html EditAccount.jsp
                        Login.jsp NewAccount.jsp
               webapp/WEB-INF/templates/jsp/tld template.tld
  Added:       webapp/WEB-INF/templates/jsp/screens/html
                        ConfirmRegistration.jsp LoginHelp.jsp
  Removed:     webapp/WEB-INF/templates/jsp/layouts/html/de default.jsp
               webapp/WEB-INF/templates/jsp/layouts/html/en default.jsp
               webapp/WEB-INF/templates/jsp/navigations/html/de left.jsp
                        top_default.jsp top_loggedIn.jsp
               webapp/WEB-INF/templates/jsp/navigations/html/en left.jsp
                        top_default.jsp top_loggedIn.jsp
               webapp/WEB-INF/templates/jsp/screens/html/de
                        ConfirmRegistration.jsp EditAccount.jsp Login.jsp
                        NewAccount.jsp
               webapp/WEB-INF/templates/jsp/screens/html/en
                        ConfirmRegistration.jsp EditAccount.jsp Login.jsp
                        NewAccount.jsp
  Log:
  JSP clean up part 1 (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).
  
  Revision  Changes    Path
  1.10      +21 -7     jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/default.jsp
  
  Index: default.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/layouts/html/default.jsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- default.jsp	22 May 2002 19:39:44 -0000	1.9
  +++ default.jsp	4 Dec 2002 15:40:23 -0000	1.10
  @@ -1,14 +1,21 @@
   <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
   
  -<%@ page import = "org.apache.turbine.services.resources.TurbineResources" %> 
  +<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %> 
  +
  +<% 
  +String screenJsp = (String)request.getAttribute("screenJsp");
  +String logoFile = null;
  +if (JetspeedResources.getString("topnav.logo.file") != null) {
  +  logoFile = JetspeedResources.getString("topnav.logo.file");
  +}
  +%>
   
  -<% String screenJsp = (String)request.getAttribute("screenJsp"); %>
   
   <html>
   
   <head>
    <base href="<jetspeed:uriLookup type="BaseURL" />">
  - <link href="<%= TurbineResources.getString( "site.stylesheet" ) %>" type="text/css"
rel="stylesheet"> 
  + <link href="<%= JetspeedResources.getString( "site.stylesheet" ) %>" type="text/css"
rel="stylesheet"> 
   </head>
   
   
  @@ -16,8 +23,15 @@
   
   <table cellspacing="0" width="100%" border="0" cellpadding="0">
     <tr>
  -    <td>
  -      <img src="<jetspeed:contentUri href="images/jetspeed-logo.gif" />">
  +      <%
  +      //
  +      // Display the company logo with link back to the the portal home page
  +      //
  +      %>  
  +    <td align="left" width="30%">
  +      <a href="<jetspeed:uriLookup type="Home"/>">
  +        <img border="0" alt="<jetspeed:l10n key="HOME"/>" src="<jetspeed:contentUri
href="<%=logoFile%>"/>">
  +      </a>
       </td>
       <td>
         <jetspeed:navigation  defaultTemplate="top_default.jsp"  loggedInTemplate="top_loggedIn.jsp"
/>
  @@ -33,7 +47,7 @@
   
   <%-- Enable for Debugging ("Included servlet Error: 500")
   Including:<%= screenJsp %> <p>
  ---%>
  + --%>
         <jsp:include page="<%= screenJsp %>" flush="true" /> 
    
       </td>
  @@ -43,7 +57,7 @@
   <table cellspacing="0" width="100%" cellpadding="0" border="0">
     <tr>
       <td valign="bottom" bgcolor="#ffffff">
  -      <jetspeed:navigation  defaultTemplate="html/bottom.jsp" />
  +      <jetspeed:navigation  defaultTemplate="bottom.jsp" />
       </td>
     </tr>
   </table>
  
  
  
  1.2       +69 -5     jakarta-jetspeed/webapp/WEB-INF/templates/jsp/navigations/html/top_default.jsp
  
  Index: top_default.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/navigations/html/top_default.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- top_default.jsp	8 Feb 2001 12:28:51 -0000	1.1
  +++ top_default.jsp	4 Dec 2002 15:40:24 -0000	1.2
  @@ -1,8 +1,72 @@
   <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
   
  +<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %>
  +
   <div>
  -  Welcome to Jetspeed<br />
  -  <a href="<jetspeed:uriLookup type="Login" />">Please login to Jetspeed</a>
  -  <br />
  -  <b>Server date:</b> <jetspeed:info requestedInfo="ServerDate" /><br
/>
  -</div>
  +  <table cellspacing="0" border="0" width="100%">
  +    <tr valign="middle">
  +      <%
  +      //
  +      // Display the welcome message.  This is typicaly where a Banner AD is displayed
  +      //
  +      %>
  +      <td align="center">
  +        <h2><jetspeed:l10n key="TOP_TITLE"/></h2>
  +      </td>
  +      <%
  +      //
  +      // Right column of top navigation bar.
  +      // Optionally allow user login. Required for user creation
  +      // Optionally allow user creation.
  +      //
  +      %>
  +      <%if( JetspeedResources.getBoolean("topnav.user_login.enable") == true) { %>
  +      <td align="right" valign="bottom" width="30%">
  +        <form method="POST" action="<jetspeed:dynamicUri/>" enctype="application/x-www-form-urlencoded">
  +          <input name="action" type="hidden" value="<%=JetspeedResources.getString("action.login")%>">
  +          <table border="0" cellspacing="2" cellpadding="0">
  +            <tr>
  +              <td style="font-size:10"><jetspeed:l10n key="USERFORM_USERNAMEMSG"/></td>
  +              <td>
  +                <input value="" name="username" maxlength="25" type="text" tabindex="1"
style="font-size:10">
  +              </td>
  +              <td rowspan="2" align="center">
  +                <input name="submit" type="submit" value="<jetspeed:l10n key="USERFORM_LOGIN"/>"
tabindex="4"  style="font-size:10" />
  +              </td>
  +              <td>&nbsp;</td>
  +            </tr>
  +            <tr>
  +              <td style="font-size:10"><jetspeed:l10n key="USERFORM_PASSWORDMSG"/></td>
  +              <td>
  +                <input value="" name="password" maxlength="25" type="password" tabindex="2"
style="font-size:10">
  +              </td>
  +            </tr>
  +            <%if ( JetspeedResources.getBoolean("automatic.logon.enable") == true )
{%>
  +            <tr>
  +              <td style="font-size:10" colspan="2">
  +                <input name="rememberme" value="true" type="checkbox" tabindex="3" /><jetspeed:l10n
key="USERFORM_REMEMBERME"/>
  +              </td>
  +            </tr>
  +            <%}%>
  +            <tr>
  +              <td align="center" colspan="3">
  +                <%if( JetspeedResources.getBoolean("topnav.user_creation.enable") ==
true) { %>
  +                <a href="<jetspeed:link template="NewAccount"/>" style="font-size:10"><jetspeed:l10n
key="TOP_CREATENEWACCOUNT"/></a>
  +                &nbsp;|&nbsp;
  +                <%}%>
  +                <a href="<jetspeed:link template="LoginHelp"/>" style="font-size:10"><jetspeed:l10n
key="TOP_LOGINHELP"/></a>
  +              </td>
  +            </tr>
  +            <%
  +            // Leave space between last line and content
  +            %>
  +            <tr>
  +              <td>&nbsp;</td>
  +            </tr>
  +          </table>
  +        </form>
  +      </td>
  +      <%}%>
  +    </tr>
  +  </table>
  + </div>
  
  
  
  1.3       +58 -12    jakarta-jetspeed/webapp/WEB-INF/templates/jsp/navigations/html/top_loggedIn.jsp
  
  Index: top_loggedIn.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/navigations/html/top_loggedIn.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- top_loggedIn.jsp	6 Jun 2001 22:30:32 -0000	1.2
  +++ top_loggedIn.jsp	4 Dec 2002 15:40:24 -0000	1.3
  @@ -1,15 +1,61 @@
   <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
   
  -<div>
  -  Welcome to Jetspeed -> 
  -  <a href="<jetspeed:uriLookup type="Home" />">Home</a>
  -  <br>
  -  <a href="<jetspeed:uriLookup type="Customize" />">Customize</a>
  -  &nbsp;&nbsp;&nbsp;
  -  <a href="<jetspeed:uriLookup type="Logout" />">Logout</a>
  -  &nbsp;&nbsp;&nbsp;
  -  <a href="<jetspeed:uriLookup type="EditAccount" />">Edit Account (<jetspeed:info
requestedInfo="UserName" />)</a>
  -  &nbsp;&nbsp;&nbsp;
  -  <br>
  -  <b>Server date:</b> <jetspeed:info requestedInfo="ServerDate" />
  +<%@ page import = "org.apache.turbine.util.RunData" %>
  +
  +<%
  +RunData data = (RunData) request.getAttribute("rundata");                 
  +%>
  +
  +<div>     
  +  <table cellspacing="0" border="0" width="100%">
  +    <tr valign="middle">
  +      <%
  +      //
  +      // Display the welcome message.  This is typicaly where a Banner AD is displayed
  +      //
  +      %>
  +      <td align="center">
  +        <h2><jetspeed:l10n key="TOP_TITLE"/></h2>
  +      </td>
  +      <%
  +      //
  +      // Right column of top navigation bar. Here we are displaying the
  +      // user's name, link(s) to page customizers, link to account editor, logout
  +      //
  +      %>
  +      <td align="right" valign="bottom" width="30%" >
  +        <table cellpadding="0" cellspacing="0" border="0" >
  +          <tr>
  +            <td align="right" style="font-size:10">
  +              <jetspeed:l10n key="TOP_USERWELCOMEMSG"/> <b><%=data.getUser().getFirstName()%>
<%=data.getUser().getLastName()%></b>
  +            </td>
  +            <td>&nbsp;</td>
  +          </tr>
  +          <tr>
  +            <td align="right"  style="font-size:10">
  +              <jetspeed:l10n key="TOP_CUSTOMIZE"/>: 
  +              <a href="<jetspeed:uriLookup type="Customize"/>" style="font-size:10">HTML</a>
  +              <a href="<jetspeed:uriLookup type="Customize"/>&mtype=wml" 
style="font-size:10">WML</a>
  +            </td>
  +          </tr>
  +          <tr>
  +            <td align="right" style="font-size:10">
  +              <a href="<jetspeed:uriLookup type="EditAccount"/>" style="font-size:10"><jetspeed:l10n
key="TOP_EDITACCOUNT"/> <%=data.getUser().getUserName()%></a>
  +            </td>
  +          </tr>
  +          <tr>
  +            <td align="right" style="font-size:10">
  +              <a href="<jetspeed:uriLookup type="Logout"/>" style="font-size:10"><jetspeed:l10n
key="TOP_LOGOUT"/></a>
  +            </td>
  +          </tr>
  +          <%
  +          // Leave space between last line and content
  +          %>
  +          <tr>
  +            <td>&nbsp;</td>
  +          </tr>
  +        </table>
  +      </td>
  +    </tr>
  +  </table>
   </div>
  
  
  
  1.4       +112 -67   jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/EditAccount.jsp
  
  Index: EditAccount.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/EditAccount.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EditAccount.jsp	7 Jun 2001 22:01:18 -0000	1.3
  +++ EditAccount.jsp	4 Dec 2002 15:40:25 -0000	1.4
  @@ -2,8 +2,10 @@
   
   <%@ page import = "org.apache.turbine.util.RunData" %> 
   <%@ page import = "java.util.Hashtable" %> 
  +<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %> 
   
   <% 
  +    RunData data = (RunData) request.getAttribute("rundata");
       String username  = "";
       String firstname = "";
       String lastname  = "";
  @@ -22,73 +24,116 @@
   <%
           return;
       }
  -
   %>
   
  -<div align="left">
  -
  -<table cellpadding="4" cellspacing="0" border="0">
  -
  -<td>
  -  <h2><u>Edit your account details</u></h2>
  -
  -  <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="UpdateAccount">
  -  <input name="username" type="hidden" value="<%= username %>">
  -
  -<%
  -  String message = ((RunData)request.getAttribute("rundata")).getMessage();
  -  if (message != null) {
  -%>
  -    <p><b> <%= message %> </b></p>
  -<%
  -  }  
  -%>
  -
  -  <table cellpadding="0" cellspacing="0" border="0">
  -    <tr>
  -      <td> Username: </td>
  -      <td> <%= username %> </td>
  -    </tr>
  -    <tr>
  -      <td> Password: </td>
  -      <td> <input name="password" type="PASSWORD" value=""> </td>
  -    </tr>
  -    <tr>
  -      <td> Password (confirm): </td>
  -      <td> <input name="password_confirm" type="PASSWORD" value=""> </td>
  -    </tr>
  -    <tr>
  -      <td colspan="2"> <hr size="1" noshade> </td>
  -    </tr>
  -    <tr>
  -      <td> First Name: </td>
  -      <td> <input name="firstname" type="TEXT" value="<%= firstname %>">
</td> 
  -    </tr>
  -    <tr>
  -      <td> Last Name: </td>
  -      <td> <input name="lastname" type="TEXT" value="<%= lastname %>">
</td>
  -    </tr>
  -    <tr>
  -      <td> Email: </td>
  -      <td> <input name="email" type="TEXT" value="<%= email %>"> </td>
  -    </tr> 
  -    <tr>
  -      <td colspan="2" align="right">
  -        <br />
  -        <input name="cancelBtn" type="submit" value="Cancel">
  -        &nbsp;
  -        <input name="submit2"   type="submit" value="Update Account">
  -      </td>
  -    </tr>
  -  </table>
  -
  -</td>
  -</table>
  -
  -</form>
  -
  +<div>
  +  <center>
  +    <table cellpadding="2" cellspacing="0" border="1" width="50%">
  +      <tr>
  +        <td align="center" colspan="3" class="INPUTFORMTITLE">
  +          <jetspeed:l10n key="EDITACCOUNT_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="UpdateAccount">
  +          <input name="username" type="hidden" value="<%=username%>">
  +          <center>
  +              <table cellpadding="0" cellspacing="1" border="0">
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_USERNAMEMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <%=username%>
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_OLDPASSWORDMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="old_password" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_PASSWORDMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="password" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_PASSWORDCONFIRMMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="password_confirm" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +<%if ( JetspeedResources.getBoolean("automatic.logon.enable") == true ) {%>
  +                <tr>
  +                  <td colspan="3">
  +                    <input name="rememberme" value="true" type="checkbox" 
  +<%if ( data.getCookies().get("logincookie") != null ) {%>
  +                        checked
  +<%}%>
  +                    /><jetspeed:l10n key="USERFORM_REMEMBERME"/>
  +                  </td>
  +                </tr>
  +<%}%>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_FIRSTNAMEMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="firstname" type="TEXT" value="<%=firstname%>">
  +                  </td> 
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_LASTNAMEMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                   <input name="lastname" type="TEXT" value="<%=lastname%>">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_EMAILMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="email" type="TEXT" value="<%=email%>">
  +                  </td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3"><jetspeed:l10n key="NEWACCOUNT_INFOEMAILMSG"/></td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3">&nbsp;</td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3">
  +                    <table width="100%">
  +                      <tr>
  +                        <td align="right" width="40%">
  +                          <input name="cancelBtn" type="submit" value="<jetspeed:l10n
key="USERFORM_CANCEL"/>">
  +                        </td>
  +                        <td width="10%">&nbsp;</td>
  +                        <td align="left" width="40%">
  +                          <input name="submit2" type="submit" value="<jetspeed:l10n
key="USERFORM_UPDATE"/>">
  +                        </td>
  +                      </tr>
  +                    </table>
  +                  </td>
  +                </tr>
  +              </table>
  +            </center>
  +          </form>
  +        </td>
  +      </tr>
  +    </table>
  +  </center>
   </div>
  
  
  
  1.3       +58 -33    jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/Login.jsp
  
  Index: Login.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/Login.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Login.jsp	7 Jun 2001 22:01:18 -0000	1.2
  +++ Login.jsp	4 Dec 2002 15:40:25 -0000	1.3
  @@ -1,38 +1,63 @@
   <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
   
  -<%@ page import = "org.apache.turbine.util.*" %> 
  -<%@ page import = "org.apache.turbine.services.resources.TurbineResources" %> 
  +<%@ page import = "org.apache.turbine.util.RunData" %> 
  +<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %> 
   
  -<% RunData rundata = (RunData)request.getAttribute("rundata"); %>
  +<% RunData data = (RunData)request.getAttribute("rundata"); %>
   
  -<div align="left">
  -<form method="POST" 
  -      action="<jetspeed:dynamicUri/>" 
  -      enctype="application/x-www-form-urlencoded">
  -<input name="action" type="hidden" value="<%= TurbineResources.getString( "action.login"
) %>">
  -
  -<br>
  -<table border="0" cellspacing="2" cellpadding="1">
  -<tr>
  -  <td>Username:</td>
  -  <td><input size="12" value="<%= rundata.getParameters().getString("username",
"") %>" name="username" maxlength="25" type="text"></td>
  -</tr>
  -<tr>
  -  <td>Password:</td>
  -  <td><input size="12" value="" name="password" maxlength="25" type="password"></td>
  -</tr>
  -<tr>
  -  <td colspan="2" align="center">
  -    <input name="submit" type="submit" value="Login">
  -  </td>
  -</tr>
  -<tr>
  -  <td colspan="2" align="center">
  -    <small><a href="<jetspeed:uriLookup type="Enrollment" />">Create
a new account</a></small>
  -  </td>
  -</tr>
  -</table>
  -<br>
  -
  -</form>
  +<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">
  +          <%if (data.getMessage() != null) {
  +            // Message include account creation failure messages.%>
  +            <p><b><%=data.getMessage()%></b></p>
  +          <%}%>
  +          <form method="POST" 
  +               action="<jetspeed:dynamicUri/>" 
  +               enctype="application/x-www-form-urlencoded">
  +            <input name="action" type="hidden" value="<%=JetspeedResources.getString("action.login")%>"
/>
  +            <center>
  +              <table border="0" cellspacing="2" cellpadding="1">
  +                <tr>
  +                  <td><jetspeed:l10n key="LOGIN_USERNAME"/></td>
  +                  <td><input size="12" value="<%=data.getParameters().getString("username",
"")%>" name="username" maxlength="25" type="text" /></td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="LOGIN_PASSWORD"/></td>
  +                  <td><input size="12" value="" name="password" maxlength="25"
type="password" /></td>
  +                </tr>
  +                <%if (JetspeedResources.getBoolean("automatic.logon.enable") == true
) {%>
  +                <tr>
  +                  <td colspan="2">
  +                    <input name="rememberme" value="true" type="checkbox">
  +                    <jetspeed:l10n key="LOGIN_REMEMBERME"/>
  +                  </td>
  +                </tr>
  +                <%}%>
  +                <tr>
  +                  <td colspan="2" align="center">
  +                    <input name="submit" type="submit" value="<jetspeed:l10n key="LOGIN_LOGIN"/>">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td colspan="2" align="center">
  +                    <a href="<jetspeed:link template="NewAccount"/>" style="font-size:10"><jetspeed:l10n
key="LOGIN_NEW_ACCOUNT"/></a>
  +                    &nbsp;|&nbsp;
  +                    <a href="<jetspeed:link template="LoginHelp"/>" style="font-size:10"><jetspeed:l10n
key="TOP_LOGINHELP"/></a>
  +                  </td>
  +                </tr>
  +              </table>
  +            </form>
  +          </center>
  +        </td>
  +      </tr>
  +    </table>
  +  </center>
   </div>
  
  
  
  1.3       +104 -72   jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/NewAccount.jsp
  
  Index: NewAccount.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/NewAccount.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NewAccount.jsp	12 Mar 2001 11:55:31 -0000	1.2
  +++ NewAccount.jsp	4 Dec 2002 15:40:25 -0000	1.3
  @@ -1,78 +1,110 @@
   <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
   
  -<%@ page import = "org.apache.turbine.util.*" %> 
  +<%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %> 
  +<%@ page import = "org.apache.turbine.util.RunData" %>
   
  -<% RunData rundata = (RunData)request.getAttribute("rundata"); %>
  -
  -
  -<div align="left">
  -
  -<table cellpadding="4" cellspacing="0" border="0">
  -
  -<td>
  -  <h2>Create a new Jetspeed account</h2>
  -
  -  To create a new account, please fill in all of the fields below. <br />
  -  After your account has been created, you will receive an email with a confirmation key.
<br />
  -  Enter the confirmation key that you received in the email on the next screen in order
to confirm your registration with the system. <br />
  -  <b>A valid email address is required!</b><br/>
  -
  -  <form accept-charset="UTF-8, ISO-8859-1" 
  -        method="POST" 
  -        action="<jetspeed:link template="ConfirmRegistration" />" 
  -        enctype="application/x-www-form-urlencoded">
  -  <input name="action" type="hidden" value="CreateNewUserAndConfirm">
  -
  -<%
  -  String message = rundata.getMessage();
  -  if (message != null) {
  -%>
  -    <b> <%= message %> </b> <p />
  -<%
  -  }  
  +<% 
  +RunData data = (RunData) request.getAttribute("rundata");                 
   %>
   
  -  <table cellpadding="0" cellspacing="0" border="0">
  -    <tr>
  -      <td> Username: </td>
  -      <td> <input name="username" type="TEXT" value="<%= rundata.getParameters().getString("username",
"") %>"> </td>
  -    </tr>
  -    <tr>
  -      <td> Password: </td>
  -      <td> <input name="password" type="PASSWORD" value=""> </td>
  -    </tr>
  -    <tr>
  -      <td> Password (confirm): </td>
  -      <td> <input name="password_confirm" type="PASSWORD" value=""> </td>
  -    </tr>
  -    <tr>
  -      <td colspan="2"> <hr size="1" noshade> </td>
  -    </tr>
  -    <tr>
  -      <td> First Name: </td>
  -      <td> <input name="firstname" type="TEXT" value="<%= rundata.getParameters().getString("firstname",
"") %>"> </td> 
  -    </tr>
  -    <tr>
  -      <td> Last Name: </td>
  -      <td> <input name="lastname" type="TEXT" value="<%= rundata.getParameters().getString("lastname",
"") %>"> </td>
  -    </tr>
  -    <tr>
  -      <td> Email: </td>
  -      <td> <input name="email" type="TEXT" value="<%= rundata.getParameters().getString("email",
"") %>"> </td>
  -    </tr> 
  -    <tr>
  -      <td colspan="2" align="right">
  -        <br />
  -        <input name="submit1" type="reset"  value="Reset">
  -        &nbsp;
  -        <input name="submit2" type="submit" value="Create New Account">
  -      </td>
  -    </tr>
  -  </table>
  -
  -</td>
  -</table>
  -
  -</form>
  -
  +<div>
  +  <center>
  +    <table cellpadding="2" cellspacing="0" border="1" width="50%">
  +      <tr>
  +        <td align="center" colspan="3" class="INPUTFORMTITLE">
  +          <jetspeed:l10n key="NEWACCOUNT_TITLE"/>
  +        </td>
  +      </tr>
  +      <tr>      
  +        <td class="INPUTFORM">
  +          <p><jetspeed:l10n key="NEWACCOUNT_NOTICE"/></p>
  +          <%if ( JetspeedResources.getBoolean("newuser.approval.enable") == false )
{
  +              if ( JetspeedResources.getBoolean("newuser.confirm.enable") == true ) {
  +            %>
  +              <p><jetspeed:l10n key="NEWACCOUNT_CONFIRMATION"/></p>
  +            <%}
  +          }
  +          else {
  +            %>
  +            <p><jetspeed:l10n key="NEWACCOUNT_APPROVAL"/></p>
  +          <%}
  +          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:link
template="ConfirmRegistration"/>" enctype="application/x-www-form-urlencoded">
  +            <input name="action" type="hidden" value="CreateNewUserAndConfirm">
  +            <center>
  +              <table cellpadding="0" cellspacing="1" border="0">
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_USERNAMEMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="right">
  +                    <input name="username" type="TEXT" value="<%=data.getParameters().getString("username",
"")%>">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_PASSWORDMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="right">
  +                    <input name="password" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_PASSWORDCONFIRMMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="right">
  +                    <input name="password_confirm" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_FIRSTNAMEMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="right">
  +                    <input name="firstname" type="TEXT" value="<%=data.getParameters().getString("firstname",
"")%>">
  +                  </td> 
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_LASTNAMEMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="right">
  +                   <input name="lastname" type="TEXT" value="<%=data.getParameters().getString("lastname",
"")%>">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td><jetspeed:l10n key="USERFORM_EMAILMSG"/></td>
  +                  <td>&nbsp;</td>
  +                  <td align="right">
  +                    <input name="email" type="TEXT" value="<%=data.getParameters().getString("email",
"")%>">
  +                  </td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3"><jetspeed:l10n key="NEWACCOUNT_INFOEMAILMSG"/></td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3">&nbsp;</td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3">
  +                    <table width="100%">
  +                      <tr>
  +                        <td align="right" width="40%">
  +                          <input name="submit1" type="reset" value="<jetspeed:l10n
key="USERFORM_RESET"/>">
  +                        </td>
  +                        <td width="10%">&nbsp;</td>
  +                        <td align="left" width="40%">
  +                          <input name="submit2" type="submit" value="<jetspeed:l10n
key="USERFORM_CREATE"/>">
  +                        </td>
  +                      </tr>
  +                    </table>
  +                  </td>
  +                </tr>
  +              </table>
  +            </center>
  +          </form>
  +        </td>
  +      </tr>
  +    </table>
  +  </center>
   </div>
  
  
  
  1.5       +58 -32    jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/ConfirmRegistration.jsp
  
  
  
  
  1.1                  jakarta-jetspeed/webapp/WEB-INF/templates/jsp/screens/html/LoginHelp.jsp
  
  Index: LoginHelp.jsp
  ===================================================================
  <%@ taglib uri='/WEB-INF/templates/jsp/tld/template.tld' prefix='jetspeed' %>
  
  <%@ page import = "org.apache.jetspeed.services.resources.JetspeedResources" %> 
  <%@ page import = "org.apache.turbine.util.RunData" %>
  
  <% 
  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>
            <%}
            if (JetspeedResources.getBoolean("password.reminder.enable") == true ) {
            %>
            <form accept-charset="UTF-8, ISO-8859-1" method="POST" action="<jetspeed
link template="ConfirmRegistration"/>" enctype="application/x-www-form-urlencoded">
              <input name="action" type="hidden" value="<%=JetspeedResources.getString("action.login")%>">
              <p>
                <jetspeed:l10n key="USERFORM_FORGOTPASSWORD_NOTICE"/>
              </p>
              <center>
                <table cellpadding="0" cellspacing="1" border="0">
                  <tr>
                    <td align="right" valign="middle">
                      <jetspeed:l10n key="USERFORM_USERNAMEMSG"/>
                    </td>
                    <td>&nbsp;</td>
                    <td align="right" valign="middle">
                      <input name="username"  type="TEXT" value="<%=data.getParameters().getString("username")%>">
                    </td>
                    <td align="right" valign="middle">
                      <input name="eventSubmit_doReminder" type="submit" tabindex="5" value="<jetspeed:l10n
key="USERFORM_PASSWORDSEND"/>" style="font-size:10" >
                    </td>
                  </tr>
                </table>
              </center>
            </form>
            <br>
            <%}%>
          </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.13      +1 -0      jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld/template.tld
  
  Index: template.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld/template.tld,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- template.tld	29 Nov 2002 19:26:10 -0000	1.12
  +++ template.tld	4 Dec 2002 15:40:26 -0000	1.13
  @@ -61,6 +61,7 @@
       <attribute>
         <name>href</name>
         <required>true</required>
  +      <rtexprvalue>true</rtexprvalue>      
       </attribute>
     </tag>
     <tag>   
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message