From 3ef15498b7a3e1c318f401c84cf4870f2f98b6f0 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Tue, 9 Dec 2014 15:31:47 -0500
Subject: [PATCH] Minimize rel_2_7 differences with Algoma skin

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 .../src/templates_algoma/opac/parts/login/form.tt2 | 172 +++++----------------
 .../src/templates_algoma/opac/parts/topnav.tt2     |  61 --------
 2 files changed, 39 insertions(+), 194 deletions(-)
 delete mode 100644 Open-ILS/src/templates_algoma/opac/parts/topnav.tt2

diff --git a/Open-ILS/src/templates_algoma/opac/parts/login/form.tt2 b/Open-ILS/src/templates_algoma/opac/parts/login/form.tt2
index a14735f97e..e4169ec233 100644
--- a/Open-ILS/src/templates_algoma/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates_algoma/opac/parts/login/form.tt2
@@ -1,58 +1,3 @@
-<!-- TODO: MOVE INTO SEPARATE FORGOT-PASSWORD PAGE 
-
-<div class="hide_me">
-	<div class='login_text color_1' style='padding: 4px; text-align: center;'>
-		<span>[% l("Login") %]</span>
-	</div>
-	<br/>
-</div>
-<table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
-	<thead>
-        <tr><td colspan='2' align='center'><b>[% l("Password") %]</b></td></tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td colspan='2' style='padding:10px;'>
-                [% l("This appears to be the first time you have logged in.  You will need to change your password.") %]
-                [% l("The password must be at least 7 characters in length,
- contain at least one letter (a-z/A-Z),
- and contain at least one number.") %]
-            </td>
-        </tr>
-        <tr>
-            <td>[% l("Enter your current password") %]</td>
-            <td><input type='password' id='change_pw_current'/></td>
-        </tr>
-        <tr>
-            <td>[% l("Enter the new password") %]</td>
-            <td><input type='password' id='change_pw_1'/></td>
-        </tr>
-        <tr>
-            <td>[% l("Re-type the new password for verification") %]</td>
-            <td><input type='password' id='change_pw_2'/></td>
-        </tr>
-        <tr><td><br/></td><td/></tr>
-        <tr class='color_1'>
-            <td colspan='2' align='center'>
-                <span class='login_text' style='margin-right: 20px;'>
-                    <input type='submit' value='[% l("Update Password") %]'  id='change_pw_button'/>
-                </span>
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-
-<span id='pw_no_match' class='hide_me'>[% l("Passwords do not match") %]</span>
-<span id='pw_update_successful' class='hide_me'>[% l("Password successfully updated") %]</span>
-<span id='pw_not_strong' class='hide_me'>
-    [% l("The password provided is not strong enough.") %]
-    [% l("The password must be at least 7 characters in length, contain at least one letter (a-z/A-Z), and contain at least one number.") %]
-</span>
-
- ^== TODO: MOVE INTO SEPARATE FORGOT-PASSWORD PAGE  -->
-
-
 [% IF ctx.login_failed_event %]
 <div id='login-failed-message'>
 [%
@@ -61,88 +6,49 @@
     ELSIF ctx.login_failed_event.textcode == 'PATRON_INACTIVE';
         l("This account has been deactivated.  Please contact your local library.");
     ELSE;
-        l("Login failed. The username or password provided was not valid.  
-            Ensure Caps-Lock is off and try again or contact your local library.");
+        l("Login failed. The username or password provided was not valid. " _
+           "Passwords are case-sensitive.  Check your Caps-Lock key and try again or contact your local library.");
     END;
 %]
 </div>
 [% END %]
 
-<div>
-    <div style="height:20px;"></div>
-    <form method='POST'>
-        <table cellpadding="0" cellspacing="0" border="0">
-            <tr>
-                <td valign="top" width="676" class="login_boxes left_brain">
-                    <table cellpadding="0" cellspacing="0" border="0"
-                        width="100%">
-                        <tr>
-	                        <td colspan="2" style="padding-bottom: 10px;">
-                                <h1>[% l('Log in to Your Account') %]</h1>
-                                [% l('Please enter the following information:') %]
-                                <br /><br />
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="42%" class="lbl1">
-                                [% l('Username') %]
-                                <br />
-                             <!--   <span class="lbl2">
-                                    [% l('Please include leading zeros and no spaces.') %]
-                                    <br/>
-                                    [% l('Example: 0026626051') %]
-                                </span>  -->
-                                <br /><br />
-                            </td>
-                            <td width="58%" valign="top">
-                                <div class="input_bg">
-                                    <input type="text" id="username_field" name="username" autofocus />
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan="2">
-                                <div style="height:15px;"></div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td valign="top" class="lbl1">
-                                [% l('Password') %]<br />
-                           <!--     [% INCLUDE "opac/parts/login/password_hint.tt2" %] -->
-                            </td>
-                            <td valign="top">
-                                <div class="input_bg">
-                                    <input name="password" type="password" />
-                                </div>
-                                <div style="padding-top:7px;">
-                                    [%
-                                        # 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:14px;">
-                                    <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>
-                    <br /><br />
-                </td>
-	            <td><div style="width:10px;"></div></td>
-            <!--    [% INCLUDE "opac/parts/login/help.tt2" %] -->
-            </tr>
-        </table>
+<div id='login-form-box' class='login_boxes left_brain' style='float:left'>
+    <h1>[% l('Log in to Your Account') %]</h1>
+    [% l('Please enter the following information:') %]
+    <form method='post'>
+        <div style="float: left; padding-bottom: 10px; margin-right: 40px;">
+            <label for='username_field' class="lbl1" >[% l('Username') %]</label>
+            <div class="input_bg">
+                <input type='text' id="username_field" name="username" autofocus />
+            </div>
+        </div>
+        <div style="float: left;">
+            <label for="password_field" class="lbl1" >[% l('Password') %]</label>
+            <div class="input_bg">
+                <input id="password_field" name="password" type="password" />
+            </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;">
+        [%
+            redirect = CGI.param('redirect_to');
+            # Don't use referer unless we got here from elsewhere within the TPAC
+            IF !redirect AND ctx.referer.match('^https?://' _ ctx.hostname _ ctx.opac_root);
+                redirect = ctx.referer;
+            END;
+            # If no redirect is offered or it's leading us back to the
+            # login form, redirect the user to My Account
+            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 class="clear-both"></div>
 </div>
-
diff --git a/Open-ILS/src/templates_algoma/opac/parts/topnav.tt2 b/Open-ILS/src/templates_algoma/opac/parts/topnav.tt2
deleted file mode 100644
index dc771c7fc7..0000000000
--- a/Open-ILS/src/templates_algoma/opac/parts/topnav.tt2
+++ /dev/null
@@ -1,61 +0,0 @@
-[% IF !ctx.is_staff %]
-<div id="header-wrap">
-<div id="header">
-    <div class="float-left">
-        [% INCLUDE "opac/parts/topnav_logo.tt2" %]
-    </div>
-    <div class="float-right">
-        [% IF !ctx.user %]
-        <div id="your-acct-login">
-            <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
-                 id="home_myopac_link">
-                [% l('Your Account Log in') %]
-            </a>
-        </div>
-        [% ELSE %]
-        <div id="dash_wrapper">
-            <div id="dash_identity">
-                <span id="dash_user">
-                    [%  l('[_1] [_2]', ctx.user.first_given_name, ctx.user.family_name) | html %]
-                </span>
-                <span class="dash_divider">|</span>
-                <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
-                    class="opac-button">[% l('My Account') %]</a>
-
-                <a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
-                    class="opac-button" id="logout_link">[% l('Logout') %]</a>
-            </div>
-            <div id="dashboard">
-                <span class="dash-align">
-                    <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/circs')
-                        %]"><span id="dash_checked">[% ctx.user_stats.checkouts.total_out
-                        %]</span> [% l("Checked Out") %]</a>
-                </span>
-                <span class="dash_divider">|</span>
-                <span class="dash-align">
-                    <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/holds', {}, ['available'])
-                        %]"><span id="dash_holds">[% ctx.user_stats.holds.total
-                        %]</span> [% l("On Hold") %]</a>
-                </span>
-                <span class="dash_divider">|</span>
-                <span class="dash-align">
-                    <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/holds',
-                        {available => 1}) %]"><span id="dash_pickup">[%
-                        ctx.user_stats.holds.ready %]</span> [% l("Ready for Pickup") %]</a>
-                </span>
-                <span class="dash_divider">|</span>
-                <span class="dash-align">
-                    <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/main')
-                        %]"><span id="dash_fines">[% money(ctx.user_stats.fines.balance_owed)
-                        %]</span> [% l("Fines") %]</a>
-                </span>
-            </div>
-        </div>
-        [% END %]
-    </div>
-    [%- INCLUDE "opac/parts/locale_picker.tt2" %]
-    <div class="common-no-pad"></div>
-</div>
-</div>
-[% END %]
-[% INCLUDE "opac/parts/topnav_links.tt2" %]
-- 
2.11.0