From b86a9ee984ece06e11e0f490027771125d5fc9a7 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. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/serials/acqui-search-result.tt | 8 ++------ .../intranet-tmpl/prog/en/modules/serials/acqui-search.tt | 8 ++------ koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tt | 8 ++------ .../prog/en/modules/serials/subscription-bib-search.tt | 7 ++----- 4 files changed, 8 insertions(+), 23 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 e1dacd33fc..1d1cc7c52d 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,7 @@ -
-
- +

Vendor search results

[% UNLESS count %] @@ -38,8 +36,6 @@ -
- [% 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 db09180d7d..60d270dd59 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 1c0c97adc6..b8131b1777 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,7 @@ -
-
- +
[% IF ( total ) %]

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

@@ -62,8 +60,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-bib-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-bib-search.tt index 6c710e8000..fc710c9f8b 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,7 @@ -
-
+

Catalog search

[% IF ( no_query ) %] @@ -51,6 +50,4 @@ -
- -[% INCLUDE 'intranet-bottom.inc' %] +[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] \ No newline at end of file -- 2.39.5