From 3d8c95c8a64c71116cff425c87a6bef99054889e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Jan 2018 18:29:10 +0000 Subject: [PATCH] Bug 20037: Switch single-column templates to Bootstrap grid: Serials This patch updates several single-column Serials module templates to use the Bootstrap grid. In addition to grid changes, some templates have been modified to include the footer with the correct popup parameter. - serials\acqui-search.tt - Go to Serials -> New subscription. Click "Search for a vendor." - serials\acqui-search-result.tt - Vendor search results - serials\result.tt - Click "Search for record." - serials\subscription-bib-search.tt - Catalog search results. Each of these pages should look correct. --- .../intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt | 9 +++++---- koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt | 8 ++------ koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt | 9 +++++---- .../prog/en/modules/serials/subscription-bib-search.tt | 8 +++++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt index 3ee8266..b91b17d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tt @@ -6,9 +6,9 @@ -
-
- +
+
+

Vendor search results

[% UNLESS count %] @@ -39,6 +39,7 @@
+
[% MACRO jsinclude BLOCK %] [% END %] -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt index db09180..60d270d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search.tt @@ -5,9 +5,7 @@ -
-
- +

Serial subscription: search for vendor

@@ -16,6 +14,4 @@
-
- -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt index 1c0c97a..58b5d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt @@ -6,9 +6,9 @@ -
-
- +
+
+
[% IF ( total ) %]

Search results from [% from %] to [% to %] of [% total %]

@@ -63,6 +63,7 @@
+
[% 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-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt index 6c710e8..90fc446 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt @@ -4,8 +4,9 @@ -
-
+
+
+

Catalog search

[% IF ( no_query ) %] @@ -52,5 +53,6 @@
+
-[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] \ No newline at end of file -- 2.1.4