paulsp      01/12/17 22:29:37

  Modified:    webapp/css default.css
               webapp/WEB-INF/templates/vm/screens/html
                        ConfirmRegistration.vm EditAccount.vm NewAccount.vm
  Log:
  o Return to 1.3a1 look and feel
  o General cleanup
  
  Revision  Changes    Path
  1.9       +0 -5      jakarta-jetspeed/webapp/css/default.css
  
  Index: default.css
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/css/default.css,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- default.css       2001/12/06 06:03:40     1.8
  +++ default.css       2001/12/18 06:29:36     1.9
  @@ -207,11 +207,6 @@
   .PANETITLE {
              background: #FAFAFA;
              font-weight: bold;
  -             
  -           border-top: 1px solid #BABABA;
  -           border-left: 1px solid #BABABA;
  -           border-right: 1px solid #BABABA;
  -           border-bottom: 1px solid #BABABA;
            }             
                
   .BUTON    
  
  
  
  1.7       +55 -41    
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ConfirmRegistration.vm
  
  Index: ConfirmRegistration.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ConfirmRegistration.vm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ConfirmRegistration.vm    2001/12/06 06:03:40     1.6
  +++ ConfirmRegistration.vm    2001/12/18 06:29:36     1.7
  @@ -1,43 +1,57 @@
  -<div align="left">
  -  <form accept-charset="UTF-8, ISO-8859-1"
  -        method="POST" 
  -        action="$link" 
  -        enctype="application/x-www-form-urlencoded">
  -    <input name="username" type="hidden" 
value="$!data.Parameters.getString("username")" />
  -    <input name="password" type="hidden" 
value="$!data.Parameters.getString("password")" />
  -    <input name="$jlink.ActionKey" type="hidden" 
value="$config.getString("action.login")" />
  -
  -    <center>
  -    <table cellpadding="4" cellspacing="0" border="1" class=INPUTFORM>
  -    <tr>
  -      <td class=INPUTFORMTITLE>$l10n.CONFIRMREGISTRATION_MESSAGE 
$!data.Parameters.getString("username")</td>
  -    </tr>
  -    <tr>      
  -      <td>
  -          <p>Please enter your secret key to confirm your registration:</p>
  -          <center>
  -          <table cellpadding="0" cellspacing="0" border="0">
  -            <tr>
  -              <td> Secret Key: </td>
  -              <td align="right">
  -                <input name="secretkey" type="TEXT" value="" />
  -              </td>
  -            </tr>
  -            <tr>
  -              <td colspan="2"> &nbsp; </td>
  -            </tr>
  -            <tr>
  -              <td align="left">
  -                <input name="reset"   type="reset"  value="Reset" class="BUTON" />
  -              </td><td align="right">
  -                <input name="submit2" type="submit" value="Confirm Registration" 
class="BUTON" />
  -              </td>
  -            </tr>
  -          </table>
  -          </center>
  -      </td>
  -    </tr>
  +<div>
  +  <center>
  +    <table cellpadding="2" cellspacing="0" border="1" width="50%">
  +      <tr>
  +        <td align="center" colspan="3" class="INPUTFORMTITLE">
  +          $l10n.CONFIRMREGISTRATION_TITLE
  +        </td>
  +      </tr>
  +      <tr>
  +        <td>
  +          <p>$l10n.CONFIRMREGISTRATION_MESSAGE</p>
  +          #if ($data.Message)
  +            ## Message include account creation failure messages.
  +            <p><b>$data.Message</b></p>
  +          #end
  +          <form accept-charset="UTF-8, ISO-8859-1" 
  +                method="POST" 
  +                action="$link" 
  +                enctype="application/x-www-form-urlencoded">
  +            <input name="username" type="hidden" 
value="$!data.Parameters.getString("username")">
  +            <input name="password" type="hidden" 
value="$!data.Parameters.getString("password")">
  +            <input name="$jlink.ActionKey" type="hidden" 
value="$config.getString("action.login")">
  +            <center>
  +              <table cellpadding="0" cellspacing="1" border="0">
  +                <tr>
  +                  <td>$l10n.CONFIRMREGISTRATION_SECRETKEYTITLE</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="secretkey" type="TEXT" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td colspan="3">&nbsp;</td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3">
  +                    <table width="100%">
  +                      <tr>
  +                        <td align="right" width="40%">
  +                          <input name="reset" type="reset" 
value="$l10n.CONFIRMREGISTRATION_CANCEL">
  +                        </td>
  +                        <td width="10%">&nbsp;</td>
  +                        <td align="left" width="40%">
  +                          <input name="submit2" type="submit" 
value="$l10n.CONFIRMREGISTRATION_CONFIRM">
  +                        </td>
  +                      </tr>
  +                    </table>
  +                  </td>
  +                </tr>
  +              </table>
  +            </center>
  +          </form>
  +        </td>
  +      </tr>
       </table>
  -    </center>
  -  </form>
  +  </center>
   </div>
  
  
  
  1.6       +87 -53    
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/EditAccount.vm
  
  Index: EditAccount.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/EditAccount.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EditAccount.vm    2001/12/06 06:03:40     1.5
  +++ EditAccount.vm    2001/12/18 06:29:36     1.6
  @@ -1,59 +1,93 @@
  -<div align="left">
  -  <form accept-charset="UTF-8, ISO-8859-1" 
  -        method="POST" 
  -        action="$link" 
  -        enctype="application/x-www-form-urlencoded">
  -    <input name="$jlink.ActionKey" type="hidden" value="UpdateAccount" />
  -    <input name="username" type="hidden" value="$!data.User.UserName" />
  -    <center>
  -    <table cellpadding="4" cellspacing="1" border="0" class=INPUTFORM>
  +<div>
  +  <center>
  +    <table cellpadding="2" cellspacing="0" border="1" width="50%">
         <tr>
  -        <td class=INPUTFORMTITLE>$l10n.EDITACCOUNT_TITLE</td>
  +        <td align="center" colspan="3" class="INPUTFORMTITLE">
  +          $l10n.EDITACCOUNT_TITLE
  +        </td>
         </tr>
         <tr>
           <td>
  -#if ($data.Message)
  -          <p><b>$data.Message</b></p>
  -#end
  -          <table cellpadding="0" cellspacing="0" border="0">
  -            <tr>
  -              <td> $l10n.USERFORM_USERNAMEMSG </td>
  -              <td>$data.User.UserName </td>
  -            </tr>
  -            <tr>
  -              <td> $l10n.USERFORM_PASSWORDMSG </td>
  -              <td align=right><input name="password" type="PASSWORD" value="" /> 
</td>
  -            </tr>
  -            <tr>
  -              <td> $l10n.USERFORM_PASSWORDCONFIRMMSG &nbsp;&nbsp;</td>
  -              <td align=right><input name="password_confirm" type="PASSWORD" 
value="" /> </td>
  -            </tr>
  -            <tr>
  -              <td colspan="2"> <hr size="1" noshade /> </td>
  -            </tr>
  -            <tr>
  -              <td> $l10n.USERFORM_FIRSTNAMEMSG </td>
  -              <td align=right><input name="firstname" type="TEXT" 
value="$!data.User.FirstName" /> </td> 
  -            </tr>
  -            <tr>
  -              <td> $l10n.USERFORM_LASTNAMEMSG </td>
  -              <td align=right><input name="lastname" type="TEXT" 
value="$!data.User.LastName" /> </td>
  -            </tr>
  -            <tr>
  -              <td> $l10n.USERFORM_EMAILMSG </td>
  -              <td align=right><input name="email" type="TEXT" 
value="$!data.User.Email" /> </td>
  -            </tr> 
  -            <tr>
  -              <td colspan=2>&nbsp;</td>
  -            </tr> 
  -            <tr>
  -              <td align=left><input name="cancelBtn" type="submit" 
value="$l10n.USERFORM_CANCEL" class="BUTON"/></td>
  -              <td align=right><input name="submit2"   type="submit" 
value="$l10n.USERFORM_UPDATE" class="BUTON"/></td>
  -              </td>
  -            </tr>
  -        </table>
  -      </td>
  +          #if ($data.Message)
  +            ## Message include account creation failure messages.
  +            <p><b>$data.Message</b></p>
  +          #end
  +          <form accept-charset="UTF-8, ISO-8859-1" 
  +              method="POST" 
  +              action="$link" 
  +              enctype="application/x-www-form-urlencoded">
  +          <input name="$jlink.ActionKey" type="hidden" value="UpdateAccount">
  +          <input name="username" type="hidden" value="$!data.User.UserName">
  +          <center>
  +              <table cellpadding="0" cellspacing="1" border="0">
  +                <tr>
  +                  <td>$l10n.USERFORM_USERNAMEMSG</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    $data.User.UserName
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td>$l10n.USERFORM_PASSWORDMSG</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="password" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td>$l10n.USERFORM_PASSWORDCONFIRMMSG</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="password_confirm" type="PASSWORD" value="">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td>$l10n.USERFORM_FIRSTNAMEMSG</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="firstname" type="TEXT" 
value="$!data.User.FirstName">
  +                  </td> 
  +                </tr>
  +                <tr>
  +                  <td>$l10n.USERFORM_LASTNAMEMSG</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                   <input name="lastname" type="TEXT" value="$!data.User.LastName">
  +                  </td>
  +                </tr>
  +                <tr>
  +                  <td>$l10n.USERFORM_EMAILMSG</td>
  +                  <td>&nbsp;</td>
  +                  <td align="left">
  +                    <input name="email" type="TEXT" value="$!data.User.Email">
  +                  </td>
  +                </tr> 
  +                <tr>
  +                  <td colspan="3">$l10n.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="$l10n.USERFORM_CANCEL">
  +                        </td>
  +                        <td width="10%">&nbsp;</td>
  +                        <td align="left" width="40%">
  +                          <input name="submit2" type="submit" 
value="$l10n.USERFORM_UPDATE">
  +                        </td>
  +                      </tr>
  +                    </table>
  +                  </td>
  +                </tr>
  +              </table>
  +            </center>
  +          </form>
  +        </td>
  +      </tr>
       </table>
  -    </center>
  -  </form>
  +  </center>
   </div>
  
  
  
  1.10      +6 -5      
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm
  
  Index: NewAccount.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/NewAccount.vm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NewAccount.vm     2001/12/17 22:55:22     1.9
  +++ NewAccount.vm     2001/12/18 06:29:36     1.10
  @@ -1,10 +1,11 @@
   <div>
     <center>
  -    <h1>$l10n.NEWACCOUNT_TITLE</h1>
  -  </center>
  -  <br>
  -  <center>
  -    <table cellpadding="0" cellspacing="0" border="1" width="50%">
  +    <table cellpadding="2" cellspacing="0" border="1" width="50%">
  +      <tr>
  +        <td align="center" colspan="3" class="INPUTFORMTITLE">
  +          $l10n.NEWACCOUNT_TITLE
  +        </td>
  +      </tr>
         <tr>      
           <td>
             <p>$l10n.NEWACCOUNT_NOTICE</p>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to