Log message for revision 37783: - instead of 'name' or 'username' use 'member ID' as in other places - use 'atool' and 'portal_url' from main_template - some cleanup
Changed: U CMF/trunk/CMFDefault/skins/zpt_generic/login_form.pt -=- Modified: CMF/trunk/CMFDefault/skins/zpt_generic/login_form.pt =================================================================== --- CMF/trunk/CMFDefault/skins/zpt_generic/login_form.pt 2005-08-07 23:40:23 UTC (rev 37782) +++ CMF/trunk/CMFDefault/skins/zpt_generic/login_form.pt 2005-08-08 11:33:45 UTC (rev 37783) @@ -1,13 +1,13 @@ -<html xmlns:tal="http://xml.zope.org/namespaces/tal"; - xmlns:metal="http://xml.zope.org/namespaces/metal"; - metal:use-macro="here/main_template/macros/master"> +<html metal:use-macro="context/main_template/macros/master"> <body> -<div metal:fill-slot="main" i18n:domain="cmf_default" - tal:define="atool here/portal_actions"> -<div class="Desktop"> -<h2 i18n:translate="">Log in</h2> +<metal:slot metal:fill-slot="header" i18n:domain="cmf_default"> +<h1 i18n:translate="">Log in</h1> +</metal:slot> +<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"> +<div class="Desktop"> + <form action="" method="post" tal:attributes="action python: atool.getActionInfo( 'user/logged_in')['url']"> @@ -20,63 +20,53 @@ <!-- ****** Enable the automatic redirect ***** --> <table class="FormLayout"> -<tr> - <td align="left" valign="top"> - <strong i18n:translate="">Name</strong> - </td> - <td align="left" valign="top"> + <tr> + <th i18n:translate="">Member ID</th> + <td> <input type="text" name="__ac_name" size="20" value="" tal:attributes="value python: request.get('__ac_name') or ''" /> </td> -</tr> -<tr> - <td align="left" valign="top"> - <strong i18n:translate="">Password</strong> - </td> - <td align="left" valign="top"> + </tr> + <tr> + <th i18n:translate="">Password</th> + <td> <input type="password" name="__ac_password" size="20" /> </td> -</tr> - -<tr valign="top" align="left"> -<td></td> -<td><input type="checkbox" name="__ac_persistent" value="1" checked + </tr> + <tr> + <td> </td> +<td><input type="checkbox" name="__ac_persistent" value="1" checked="checked" id="cb_remember" /> -<label for="cb_remember" i18n:translate="">Remember my name.</label> -</td></tr> - -<tr> - <td align="left" valign="top"> +<label for="cb_remember" i18n:translate="">Remember my ID.</label> </td> - <td align="left" valign="top"> + </tr> + <tr> + <td> </td> + <td> <input type="submit" name="submit" value="Login" i18n:attributes="value" /> </td> -</tr> - + </tr> </table> </form> <p><a href="" - tal:attributes="href string:${here/portal_url}/mail_password_form" + tal:attributes="href string:${portal_url}/mail_password_form" i18n:translate="" - >I forgot my password!</a> -</p> + >I forgot my password!</a></p> <p i18n:translate="">Having trouble logging in? Make sure to enable cookies in - your web browser. -</p> + your web browser.</p> <p i18n:translate="">Don't forget to logout or exit your browser when you're - done. -</p> + done.</p> -<p i18n:translate="">Setting the 'Remember my name' option will set a cookie - with your username, so that when you next log in, your user name will - already be filled in for you. -</p> +<p i18n:translate="">Setting the 'Remember my ID' option will set a cookie + with your member ID, so that when you next log in, your member ID will + already be filled in for you.</p> + </div> -</div> +</metal:slot> + </body> </html> - _______________________________________________ CMF-checkins mailing list [email protected] http://mail.zope.org/mailman/listinfo/cmf-checkins
