Bug 17854: Adds print/close icon in checkout

To Test:
1) Apply Patch.
2) Go to a patron checkout screen (circulation.pl).
3) Note there are no clear screen buttons in the upper right corner of
the checkout window.
4) Turn on the DisplayClearScreenButton preference.
5) Go back to patron checkout.  Note the clear screen button and the new
printer icon next to it.
6) Click the printer icon.  This will trigger a print slip function, and
close the patron screen.
7) Try to arrow back to the previous screen.  Should go to main menu and
not the patron screen, just like the orginal close button (X).

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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 4df909d..ec7cd47 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2712,6 +2712,27 @@ li {
     }
 }
 
+#printclearscreen {
+    position: absolute;
+    right: 43px;
+    top: 0;
+
+    a {
+        background-color: #EEE;
+        border-radius: 0 0 0 5px;
+        color: #CCC;
+        display: block;
+        font-size: 160%;
+        font-weight: bold;
+        padding: 0 .7em .2em;
+        text-decoration: none;
+        text-shadow: 0 -1px 0 #666;
+
+        &:hover {
+            color: #CC0000;
+        }
+    }
+}
 .pager {
     background-color: #E8E8E8;
     border: 1px solid #BCBCBC;

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 394155d..1d22147 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -512,6 +512,7 @@ No patron matched <span class="ex">[% message | html %]</span>
 [% END %]
     [% IF ( DisplayClearScreenButton ) %]
         <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
+        <span id="printclearscreen"><a href="#" title="Print slip and clear screen"><i class="fa fa-print"></i></a></span>
     [% END %]
 
     [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
index ecc22b1..d49b31e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
@@ -75,6 +75,10 @@ $(document).ready(function(){
         $(".btn-group").removeClass("open");
         return false;
     });
+    $("#printclearscreen").click(function(){
+        printx_window("slip");
+        window.location.replace("/cgi-bin/koha/circ/circulation.pl");
+    });
     $("#searchtohold").click(function(){
         searchToHold();
         return false;