From 7a4a379668a51b23dbf9e46b9fc3d6c170bc292a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 9 Dec 2014 10:01:12 -0500
Subject: [PATCH] Bug 13315 [Follow-up] Add feedback for last item checked out
 to circulation.pl

This patch changes the position and styling of the information about the
last checkout so that it is grouped with the checkout form itself,
placing the message in a more visible position, especially for patrons
with a lot of information in the right-hand messages column which might
push the checkouts table down offscreen.

To test, apply the patch and clear your browser cache in order to
refresh the main CSS file.

Check out an item and confirm that a message is prominently displayed.

Signed-off-by: Jason Burds  <jburds@dubuque.lib.ia.us>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 16d438d18b057c5781371327ef04b18855d2f011)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
---
 .../prog/en/css/staff-global.css              | 28 +++++++++++++++++++
 .../prog/en/modules/circ/circulation.tt       | 19 +++++++++----
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 18bae4629c..b92f490121 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -333,6 +333,13 @@ fieldset {
     border-radius:5px;
 }
 
+fieldset.lastchecked {
+    margin-bottom : 0;
+    border-bottom-width: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
 legend {
 	font-size : 123.1%;
 	font-weight : bold;
@@ -2764,3 +2771,24 @@ span.onsite_checkout {
     border-radius: 4px;
     border : 1px solid #FFF2CE;
 }
+div.lastchecked {
+    padding : .2em 1em;
+    border: 2px solid #BCDB89;
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+}
+.branchgriditem {
+    background-color: #fff;
+    border: 1px solid #b9d8d9;
+    border-radius: 3px;
+    display: table-cell;
+    float: left;
+    margin: 3px;
+    padding: 0.3em;
+}
+.branchgridrow {
+    display: table-row;
+}
+.branchselector {
+    display: table;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 2044271e58..681dbff3e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -519,7 +519,11 @@ No patron matched <span class="ex">[% message %]</span>
 
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
-<fieldset id="circ_circulation_issue">
+[% IF ( issue ) %]
+    <fieldset id="circ_circulation_issue" class="lastchecked">
+[% ELSE %]
+    <fieldset id="circ_circulation_issue">
+[% END %]
     [% IF ( DisplayClearScreenButton ) %]
         <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
     [% END %]
@@ -590,7 +594,14 @@ No patron matched <span class="ex">[% message %]</span>
                         <input type="hidden" name="oldamount" value="[% amountold %]" />
                 [% END %]
 </fieldset>
-</form></div>[% END %]<!-- /unless noissues -->
+[% IF ( issue ) %]
+    <div class="lastchecked">
+        <p><strong>Checked out: </strong>[% issue.item.biblio.title %] ([% issue.item.barcode %]). Due on [% issue.date_due | $KohaDates %]</p>
+    </div>
+[% END %]
+</form></div>
+
+[% END %]<!-- /unless noissues -->
 
 [% IF ( noissues ) %]
     [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
@@ -754,10 +765,6 @@ No patron matched <span class="ex">[% message %]</span>
 
 </div>
 </div>
-[% IF ( issue ) %]
-    <div class="dialog message">[% issue.item.biblio.title %] ([% issue.item.barcode %]) due on [% issue.date_due | $KohaDates %]</div>
-[% END %]
-
 
 <div class="yui-g"><div id="patronlists" class="toptabs">
 
-- 
2.20.1