From 3e2936a37e08e6c669a969984361f7d761efd074 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Jan 2018 15:32:56 +0000 Subject: [PATCH] Bug 20032: Switch single-column templates to Bootstrap grid: Tools This patch updates several single-column Tools templates to use the Bootstrap grid. - batchMod-del.tt - Tools -> Batch item deletion -> Submit barcodes or item numbers for deletion. The grid is changed for the results and confirmation screens. - batchMod-edit.tt - Tools -> Batch item modification -> Submit barcodes or item numbers for modification. The grid is changed for the results and confirmation screens. - koha-news.tt - Tools -> News -> Edit or create a new news item. The grid is changed for the edit screen. - letter.tt - Tools -> Notices and Slips -> Edit or create a notice. The grid is changed for the edit screen. Each of these pages should look correct. The News and Notices page should have a single centered column with wide margins on either side. At lower browser widths the margins should disappear. The batch mod screens should be displayed at full screen width. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/tools/batchMod-del.tt | 6 ++---- .../prog/en/modules/tools/batchMod-edit.tt | 10 ++++------ .../prog/en/modules/tools/koha-news.tt | 14 ++++++++++---- .../prog/en/modules/tools/letter.tt | 16 +++++++++++----- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt index ca611a17cc..1894e2846d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -17,9 +17,8 @@ Batch item deletion -
-
-
+
+ [% IF ( show ) %]

Batch item deletion

[% ELSE %]

Batch item deletion results

[% END %] [% IF ( barcode_not_unique ) %]
Error saving item: Barcode must be unique.
[% END %] [% IF ( no_next_barcode ) %]
Error saving items: Unable to automatically determine values for barcodes. No item has been inserted.
[% END %] @@ -183,7 +182,6 @@

[% END %]
-
[% MACRO jsinclude BLOCK %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 1133e3f735..ed9b9fcdc4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -61,9 +61,8 @@ $(document).ready(function(){ Batch item modification
-
-
-
+
+ [% IF ( show ) %]

Batch item modification

[% ELSE %] @@ -272,8 +271,7 @@ $(document).ready(function(){ Return to batch item modification [% END %] - + [% END %] -
-
+ [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt index ca9281d350..76ecd89287 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -16,10 +16,16 @@ -[% IF ( add_form ) %]
[% ELSE %]
[% END %] -
-
-
+[% IF ( add_form ) %] +
+
+
+[% ELSE %] +
+
+
+
+[% END %] [% UNLESS ( add_form ) %] [% IF error_message == 'title_missing' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index bb147ccf23..e40fd33095 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -13,11 +13,17 @@ -[% IF add_form or copy_form %]
[% ELSE %]
[% END %] - -
-
-
+[% IF add_form or copy_form %] +
+
+
+[% ELSE %] +
+
+
+
+[% END %] + [% IF ( no_op_set ) %]

Notices and Slips

-- 2.39.5