Bug 17560: Add a third option to HoldFeeMode

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / auth.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 31d7cbe..c6a050c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -1,3 +1,5 @@
+[% USE Branches %]
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; 
     [% IF ( nopermission ) %]Access denied[% END %]
@@ -32,7 +34,7 @@
 [% END %]
 
 [% IF ( wrongip ) %]
-<div id="login_error"><strong>Error: </strong>IndependentBranches and Autolocation are switched on and you are logging in with an IP address that doesn't match your library. </div>
+<div id="login_error"><strong>Error: </strong>Autolocation is switched on and you are logging in with an IP address that doesn't match your library. </div>
 [% END %]
 
 [% IF ( invalid_username_or_password ) %]
@@ -40,10 +42,10 @@
 [% END %]
 
 <!-- login prompt time-->
-<form action="/cgi-bin/koha/mainpage.pl" method="post" name="loginform" id="loginform">
+<form action="[% script_name %]" method="post" name="loginform" id="loginform">
     <input type="hidden" name="koha_login_context" value="intranet" />
 [% FOREACH INPUT IN INPUTS %]
-    <input type="hidden" name="[% INPUT.name %]" value="[% INPUT.value %]" />
+    <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
 [% END %]
 <p><label for="userid">Username:</label>
 <input type="text" name="userid" id="userid" class="input focus" value="[% userid %]" size="20" tabindex="1" />
@@ -52,17 +54,17 @@
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" />
 </p>
 
-[% IF ( AutoLocation ) %][% ELSE %]
-[% IF ( IndependentBranches ) %][% ELSE %]
-<p><label for="branch">Library:</label>
-    <select name="branch" id="branch" class="input" tabindex="3">
-    <option value="">My library</option>
-    [% FOREACH branchloo IN branchloop %]
-    <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
-    [% END %]
-    </select>
-    </p>[% END %]
-       [% END %]
+[% UNLESS IndependentBranches %]
+    <p>
+        <label for="branch">Library:</label>
+        <select name="branch" id="branch" class="input" tabindex="3">
+            <option value="">My library</option>
+            [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
+                <option value="[% l.branchcode %]">[% l.branchname %]</option>
+            [% END %]
+        </select>
+    </p>
+[% END %]
 
 <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
@@ -76,13 +78,12 @@
 <p>Sorry, the CAS login failed.</p>
 [% END %]
 
-<p>If you have a CAS account,
 [% IF ( casServerUrl ) %]
-    please <a href="[% casServerUrl %]">click here to login</a>.<p>
+    <p><a href="[% casServerUrl %]">If you have a CAS account, please click here to login</a>.<p>
 [% END %]
 
 [% IF ( casServersLoop ) %]
-please choose against which one you would like to authenticate: </p>
+    <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
 <ul>
     [% FOREACH casServer IN casServersLoop %]
         <li><a href="[% casServer.value %]">[% casServer.name %]</a></li>
@@ -103,12 +104,14 @@ please choose against which one you would like to authenticate: </p>
 </div>
 </div>
 
-<script>
-$(document).ready( function() {
-    if ( document.location.hash ) {
-        $( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' );
-    }
-} );
-</script>
-
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        $(document).ready( function() {
+            if ( document.location.hash ) {
+                $( '#loginform' ).append( '<input name="auth_forwarded_hash" type="hidden" value="' + document.location.hash + '"/>' );
+            }
+        });
+    </script>
+[% END %]
+<!-- the main div is closed in intranet-bottom.inc -->
 [% INCLUDE 'intranet-bottom.inc' %]