From d83f0c1d8aa0da95c77d6d083f5bf2a702a56f66 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 7 Feb 2018 17:17:34 +0000 Subject: [PATCH] Bug 20155: Improve readability of OPAC header language menu This patch makes some minor HTML and CSS changes in order to make the header's language-chooser menu more readable and consistent with the Lists menu. To test, apply this patch and the patch with the compiled CSS. - Install and enable more than one translation. - Set the OpacLangSelectorMode to either "top" or "both top and footer." - View the OPAC's header menu and confirm that the links and menus look correct whether or not a user is logged in. Signed-off-by: Jon Knight Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../bootstrap/en/includes/masthead-langmenu.inc | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +++++----- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 8 ++++++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc index a5f8aa2359..7ba905493f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc @@ -9,9 +9,9 @@ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] [% IF ( sublanguages_loo.enabled ) %] [% IF ( sublanguages_loo.sublanguage_current ) %] -
  • [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] 
    • +
  • [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] 
    • [% ELSE %] -
  • [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]
    • +
  • [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]
    • [% END %] [% END # / IF sublanguages_loo.enabled %] [% END # / FOREACH sublanguages_loo %] @@ -20,7 +20,7 @@ [% IF ( languages_loo.current ) %]
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] 
    • [% ELSE %] -
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
    • +
  • [% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]
    • [% END %] [% END # / IF languages_loo.current %] [% END # / IF ( languages_loo.plural ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 608cc17bb9..121b8f94f3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -95,20 +95,20 @@ [% UNLESS ( loggedinusername ) %] [% IF Koha.Preference('casAuthentication') %] [%# CAS authentication is too complicated for modal window %] -
  • Log in to your account
    • +
    • [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] -
  • Log in to your account
    • +
    • [% ELSE %] -
  • Log in to your account
    • +
    • [% END %] [% END %] [% IF ( loggedinusername ) %] -

  • Welcome, [% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]

    • +

  • Welcome,

  • [% END %] [% END %] [% IF EnableOpacSearchHistory %] -

  • Search history [x]

    • +

  • [x]

  • [% END %] [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less index 8423e6c382..3cbfdb81e8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less +++ b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less @@ -70,6 +70,10 @@ a { color : #FFF; } } + &.login-link { + color: #A6D8ED; + font-weight: bold; + } } .ui-widget-content a, @@ -184,14 +188,14 @@ td { color : #EEE; } a { - color: #A6D8ED; - font-weight: bold; &.logout { color : #E8583C; + font-weight: bold; padding : 0 .3em 0 .3em; } } } + #koha_url p { color: #666666; float : right; -- 2.39.5