Local fix for duplicate login form in OPAC

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
index 169b2ed..6b51fa8 100755 (executable)
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
@@ -22,12 +22,12 @@
 <div class="table table-borderless table-sm">
        <div class="row">
                <div class="col-sm w-50">
-                       <label for='username_field' class="lbl1" >[% l('Library Card Number') %]
+                       <label for='username_field' class="lbl1" >[% l('Library Card Number or User Name') %]
                        <a href="#" title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
                        <i class="fas fa-question-circle"></i></a></label>
                </div>
                <div class="col-sm w-50">
-                       <label for="password_field" class="lbl1" >[% l('PIN') %]
+                       <label for="password_field" class="lbl1" >[% l('Password') %]
                        <a href="#" title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
             <i class="fas fa-question-circle"></i></a></label>
                </div>
@@ -42,10 +42,7 @@
        </div>
        <div class="row">
                <div class="col-sm w-50">
-                    [% IF ctx.get_org_setting (
-                          ctx.physical_org || ctx.aou_tree.id, 'opac.allow_pending_user') %]
-                       <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Request A Card') %]</a>
-                    [% END %]
+                       <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Apply for a PINES Library Card') %]</a>
                </div>
                <div class="col-sm w-50">
                        [% IF reset_password == 'true' %]
@@ -66,60 +63,6 @@
        </div>
 </div>
 
-    <div class="mx-auto row w-75 my-5">
-        <div class='col-md-6'>
-            <label for='username_field' class="lbl1" >[% l('Library Card Number or User Name') %]
-            <a title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
-            <i class="fas fa-question-circle"></i></a></label> <br>
-            <div class="input_bg mb-2">
-                <input class="form-control" type='text' id="username_field" name="username"/>
-            </div>
-        </div>
-        <div class='col-md-6'>
-            <label for="password_field" class="lbl1" >[% l('Password') %]
-            <a title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
-                        <i class="fas fa-question-circle"></i>
-                    </a></label><br>
-
-            <div class="input_bg mb-2">
-                <input class="form-control" id="password_field" name="password" type="password"/>
-            </div>
-        </div>
-        <div class='col-md-6'>
-            <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Apply for a PINES Library Card') %]</a>
-        </div>
-        <div class='col-md-6'>
-            [% IF reset_password == 'true' %]
-            <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot Your Password?') %]  </a>
-            [% END %]
-        </div>
-
-         <div class="col-12 pt-4 text-center">
-            <div class="form-check my-2">
-                <input class="form-check-input" type="checkbox" value="" id="rememberMe">
-                <label class="form-check-label" for="rememberMe">
-                    [% l('Stay logged in?') %]
-                </label>
-            </div>
-            <button type="submit" class="btn btn-confirm my-2"><i class="fas fa-sign-in-alt" aria-hidden="true"></i> [% l('Log in') %]</button>
-        </div>
-        <div style="clear: both; padding-top: 15px;" class="col-12 text-center">
-        [%
-            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 | html %]'/>
-
-        </div>
         <input id="client_tz_id" name="client_tz" type="hidden" />
     </form>