From a0cefc86535244b0a603506daf5633a096d5c043 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 4 Dec 2018 19:53:29 +0000
Subject: [PATCH] Bug 21948: Clean up style of item detail page

This patch removes some page-specific style from the item detail page in
the staff client and adds some markup in order to trigger a more
generally-used style.

This patch also adds a font-awesome icon to the "Edit item" link on the
page.

To test, apply the patch and regenerate the staff client CSS. Open a
bibliographic record and view the "Items tab."

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 32020105e8494ba82a8a505711c5047560c9d304)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss | 16 ----------------
 .../prog/en/modules/catalogue/moredetail.tt      | 12 +++++++++---
 2 files changed, 9 insertions(+), 19 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 51016bb0d7..a4c2c025fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -674,22 +674,6 @@ ol {
     &.bibliodetails {
         float: left;
         margin: 0 0 1em 1em;
-
-        li {
-            border-bottom: 1px solid #E8E8E8;
-            list-style-type: none;
-            padding: .1em;
-        }
-
-        span {
-            &.label {
-                border-right: 1px solid #E8E8E8;
-                float: left;
-                font-weight: bold;
-                margin-right: 1em;
-                width: 12em;
-            }
-        }
     }
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 2e10ef9f46..393d0b90ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -28,6 +28,7 @@
     <h2>[% title | html %]</h2>
     [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</h4>[% END %]
     [% IF ( author ) %]<h4>by [% author | html %]</h4>[% END %]
+    <div class="rows">
     <ol class="bibliodetails">
         <li><span class="label">Biblionumber:</span> [% biblionumber | html %]&nbsp;</li>
         [% UNLESS ( item_level_itypes ) %]
@@ -42,6 +43,7 @@
         <li><span class="label">No. of items:</span> [% count | html %]&nbsp;[% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) 
 <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;showallitems=1">Show all items</a>[% END %]</li>
     </ol>
+    </div>
 
     <br clear="all" />
     [% IF ( ONLY_ONE ) %]
@@ -52,9 +54,10 @@
         <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %]  [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3>
         <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %]
          [% IF ( CAN_user_editcatalogue_edit_items ) %]
-         <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% ITEM_DAT.biblionumber | uri %]&amp;itemnumber=[% ITEM_DAT.itemnumber | uri %]">[Edit Item]</a>
+            <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=[% ITEM_DAT.biblionumber | uri %]&amp;itemnumber=[% ITEM_DAT.itemnumber | uri %]"><i class="fa fa-pencil"></i> Edit item</a>
          [% END %]
          [% END %][% END %]</h4>
+            <div class="rows">
             <ol class="bibliodetails">
             <li><span class="label">Home library:</span> [% Branches.GetName( ITEM_DAT.homebranch ) | html %]&nbsp;</li>
 	    [% IF ( item_level_itypes ) %]
@@ -65,7 +68,7 @@
             [% IF ( ITEM_DAT.displaycopy ) %]<li><span class="label">Copy number:</span> [% ITEM_DAT.copyvol | html %]&nbsp;</li> [% END %]
             [% IF ( ITEM_DAT.replacementprice ) %]<li><span class="label">Replacement price:</span> [% ITEM_DAT.replacementprice | $Price %]&nbsp;</li> [% END %]
 	    [% IF ITEM_DAT.materials %]<li><span class="label">Materials specified:</span> [% ITEM_DAT.materials | html %] </li> [% END %]
-            </ol></div>
+            </ol></div></div>
            <div class="listgroup"><h4>Statuses [% IF ( ITEM_DAT.status_advisory ) %](
                 [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]
                 [% IF ( ITEM_DAT.itemlost ) %]Lost[% END %]
@@ -73,6 +76,7 @@
                 [% IF ( ITEM_DAT.withdrawn ) %]Withdrawn[% END %]
             )[% END %]</h4>
 
+            <div class="rows">
             <ol class="bibliodetails">
             <li><span class="label">Current location:</span> [% Branches.GetName( ITEM_DAT.holdingbranch ) | html %]&nbsp;</li>
             <li><span class="label">Checkout status:</span>
@@ -190,8 +194,9 @@
                 [% END %]
             [% END %]
 
-            </ol></div>
+            </ol></div></div>
             <div class="listgroup"><h4>History</h4>
+            <div class="rows">
             <ol class="bibliodetails">
 
             [% IF ITEM_DAT.basketno %]
@@ -263,6 +268,7 @@
                 </li>
             </ol>
             </div>
+        </div>
 </div>
 [% END %]
 
-- 
2.39.5