From f39e08d923ad5f0ebeffb77e065a0ec30161a9ef Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Wed, 20 Jan 2021 16:51:39 +0100 Subject: [PATCH] Bug 27497: Display Koha version in header under logo in staff interface Can be very useful to know on any page of staff interface Koha version. I made a plugin : https://github.com/biblibre/koha-plugin-intranet-version-in-header But seems better to provide a patch. This patch created a new include logo.inc that contains the logo and version, called in all header includes. It adds a div with id "header_logo" to be able to set float on the parent of logo and version. So h1#logo must be replaced in all CSS files. It removes in staff-global.scss rules about h1#logo since they all are in #logo. Test plan: 1) Go to staff interface 2) Check you see Koha version YY.MM.XX under logo 3) Check it is responsive 4) Check it is not displayed when printing home page 4) Check it is not displayed when printing receipt invoice 5) Check all modules home page 6) Check right-to-left display --- koha-tmpl/intranet-tmpl/prog/css/print.css | 9 +++++---- .../prog/css/printreceiptinvoice.css | 5 +---- .../intranet-tmpl/prog/css/right-to-left.css | 4 ++-- .../prog/css/src/staff-global.scss | 20 ++++++++++--------- .../prog/en/includes/acquisitions-search.inc | 3 ++- .../prog/en/includes/adv-search.inc | 2 +- .../prog/en/includes/authorities-search.inc | 4 ++-- .../prog/en/includes/budgets-admin-search.inc | 3 ++- .../prog/en/includes/cat-search.inc | 3 ++- .../prog/en/includes/cataloging-search.inc | 3 ++- .../prog/en/includes/checkin-search.inc | 3 ++- .../prog/en/includes/circ-search.inc | 3 ++- .../prog/en/includes/cities-admin-search.inc | 3 ++- .../en/includes/contracts-admin-search.inc | 3 ++- .../en/includes/currencies-admin-search.inc | 3 ++- .../prog/en/includes/desks-admin-search.inc | 3 ++- .../prog/en/includes/home-search.inc | 3 ++- .../prog/en/includes/letters-search.inc | 3 ++- .../intranet-tmpl/prog/en/includes/logo.inc | 7 +++++++ .../prog/en/includes/patron-search.inc | 4 +++- .../prog/en/includes/patrons-admin-search.inc | 3 ++- .../prog/en/includes/prefs-admin-search.inc | 2 +- .../prog/en/includes/serials-search.inc | 3 ++- .../en/includes/suggestions-add-search.inc | 3 ++- .../prog/en/includes/z3950-admin-search.inc | 3 ++- 25 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/logo.inc diff --git a/koha-tmpl/intranet-tmpl/prog/css/print.css b/koha-tmpl/intranet-tmpl/prog/css/print.css index 9a7f0a1f34..de3fc036ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/css/print.css @@ -43,10 +43,6 @@ h1 margin-top : 3px; } -h1#logo { - display: none; -} - h2 { color : #000000; font-size : 20px; @@ -291,6 +287,7 @@ td.debit { #login, #header, #header_search, +#header_logo, #toolbar, #changelanguage, #menu, @@ -364,3 +361,7 @@ th { #catalog_detail .col-sm-push-2 { left: 0; } + + + display: none; +} diff --git a/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css index a2ada2e1ad..d169511632 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css +++ b/koha-tmpl/intranet-tmpl/prog/css/printreceiptinvoice.css @@ -43,10 +43,6 @@ h1 margin-top : 3px; } -h1#logo { - display: none; -} - h2 { color : #000000; font-size : 20px; @@ -330,6 +326,7 @@ div.yui-b, .noprint, form#sortbyform, #cartDetails, +#header_logo, fieldset.action, .list-actions, .print { diff --git a/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css b/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css index 3a70812f4e..fe4f22e0ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css +++ b/koha-tmpl/intranet-tmpl/prog/css/right-to-left.css @@ -235,7 +235,7 @@ div.patroninfo h5 /* TODO - Can we find ways to avoid this? */ -h1#logo, +#header_logo, #koha_url, #login, .yui-t1 .yui-b @@ -440,7 +440,7 @@ div.dt-buttons { } @media (max-width: 767px) { - h1#logo { + #header_logo { float: none; margin: auto; position: relative; 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 6d03d1a310..0f33a70486 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -283,14 +283,6 @@ form { h1 { font-size: 161.6%; font-weight: bold; - - &#logo { - border: 0 none; - float: left; - margin: .75em .3em .75em .7em; - padding: 0; - width: 180px; - } } h2 { @@ -1927,6 +1919,16 @@ i { } } +#header_logo { + float:left; + + .koha_version { + text-align: center; + font-weight: bold; + } +} + + #closewindow { margin-top: 2em; text-align: center; @@ -4431,7 +4433,7 @@ div .suggestion_note { } } - h1#logo { + #header_logo { float: none; margin: auto; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 22bcc14b43..60adcad00f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -1,5 +1,6 @@ +
-

[% LibraryName | html %]

+[% INCLUDE 'logo.inc' %]