Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community

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

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index 348062e..b3d1f4c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -16,41 +16,50 @@
 <div id="login">
 <h1><a href="http://koha.org">Koha</a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
-<div id="login_error"><strong>Error</strong>: unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
+<div id="login_error"><strong>Error: </strong>Unauthorized user<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<div id="login_error"><strong>Error</strong>: session timed out, please log in again</div>
+<div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
-<div id="login_error"><strong>Error</strong>: IP address has changed, please log in again </div>
+<div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="wrongip" -->
+<div id="login_error"><strong>Error: </strong>Independent Branches and Autolocation are switched on and you are logging in with an IP address that doesn't match your branch. </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div id="login_error"><strong>Error</strong>: Incorrect username or password</div>
+<div id="login_error"><strong>Error: </strong>Invalid username or password</div>
 <!-- /TMPL_IF -->
 
 <!-- login prompt time-->
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="loginform" id="loginform">
+    <input type="hidden" name="koha_login_context" value="intranet" />
 <!-- TMPL_LOOP NAME="INPUTS" -->
-    <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
+    <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" ESCAPE="html" -->" />
 <!-- /TMPL_LOOP -->
-<p><label>Username:<br />
-<input type="text" name="userid" id="userid" class="input focus" value="<!-- TMPL_VAR NAME="userid" -->" size="20" tabindex="1" /></label>
+<p><label for="userid">Username:</label>
+<input type="text" name="userid" id="userid" class="input focus" value="<!-- TMPL_VAR NAME="userid" -->" size="20" tabindex="1" />
 </p>
-<p><label>Password:<br />
-<input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" /></label>
+<p><label for="password">Password:</label>
+<input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" />
 </p>
-<!-- TMPL_UNLESS name="IndependantBranches" -->
-    <p><label for="branch">Library:<br />
-    <select name="branch" id="branch" class="input">
+
+<!-- TMPL_IF NAME="AutoLocation" --><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="IndependantBranches" --><!-- TMPL_ELSE -->
+<p><label for="branch">Library:</label>
+    <select name="branch" id="branch" class="input" tabindex="3">
+    <option value="">My Library</option>
     <!-- TMPL_LOOP NAME="branchloop" -->
     <option value="<!-- TMPL_VAR NAME='branchcode' -->"><!-- TMPL_VAR NAME='branchname' --></option>
     <!-- /TMPL_LOOP -->
-    </select></label>
-    </p>
-<!-- /TMPL_UNLESS -->
+    </select>
+    </p><!-- /TMPL_IF -->
+       <!-- /TMPL_IF -->
+
 <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
 <p class="submit"><input id="submit" type="submit" value="Login &raquo;" tabindex="4" /></p>