From 93d2c67b4116e72d36d2934c592143cb76aa9f61 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 9 Oct 2018 14:34:55 +0000 Subject: [PATCH] Bug 21516: (ALTERNATE) Request notes CSS bug makes them unreadable This alternate patch makes multiple markup corrections to the ILL requests templates. It reformats the request details to use a list, making it consistent with similar interfaces (see patron details, baskets in acquisitions). The display of notes has been changed so that it uses a paragraph tag instead of 
.

To test, apply the patch and rebuild the staff client CSS.

- Manage an ILL request which has staff and OPAC notes. Everything
  should look readable.
- Running validation on the HTML should only return warnings coming from
  global include files (js_includes.inc).

Signed-off-by: Andrew Isherwood 

Signed-off-by: Marcel de Rooy 

Signed-off-by: Nick Clemens 
---
 .../prog/css/src/staff-global.scss            |  38 +----
 .../prog/en/modules/ill/ill-requests.tt       | 139 +++++++++---------
 2 files changed, 77 insertions(+), 100 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 99e43a9b69..dc72a32732 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -1438,8 +1438,7 @@ div {
             clear: left;
             float: left;
             list-style-type: none;
-            padding-bottom: .2em;
-            padding-top: .1em;
+            padding: .275em;
             width: 100%;
         }
 
@@ -1454,6 +1453,10 @@ div {
             }
         }
 
+        p {
+            margin-left: 10em;
+        }
+
         span {
             &.label {
                 float: left;
@@ -3938,19 +3941,6 @@ span {
         margin: .3em 0;
     }
 
-    h1 {
-        margin: 1em 0;
-    }
-
-    h2 {
-        margin-bottom: 20px;
-    }
-
-    h3 {
-        margin-top: 20px;
-
-    }
-
     .bg-info {
         overflow: auto;
         position: relative;
@@ -4004,28 +3994,12 @@ span {
     }
 }
 
-#ill-view-panel {
+.ill-view-panel {
     margin-top: 15px;
 
-    h3 {
-        margin-bottom: 10px;
-    }
-
-    h4 {
-        margin-bottom: 20px;
-    }
-
     .notesopac {
         display: inline-block;
     }
-
-    .rows {
-        div {
-            height: 1em;
-            margin-bottom: 1em;
-        }
-    }
-
 }
 
 #requestattributes {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 0ec9ec105e..f2a833f4f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -10,7 +10,7 @@
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
 [% Asset.css("css/datatables.css") | $raw %]
 [% INCLUDE 'datatables.inc' %]
-