Bug 14579: 'You are not logged in' should link to log in page

To test:
1) Go to any page on the staff client and make sure you are not logged in (ie an error page, cgi-bin/koha/errors/400.pl)
2) Try click on 'You are not logged in |'
3) Notice it is not really a link and doesn't take you anywhere
4) Apply patch
5) Refresh page
6) Click on what now says 'Log in |'
7) Confirm that you are redirected to the intranet log in page

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 2c4011f..23066ea 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2436,7 +2436,7 @@ a.disabled {
     color: #333;
 }
 
-.navbar .nav > li > a {
+.navbar .nav > li > a, .loggedout {
     color: #004D99;
     font-weight: bold;
     padding : .4em .2em;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index e4caee8..a4fd520 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -40,9 +40,9 @@
             </li>
         </ul>
         <ul class="nav pull-right">
+            [% IF ( loggedinusername ) %]
             <li class="dropdown">
                 <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">
-                    [% IF ( loggedinusername ) %]
                     <span class="loggedinusername">[% loggedinusername %]</span>
                     <span class="separator">|</span>
                     [% IF ( AutoLocation ) %]
@@ -89,13 +89,20 @@
                     <li>
                         <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
                     </li>
-                    [% ELSE %]
-                    You are not logged in |
-                    [% END %]
+                    <li>
+                        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>
+                    </li>
                 </ul>
-            <li>
-                <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>
             </li>
+            [% ELSE %]
+            <li class="loggedout">
+                <span>
+                    <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
+                    <span class="separator">|</span>
+                    <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper">Help</a>
+                </span>
+            </li>
+            [% END %]
         </ul>
     </div>
     [% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]