From a79915a8e32de502e3f49d27212e2e2c3e0cc066 Mon Sep 17 00:00:00 2001 From: Kyle M Hall <kyle@bywatersolutions.com> Date: Wed, 20 Jul 2016 15:58:20 +0000 Subject: [PATCH] Bug 11360 [QA Followup] - Fix styles and button order Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index e636132..f5d6e75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -252,6 +252,7 @@ $(document).ready(function () { <div class="modal-header"> <h3> Hold found (item is already waiting): + <br/> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]"> [% itembarcode |html %]: [% title |html %] </a> @@ -320,18 +321,19 @@ $(document).ready(function () { <div class="modal-footer"> <input type="hidden" name="cancel_reserve" value="0" /> - <button type="submit" class="btn btn-danger deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();"> - <i class="fa fa-times"></i> Cancel hold - </button> <button type="submit" class="btn approve"> <i class="fa fa-check"></i> Confirm </button> <input type="hidden" name="print_slip" value="0" /> - <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit();"> + <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit();"> <i class="fa fa-print"></i> Print and confirm </button> + + <button type="submit" class="btn deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();"> + <i class="fa fa-times"></i> Cancel hold + </button> </div> </form> </div> @@ -452,6 +454,7 @@ $(document).ready(function () { <div class="modal-header"> <h3> Hold found: + <br/> <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]"> [% itembarcode |html %]: [% title |html %] </a> @@ -532,14 +535,14 @@ $(document).ready(function () { <button type="submit" class="btn approve"> <i class="fa fa-check"></i> Confirm hold and transfer </button> - <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit()"> + <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit()"> <i class="fa fa-print"></i> Print slip, transfer, and confirm </button> [% ELSE %] <button type="submit" class="btn approve"> <i class="fa fa-check"></i> Confirm hold </button> - <button type="submit" class="btn btn-primary print" onclick="this.form.print_slip.value = 1; this.form.submit();"> + <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit();"> <i class="fa fa-print"></i> Print slip and confirm </button> [% END %] -- 2.8.1