From 05239d02340f06fe0dd64276dbd80ea715fa9de7 Mon Sep 17 00:00:00 2001 From: Ben Shum <bshum@biblio.org> Date: Tue, 17 Sep 2013 14:43:59 -0400 Subject: [PATCH] Change form.tt2 from table to div Signed-off-by: Ben Shum <bshum@biblio.org> Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com> Signed-off-by: Dan Wells <dbw2@calvin.edu> --- Open-ILS/src/templates/opac/parts/login/form.tt2 | 75 ++++++++++-------------- 1 file changed, 32 insertions(+), 43 deletions(-) diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2 index 4c96014cad..cd52532d12 100644 --- a/Open-ILS/src/templates/opac/parts/login/form.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/form.tt2 @@ -17,49 +17,38 @@ <h1>[% l('Log in to Your Account') %]</h1> [% l('Please enter the following information:') %] <form method='post'> - <table> - <tr> - <td style="width: 20em; vertical-align: top; padding-top: 1.5em;" class='lbl1'><label for='username_field'>[% l('Library Card Number or Username') %]</label> - <div class="lbl2">[% l('Please include leading zeros and no spaces.') %]</div> - <div class="lbl2">[% l('Example: 0026626051') %]</div> - </td> - <td style="vertical-align: top; padding-top: 1.5em;"> - <div class="input_bg"> - <input type="text" id="username_field" name="username" autofocus /> - </div> - </td> - </tr> - <tr> - <td class="lbl1" style="width: 20em; vertical-align: top; padding-top: 1.5em"> - <label for="password_field">[% l('PIN Number or Password') %]</label> - <div>[% INCLUDE "opac/parts/login/password_hint.tt2" %]</div> - </td> - <td style="vertical-align: top; padding-top: 1.5em;"> - <div class="input_bg"> - <input id="password_field" name="password" type="password" /> - </div> - <div> - [% - # If no redirect is offered or it's leading us back to the - # login form, redirect the user to My Account - redirect = CGI.param('redirect_to') || ctx.referer; - IF !redirect OR redirect.match(ctx.path_info _ '$'); - redirect = CGI.url('-full' => 1) _ '/opac/myopac/main'; - END; - redirect = redirect | replace('^http:', 'https:'); - %] - <input type='hidden' name='redirect_to' value='[% redirect %]'/> - <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label> - </div> - <div style="padding-top: 1em; margin-right: 1em;"> - <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" /> - [% IF reset_password %] - <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a> - [% END %] - </div> - </td> - </tr> - </table> + <div style="float: left; padding-bottom: 10px; margin-right: 20px;"> + <label for='username_field' class="lbl1" >[% l('Library Card Number or Username') %]</label> + <div class="input_bg"> + <input type='text' id="username_field" name="username" autofocus /> + </div> + <div class="lbl2">[% l('Please include leading zeros and no spaces.') %]</div> + <div class="lbl2">[% l('Example: 0026626051') %]</div> + </div> + <div style="float: left;"> + <label for="password_field" class="lbl1" >[% l('PIN Number or Password') %]</label> + <div class="input_bg"> + <input id="password_field" name="password" type="password" /> + </div> + <div>[% INCLUDE "opac/parts/login/password_hint.tt2" %]</div> + [% IF reset_password %] + <a style="font-size: 80%" href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a> + [% END %] + </div> + <div style="clear: both; padding-top: 15px;"> + [% + # If no redirect is offered or it's leading us back to the + # login form, redirect the user to My Account + redirect = CGI.param('redirect_to') || ctx.referer; + IF !redirect OR redirect.match(ctx.path_info _ '$'); + redirect = CGI.url('-full' => 1) _ '/opac/myopac/main'; + END; + redirect = redirect | replace('^http:', 'https:'); + %] + <input type='hidden' name='redirect_to' value='[% redirect %]'/> + <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label> + <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" /> + </div> </form> </div> [% INCLUDE "opac/parts/login/help.tt2" %] -- 2.11.0