Attachment 47880 Details for Bug 15681 – Bug 15681: Improve visibility of place hold option when checking out an item already checked out

[patch] Bug 15681: Improve visibility of place hold option when checking out an item already checked out

Bug-15681-Improve-visibility-of-place-hold-option-.patch (text/plain), 7.51 KB, created by Aleisha Amohia on 2016-02-10 22:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2016-02-10 22:47:04 UTC

Size: 7.51 KB

patch

obsolete

>From 94d1403596813ff1f165642653028204a0e1f6ad Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Wed, 10 Feb 2016 22:43:27 +0000
>Subject: [PATCH] Bug 15681: Improve visibility of place hold option when
> checking out an item already checked out
>
>Have converted icons to font-awesome!
>
>To test:
>1) Check out an item to a user
>2) Attempt to check out the same item (ie same barcode) to another user
>3) Confirm that message box says 'Please confirm checkout' with 3 newly styled buttons
>4) Confirm 'cancel checkout and place a hold' button is styled the same as the other two buttons and clicking it takes you to page to place holds (reserves.pl)
>5) Confirm behaviour of other two buttons works as expected also
>
>Sponsored-by: Catalyst IT
>---
> .../intranet-tmpl/lib/bootstrap/bootstrap.min.css     |    2 +-
> .../intranet-tmpl/prog/en/modules/circ/circulation.tt |   17 ++++++++++-------
> 2 files changed, 11 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css b/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css
>index 0a4c9df..2d0b454 100644
>--- a/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css
>+++ b/koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap.min.css
>@@ -86,7 +86,7 @@
> .container:after{clear:both;}
> .container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;}
> .container-fluid:after{clear:both;}
>-.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;*border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;}
>+.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:3px;margin-top:3px;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;*border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;}
> .btn:active,.btn.active{background-color:#cccccc \9;}
> .btn:first-child{*margin-left:0;}
> .btn:hover{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
>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 633e756..5dd4d7b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -362,12 +362,14 @@ $(document).ready(function() {
>     [% END %]
>     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
>     <input type="hidden" name="branch" value="[% branch %]" />
>+    <div class="btn-group">
>     [% IF ( RENEW_ISSUE ) %]
>-    <input type="submit" class="approve" value="Yes, renew (Y)" accesskey="y" />
>+    <button type="submit" class="btn btn-medium" accesskey="y"><i class="fa fa-check"></i> Yes, renew (Y)</button>
>     [% ELSE %]
>-    <input type="submit" class="approve" value="Yes, check out (Y)" accesskey="y" />
>+    <button type="submit" class="btn btn-medium" accesskey="y"><i class="fa fa-check"></i> Yes, check out (Y)</button>
>     [% END %]
>     <input type="hidden" name="onsite_checkout" value="[% onsite_checkout %]" />
>+    </div>
> </form>
> [% END %]
> 
>@@ -397,21 +399,22 @@ $(document).ready(function() {
>     <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
>     <input type="hidden" name="restoreduedatespec" />
>     <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
>+    <div class="btn-group">
>     [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
>         [% IF ( RENEW_ISSUE ) %]
>-        <input type="submit" class="deny" value="No, don't renew (N)" accesskey="n" />
>+        <button type="submit" class="btn btn-medium" accesskey="n"><i class="fa fa-times"></i> No, don't renew (N)</button>
>         [% ELSE %]
>-        <input type="submit" class="deny" value="No, don't check out (N)" accesskey="n" />
>+        <button type="submit" class="btn btn-medium" accesskey="n"><i class="fa fa-times"></i> No, don't check out (N)</button>
>         [% END %]
>     [% ELSE %]
>-        <input type="submit" class="deny" value="Continue" />
>+        <button type="submit" class="btn btn-medium"><i class="fa fa-check"></i> Continue</button>
>     [% END %]
>+    </div>
> </form>
> 
> [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
>     [% UNLESS flagged && noissues %]
>-        <div class="circ-checkoutplacehold"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]">Click here to place a hold for [% INCLUDE 'patron-title.inc' %]</a></div>
>-    [% END %]
>+        <button type="submit" class="btn btn-medium" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-times-circle"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>[% END %]
> [% END %]
> </div></div>
> [% END %] 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 15681: 47356 | 47880 | 47891