From 58ae0c846d346bfe295519ce28ca672f67d611a4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 28 Jun 2019 16:27:16 +0000 Subject: [PATCH] Bug 22999: Switch two-column templates to Bootstrap grid: Circulation This patch modifies the circulation page template to use the Bootstrap grid instead of YUI. To test, apply the patch and view the checkout page, confirming that it looks correct at various browser widths: - Check out (no patron) - Check out -> Patron search - Results - No results - Check out -> Patron selected - Can check out - Checkout blocked (renewal confirmation, item on hold, etc) - Can't check out (expired, restricted) Signed-off-by: David Nind Signed-off-by: Josef Moravec --- .../prog/en/modules/circ/circulation.tt | 64 ++++++++++------------ 1 file changed, 28 insertions(+), 36 deletions(-) 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 04fd9642a1..4244d7010a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -35,17 +35,10 @@ [% END %] - [% IF ( $borrowers ) %] -
-
-
-
- [% ELSE %] -
-
-
-
- [% END %] +
+
+
+
[% IF patron %] [% INCLUDE 'members-toolbar.inc' %] @@ -87,7 +80,6 @@ [% END %] [% IF ( NEEDSCONFIRMATION ) %] -
[% IF CAN_user_circulate_force_checkout %]

Please confirm checkout

@@ -307,11 +299,9 @@ [% END %] [% END %]
-
[% END # /NEEDSCONFIRMATION %] [% IF ( IMPOSSIBLE ) %] -
[% IF ( UNKNOWN_BARCODE ) %]

Barcode not found

@@ -428,7 +418,6 @@ [% END %]
-
[% IF ( FALLBACK ) %] [% IF options %] @@ -505,7 +494,6 @@ [% IF patron %] -
[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]
@@ -513,8 +501,9 @@
[% END %] +
[% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%] -
+
[% IF ( issue ) %] @@ -633,18 +622,18 @@
[% END %] -
+
[% END #/IF !noissues %] [% IF ( noissues ) %] [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] -
+
[% ELSE %]
[% END %] [% ELSE %] -
+
[% END %] [% IF ( noissues ) %] @@ -764,7 +753,6 @@ [% END %] -
[% IF WaitingHolds.count %]
@@ -821,11 +809,10 @@ Add a new message
+
+
+
-
-
- -
  • @@ -963,34 +950,39 @@ [% INCLUDE 'patron-article-requests.inc' %] [% END %] +
[% ELSIF borrowernumber # IF patron %]
Patron not found. Return to search
[% END # /IF patron %] -
-
- [% END %] + [% END #/IF borrowers %] + +
[% IF Koha.Preference('CircSidebar') %] [% UNLESS ( borrowers ) %] [% IF not( borrowernumber and patron ) %] -
+
+
- [% END %] + +
[% END %] [% END %] -
-
+ [% END %] [% UNLESS ( borrowers ) %] [% IF borrowernumber and patron %] -
+
+
+ +
[% END %] [% END %] -
+ +
+