From d092761b894af9c9491623cf4b946b625addf7cc Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 26 Jan 2021 17:24:26 +0000 Subject: [PATCH] Bug 27497: (follow-up) Suggested new placement This patch modifies include files and SCSS to move the version information into the "About Koha" menu item in the header menu. To test, apply the patch and rebuild the staff interface CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). In the staff client, click the "More" menu in the header. You should see version information next to the "About Koha" menu item. --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 18 ++++++++++++------ koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 4 +++- koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 0f33a70486..d39e22eec3 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1921,14 +1921,8 @@ i { #header_logo { float:left; - - .koha_version { - text-align: center; - font-weight: bold; - } } - #closewindow { margin-top: 2em; text-align: center; @@ -2011,6 +2005,18 @@ li { } } +.koha_version { + background-color: #FFF; + border: 1px solid #EEE; + border-radius: 3px; + color: #666; + display: inline-block; + font-size: 85%; + margin: 0 .5em; + padding: 1px 4px; + text-shadow: none; +} + #searchresults { ul { li { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 12deaa80ee..c2d2eb1091 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -64,7 +64,9 @@ [% IF ( CAN_user_parameters ) %]
  • Administration
  • [% END %] -
  • About Koha
  • +
  • + About Koha [% Koha.Version.maintenance | html %] +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc index 7f0954ceee..30f09f95e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc @@ -3,5 +3,5 @@

    [% LibraryName | html %]

    -
    [% Koha.Version.maintenance | html %]
    - \ No newline at end of file + + -- 2.11.0