From 6c59f027ab23ac0c4a0bd1e564cfc07746449b54 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 4 Jun 2018 18:16:54 +0000 Subject: [PATCH] Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests button is wrong This alternate patch adds a new icon to the sprite image which gives icons to the link on the staff client home page. It modifies the CSS positioning for all the links as the new image sprite is somewhat different. The SVG file from which the sprite image was generated is also updated, and the about page has been updated to give credit to the creator of the icon. Unrelated change: The cataloging link is moved to the second column. Although it's probably rare for all modules to be enabled and available, this puts the same number of links in each column. To test, apply the patch and clear your browser cache if necessary. With interlibrary loan enabled, view the staff client home page and confirm that all the module links look correct, including when you hover your mouse over them. Confirm that the about page lists the new icon under the "licenses" tab. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 985eb929149737571e3830c837a127ab372e42fe) Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 58 +++++++++--------- .../intranet-tmpl/prog/en/modules/about.tt | 2 +- .../prog/en/modules/intranet-main.tt | 12 ++-- .../prog/img/staff-home-icons-sprite.png | Bin 8960 -> 10479 bytes .../staff-home-icons-sprite.svg | 2 +- 5 files changed, 39 insertions(+), 35 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css index 404ee29845..d8cc60895f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css +++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css @@ -107,36 +107,38 @@ ul.biglinks-list li a:hover.icon_general { */ /* Classes used for each individual module link */ -ul.biglinks-list li a.icon_circulation {background-position:5px 3px;} -ul.biglinks-list li a.icon_patrons {background-position:5px -89px;} -ul.biglinks-list li a.icon_search {background-position:5px -181px;} -ul.biglinks-list li a.icon_lists {background-position:5px -273px;} -ul.biglinks-list li a.icon_cataloging {background-position:5px -365px;} -ul.biglinks-list li a.icon_authorities {background-position:5px -457px;} - -ul.biglinks-list li a.icon_serials {background-position:5px -549px;} -ul.biglinks-list li a.icon_acquisitions {background-position:5px -641px;} -ul.biglinks-list li a.icon_reports {background-position:5px -733px;} -ul.biglinks-list li a.icon_administration {background-position:5px -825px;} -ul.biglinks-list li a.icon_tools {background-position:5px -917px;} -ul.biglinks-list li a.icon_koha {background-position:5px -1008px;} -ul.biglinks-list li a.icon_course_reserves {background-position:5px -1100px;} +ul.biglinks-list li a.icon_circulation {background-position:5px 0px;} +ul.biglinks-list li a.icon_patrons {background-position:5px -99px;} +ul.biglinks-list li a.icon_search {background-position:5px -198px;} +ul.biglinks-list li a.icon_lists {background-position:5px -298px;} +ul.biglinks-list li a.icon_cataloging {background-position:5px -397px;} +ul.biglinks-list li a.icon_authorities {background-position:5px -496px;} +ul.biglinks-list li a.icon_ill {background-position:5px -1291px;} + +ul.biglinks-list li a.icon_serials {background-position:5px -595px;} +ul.biglinks-list li a.icon_acquisitions {background-position:5px -695px;} +ul.biglinks-list li a.icon_reports {background-position:5px -794px;} +ul.biglinks-list li a.icon_administration {background-position:5px -894px;} +ul.biglinks-list li a.icon_tools {background-position:5px -993px;} +ul.biglinks-list li a.icon_koha {background-position:5px -1091px;} +ul.biglinks-list li a.icon_course_reserves {background-position:5px -1191px;} /* Classes used for each individual module link on hover*/ -ul.biglinks-list li a:hover.icon_circulation {background-position:5px -43px;} -ul.biglinks-list li a:hover.icon_patrons {background-position:5px -135px;} -ul.biglinks-list li a:hover.icon_search {background-position:5px -227px;} -ul.biglinks-list li a:hover.icon_lists {background-position:5px -319px;} -ul.biglinks-list li a:hover.icon_cataloging {background-position:5px -411px;} -ul.biglinks-list li a:hover.icon_authorities {background-position:5px -503px;} - -ul.biglinks-list li a:hover.icon_serials {background-position:5px -595px;} -ul.biglinks-list li a:hover.icon_acquisitions {background-position:5px -687px;} -ul.biglinks-list li a:hover.icon_reports {background-position:5px -779px;} -ul.biglinks-list li a:hover.icon_administration {background-position:5px -871px;} -ul.biglinks-list li a:hover.icon_tools {background-position:5px -963px;} -ul.biglinks-list li a:hover.icon_koha {background-position:5px -1054px;} -ul.biglinks-list li a:hover.icon_course_reserves {background-position:5px -1146px;} +ul.biglinks-list li a:hover.icon_circulation {background-position:5px -50px;} +ul.biglinks-list li a:hover.icon_patrons {background-position:5px -149px;} +ul.biglinks-list li a:hover.icon_search {background-position:5px -248px;} +ul.biglinks-list li a:hover.icon_lists {background-position:5px -348px;} +ul.biglinks-list li a:hover.icon_cataloging {background-position:5px -447px;} +ul.biglinks-list li a:hover.icon_authorities {background-position:5px -546px;} +ul.biglinks-list li a:hover.icon_ill {background-position:5px -1342px;} + +ul.biglinks-list li a:hover.icon_serials {background-position:5px -645px;} +ul.biglinks-list li a:hover.icon_acquisitions {background-position:5px -744px;} +ul.biglinks-list li a:hover.icon_reports {background-position:5px -844px;} +ul.biglinks-list li a:hover.icon_administration {background-position:5px -943px;} +ul.biglinks-list li a:hover.icon_tools {background-position:5px -1042px;} +ul.biglinks-list li a:hover.icon_koha {background-position:5px -1140px;} +ul.biglinks-list li a:hover.icon_course_reserves {background-position:5px -1241px;} /* ==== MODULE LINKS - End ==== */ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index f6cf9ae592..6919859382 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -939,7 +939,7 @@ ("link") symbol by Matthew Exton ; Serials ("newspaper") symbol by John Caserta ; Acquisitions ("gift") symbol by David Goodger ; Reports ("pie chart") symbol by Scott Lewis ; Administration ("gears") symbol by - Jeremy Minnick ; Tools ("wrench") symbol by National Park Service + Jeremy Minnick ; Tools ("wrench") symbol by National Park Service ; Interlibrary loan ("exchange") symbol by Iconstock. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 8a97473edc..0ec5857ec6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -66,11 +66,6 @@ [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %] -
  • - Cataloging -
  • - [% END %]
  • Authorities
  • @@ -83,6 +78,13 @@