From 4041c67c3a19ebc1d2c20151ec50e5eca704c6d2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 3 May 2018 12:58:36 +0000 Subject: [PATCH] Bug 21439: Update two-column templates with Bootstrap grid: Rotating collections This patch modifies rotating collections templates to use the Bootstrap grid instead of YUI. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Tools -> Rotating collections - View rotating collection - Transfer rotating collection - Edit rotating collection --- .../en/modules/rotating_collections/addItems.tt | 24 +++++++++++++--------- .../rotating_collections/editCollections.tt | 23 ++++++++++++--------- .../rotating_collections/rotatingCollections.tt | 23 ++++++++++++--------- .../rotating_collections/transferCollection.tt | 23 ++++++++++++--------- 4 files changed, 53 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt index 7c0f04c..3c786b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -12,10 +12,10 @@ -
-
-
-
+
+
+
+
[% IF ( ! colId ) %]
@@ -115,12 +115,16 @@ [% END %]
[% END %] -
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ + +
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt index 298f9ec..614b731 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt @@ -23,10 +23,10 @@ [% END -%]
-
-
-
-
+
+
+
+
[% IF ( previousActionCreate ) %] [% IF ( createSuccess ) %] @@ -131,12 +131,15 @@ [% END %]
-
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ +
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt index 86343e2..ee533f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt @@ -14,10 +14,10 @@ -
-
-
-
+
+
+
+
[% INCLUDE 'rotating-collections-toolbar.inc' %] @@ -60,12 +60,15 @@ [% END %]
-
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ +
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt index f91ac72..a6cd146 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt @@ -12,10 +12,10 @@ -
-
-
-
+
+
+
+

Transfer collection [% colTitle | html %]

@@ -53,12 +53,15 @@
[% END %] -
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ +
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %] -- 2.1.4