Revert "set the branch at login"

This reverts commit bf1fd83d087d13561ddd8ade870413a9912c5329.

Conflicts:

	koha-tmpl/intranet-tmpl/prog/en/auth.tmpl

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 9a349b5..06401fe 100644 (file)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -120,6 +120,7 @@ C4::Auth - Authenticates Koha users
 
 sub get_template_and_user {
     my $in       = shift;
+       warn "GET Template";
     my $template =
       gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'} );
     my ( $user, $cookie, $sessionID, $flags ) = checkauth(

diff --git a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
index 0ba6262..bb566f9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
@@ -52,6 +52,7 @@
 <ul>
        <li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li>
 </ul>
+<!-- /TMPL_IF -->
 
 <script type="text/javascript">
 // <![CDATA[

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index d507c4a..392c4ec 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -80,7 +80,7 @@
             <b> Login information</b>
         </li>
         <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b>
-            at <b><!-- TMPL_VAR NAME="LoginBranchnameShort" --></b></li>
+            at <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
             <!-- TMPL_IF NAME="AutoLocation" -->
                 <li>autolocate activated</li>
         <!-- TMPL_ELSE -->