From fd32772b9ab171c6483114f29079a48c46384692 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 30 Sep 2019 20:39:54 +0000
Subject: [PATCH] Bug 23711: Icons on staff main page should be font icons

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/css/mainpage.css |  45 +++---------------
 .../prog/en/modules/intranet-main.tt          |  28 +++++------
 koha-tmpl/intranet-tmpl/prog/img/koha-egg.svg |   1 +
 .../prog/img/staff-home-icons-sprite.png      | Bin 10479 -> 0 bytes
 4 files changed, 22 insertions(+), 52 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/koha-egg.svg
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/staff-home-icons-sprite.png

diff --git a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
index d8cc60895f..4496ceb860 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
@@ -72,7 +72,6 @@ ul.biglinks-list li {
 
 ul.biglinks-list li a.icon_general {
     /* Class used for each module link */
-    background-image:url('../img/staff-home-icons-sprite.png');
     display: block;
     box-sizing: content-box;
     max-width : 320px;
@@ -101,44 +100,14 @@ ul.biglinks-list li a:hover.icon_general {
     border-color: #538200;
 }
 
-/* CSS Sprites
- * There is one sprite image which contains all icons in both
- *  hover states (on and off)
- */
+/* CSS Font Awesome */
+ul.biglinks-list .fa, ul.biglinks-list img {
+    position: absolute;
+    left: 1em;
+    font-size: 1.5em;
+    width: 35px;
+}
 
-/* Classes used for each individual module link */
-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 -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/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index ab04abbcd9..704241d4c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -41,38 +41,38 @@
                         <ul class="biglinks-list">
                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                             <li>
-                                <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
+                                <a class="icon_general icon_circulation" href="/cgi-bin/koha/circ/circulation-home.pl"><i class="fa fa-exchange"></i>Circulation</a>
                             </li>
                             [% END %]
 
                             [% IF CAN_user_borrowers_edit_borrowers %]
                             <li>
-                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl"><i class="fa fa-id-card-o"></i>Patrons</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_catalogue ) %]
                             <li>
-                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl">Advanced search</a>
+                                <a class="icon_general icon_search" href="/cgi-bin/koha/catalogue/search.pl"><i class="fa fa-search"></i>Advanced search</a>
                             </li>
                             [% END %]
 
                             <li>
-                                <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a>
+                                <a class="icon_general icon_lists" href="/cgi-bin/koha/virtualshelves/shelves.pl"><i class="fa fa-list-alt"></i>Lists</a>
                             </li>
 
                             [% IF ( UseCourseReserves ) %]
                                 <li>
-                                    <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl">Course reserves</a>
+                                    <a class="icon_general icon_course_reserves" href="/cgi-bin/koha/course_reserves/course-reserves.pl"><i class="fa fa-book"></i>Course reserves</a>
                                 </li>
                             [% END %]
 
                             <li>
-                                <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
+                                <a class="icon_general icon_authorities" href="/cgi-bin/koha/authorities/authorities-home.pl"><i class="fa fa-link"></i>Authorities</a>
                             </li>
                             [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
                             <li>
-                                <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl">ILL requests</a>
+                                <a class="icon_general icon_ill" href="/cgi-bin/koha/ill/ill-requests.pl"><i class="fa fa-retweet"></i>ILL requests</a>
                             </li>
                             [% END %]
                         </ul>
@@ -82,44 +82,44 @@
 
                             [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items ) %]
                             <li>
-                                <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
+                                <a class="icon_general icon_cataloging" href="/cgi-bin/koha/cataloguing/addbooks.pl"><i class="fa fa-barcode"></i>Cataloging</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_serials ) %]
                             <li>
-                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl">Serials</a>
+                                <a class="icon_general icon_serials" href="/cgi-bin/koha/serials/serials-home.pl"><i class="fa fa-newspaper-o"></i>Serials</a>
                                 <span class="biglink"></span>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_acquisition ) %]
                             <li>
-                                <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
+                                <a class="icon_general icon_acquisitions" href="/cgi-bin/koha/acqui/acqui-home.pl"><i class="fa fa-folder-open"></i>Acquisitions</a>
                                 <span class="biglink"></span>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_reports ) %]
                             <li>
-                                <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
+                                <a class="icon_general icon_reports" href="/cgi-bin/koha/reports/reports-home.pl"><i class="fa fa-pie-chart"></i>Reports</a>
                             </li>
                             [% END %]
 
 
                             [% IF ( CAN_user_tools ) %]
                             <li>
-                                <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
+                                <a class="icon_general icon_tools" href="/cgi-bin/koha/tools/tools-home.pl"><i class="fa fa-wrench"></i>Tools</a>
                             </li>
                             [% END %]
 
                             [% IF ( CAN_user_parameters ) %]
                             <li>
-                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
+                                <a class="icon_general icon_administration" href="/cgi-bin/koha/admin/admin-home.pl"><i class="fa fa-cogs"></i>Koha administration</a>
                             </li>
                             [% END %]
                             <li>
-                                <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha</a>
+                                <a class="icon_general icon_koha" href="/cgi-bin/koha/about.pl">About Koha<img src="/intranet-tmpl/prog/img/koha-egg.svg" alt="Koha Logo SVG"/></a>
                             </li>
                         </ul>
                     </div> <!-- /.col-sm-6 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/img/koha-egg.svg b/koha-tmpl/intranet-tmpl/prog/img/koha-egg.svg
new file mode 100644
index 0000000000..a3b6168a26
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/img/koha-egg.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><style>.a{font-family:Bitstream Vera Sans;font-size:40px;}</style><text x="805.4" y="1549.5" class="a"><tspan x="805.4" y="1549.5"/></text><text x="-2373.6" y="1342.1" class="a"><tspan x="-2373.6" y="1342.1"/></text><path d="m92.9 195c-13.1-1.6-23-7.8-26.2-16.2-1.5-3.9-2-8.5-1.1-8.5 0.2 0 2 1.4 3.9 3.1 4.2 3.7 7.5 5.4 12.7 6.7 11.3 2.7 24.2-3.7 29.8-14.8 2-4 3.3-7.4 3.3-12.3 0-5.1-1.2-8.8-3.2-12.5-4.2-7.9-14.3-16-24.1-19-4.3-1.3-7-1.7-14.3-1.6-14.9 0.1-26.1 4.1-34.5 12.6-8 8-11.5 17.5-11.5 30.8 0 7.5-0.7 8.9-2.1 4.3-2.9-9.8-3.8-33.5-1.8-45.1C26.8 105.6 31.2 92 38.5 77 52 49.1 72.3 27.2 94.7 16.3 105.7 11 113.6 8.9 123.2 8.9c13.3 0 23 3.8 32.5 12.7 21.8 20.5 26.6 61.1 12 103.3-5.9 17.1-18.3 38.9-28.3 49.9-4.4 4.8-14.5 12.3-20.7 15.5-7.4 3.7-17.9 5.6-25.8 4.6z" fill="#74b01b"/><path d="M122.1 9.2C119.6 9.2 117.2 9.3 115.5 9.5 98.5 12 78.7 23.7 63.6 40.2 56.6 47.7 49.8 56.9 44.5 65.9 41.9 70.4 37 80.2 34.9 85 29.6 97.5 25.5 111.9 23.7 124.1 22.6 131.2 22.6 145.7 23.7 155.6 24.6 164.4 26.4 171.5 27.2 169.4 27.3 169.2 27.5 166 27.7 162.5 27.8 159.6 27.9 157.3 28.2 155.3 28.2 155.2 28.2 155 28.2 154.8 28.3 154.4 28.3 153.9 28.4 153.5 28.5 152.8 28.6 152.2 28.7 151.6 28.7 151.6 28.7 151.6 28.7 151.6 29.1 149.9 29.6 148.3 30.2 146.5 32.4 140.2 36.4 134.6 41.5 130.2 41.6 130.2 41.6 130.1 41.6 130.1 41.9 129.8 42.3 129.6 42.7 129.3 42.9 129.1 43.2 128.9 43.5 128.7 43.7 128.5 43.9 128.3 44.1 128.2 48.2 125.3 52.9 123.1 58 121.7 59.4 121.3 60.8 121 62.3 120.7 64.2 120.3 66.4 120.1 68.8 119.9 68.8 119.9 68.9 119.9 68.9 119.9 73.1 119.7 78.6 119.7 81.8 120 81.9 120 82 120 82.2 120 82.6 120 83.1 120.1 83.4 120.1 83.4 120.1 83.5 120.1 83.5 120.2 87.4 120.9 92.1 122.7 96.2 125 96.8 125.3 97.3 125.6 97.9 126 98.3 126.2 98.7 126.5 99.1 126.7 99.3 126.9 99.5 127 99.7 127.2 100.1 127.4 100.5 127.7 100.8 128 101.1 128.2 101.4 128.4 101.7 128.6 101.8 128.7 102 128.9 102.1 129 109.4 134.7 113.9 141.6 115 148.6 115 148.6 115 148.7 115 148.7 115.1 149.2 115.1 149.7 115.2 150.2 115.6 155.2 114.9 159.2 112.9 163.7 110.7 168.4 107.5 172.3 103.7 175.1 103 175.6 102.4 176 101.8 176.4 101.7 176.5 101.6 176.6 101.5 176.6 101 176.9 100.5 177.2 100 177.4 99.8 177.6 99.5 177.7 99.3 177.8 96.8 179 94.3 179.9 91.6 180.3 90.5 180.4 89.1 180.5 87.5 180.5 86 180.5 85 180.5 84.2 180.4 83.2 180.3 82.3 180.1 81.3 179.9 78.6 179.1 76.4 178.3 74.1 176.8 74 176.7 73.9 176.7 73.7 176.6 73.5 176.4 73.2 176.2 72.9 176 72.7 175.8 72.4 175.7 72.2 175.5 71.2 174.8 70.2 174 69 173 67.4 171.7 65.9 170.6 65.7 170.6 65.2 170.6 65.2 172.6 65.7 174.8 66.8 179.8 68.4 182.8 72 186.1 76.5 190.3 82.6 193.1 90.8 194.6 93.4 195 100.1 195.1 103.4 194.7 109.2 194 116 191.8 120.7 189.1 126.2 186 134 180.1 138.2 176 147.1 167.1 158.8 147.6 165.8 130 170.5 118 174.1 103.3 175.5 89.5 176 84.4 175.9 70.2 175.3 65.5 173.1 47.4 167.2 33.6 157.4 23.6 150 15.9 142.7 11.8 133.5 10 130.9 9.4 126.3 9.1 122.1 9.2z" opacity="0.8"/></svg>
diff --git a/koha-tmpl/intranet-tmpl/prog/img/staff-home-icons-sprite.png b/koha-tmpl/intranet-tmpl/prog/img/staff-home-icons-sprite.png
deleted file mode 100644
index bb4d6bc01a4bb9ae8e59b20c03af9a3ca401aa5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10479
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

-- 
2.17.1