From 9293e428b4e8809dcae1d1011a578550c860db7e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 10 Jan 2018 19:21:46 +0000 Subject: [PATCH] Bug 19950: Update popup window templates to use Bootstrap grid: Serials This patch updates the two serials templates to use the Bootstrap grid instead of the YUI grid. Apply the patch and go to Serials and locate an existing subscription. - Click the "Edit routing list" in the sidebar. - Save the routing list, and click "Save and preview routing slip." - The routing slip preview should look correct and buttons should work correctly. - When viewing the details of a subscription, click the "Renew" button in the toolbar. The popup window should look correct. Signed-off-by: Zoe Bennett Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../en/modules/serials/routing-preview-slip.tt | 15 ++++----------- .../prog/en/modules/serials/subscription-renew.tt | 8 ++------ 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt index e04b780479..5739534fba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt @@ -2,18 +2,13 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Routing slip preview [% INCLUDE 'doc-head-close.inc' %] - - - -
-
+
@@ -41,8 +36,6 @@ - - [% MACRO jsinclude BLOCK %] [% END %] -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index 64a264e0e3..6f854e7f0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -2,14 +2,11 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Serials subscription renew #[% subscriptionid %] [% INCLUDE 'doc-head-close.inc' %] - +
-
[% IF ( renew ) %] Subscription renewed. @@ -40,12 +37,11 @@
-
[% END %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% END %] -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] -- 2.39.5