From dedc285fcf0c85b2f1216ddf282057b19d9702f1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 25 Oct 2018 19:02:31 +0000 Subject: [PATCH] Bug 21672: Switch templates to Bootstrap grid: Various This patch modifies various templates to add or improve coverage of the Bootstrap grid. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> Item circulation alerts - Authorities -> Authorities search -> Merge records - Catalog -> Bibliographic details -> Rota (StockRotation must be enabled) - Tools -> News: Main and add/edit view --- .../prog/en/includes/merge-record-strings.inc | 2 +- .../en/modules/admin/item_circulation_alerts.tt | 11 ++++---- .../prog/en/modules/authorities/merge.tt | 26 ++++++++--------- .../prog/en/modules/catalogue/stockrotation.tt | 25 ++++++++-------- .../prog/en/modules/tools/koha-news.tt | 33 +++++++++++++--------- 5 files changed, 52 insertions(+), 45 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc index 66c55c4..d13a7b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc @@ -1,5 +1,5 @@ [%# transletable strings for merge-record.js %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt index c6f1cf2..bec399c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -51,9 +51,8 @@ table.grid td.default {
- -
-
+
+

Item circulation alerts

Select a library:

@@ -64,7 +63,7 @@ table.grid td.default {
-
+
@@ -88,8 +87,8 @@ table.grid td.default {
Legend
-
-
+
+

Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]

Click on the grid to toggle the settings.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index 550fabf..9b926b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -5,7 +5,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Merging records [% INCLUDE 'doc-head-close.inc' %] -