From 5f6d7f62711286273abb1fa352bd16405a7e9862 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= Date: Wed, 19 Aug 2015 11:00:27 +0000 Subject: [PATCH] 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 Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 255d133acac24a675dca0106ede20359257d0701) Signed-off-by: Chris Cormack --- .../prog/en/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) 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 2c4011fd10..23066ea69d 100644 --- 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 e4caee8948..a4fd520f44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -40,9 +40,9 @@ -
  • - Help
  • + [% ELSE %] +
  • + + Log in + | + Help + +
  • + [% END %] [% IF ( intranetbookbag ) %]
    Your cart is empty.
    [% END %] -- 2.39.5