From 0aaac53762a707dda971799dba4738e125b31ae7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 24 Apr 2018 13:37:07 +0000 Subject: [PATCH] Bug 20650: Switch single-column templates to Bootstrap grid: Various, part 3 This patch updates various unrelated templates to use the Bootstrap grid. In each case, confirm that the indicated page looks correct. This patch also corrects a couple of capitalization errors and removes an unused template: virtualshelves/merge.tt. - Tools -> Patron card creator -> Manage -> Card batches - Export a batch - The pages inside the modal window should look correct: Both the "X batch(es) to export" screen and the "download exported batch(es)" one. - Tools -> Patron lists -> Edit list - The patron list add/edit form should look correct. - Disable plugins in koha-conf.xml. - Tools -> Plugins - The "Plugins disabled" page should look correct. - Enable plugins in koha-conf.xml - Tools -> Plugins -> Upload plugins. - This page should look correct. - Tools - The tools home page should show three columns: Patrons and Circulation, Catalog, Additional tools. - At viewport width below 768 pixels content should reflow into one column. - virtualshelves/merge.tt has been removed as it is unused. Search the codebase for references to it. There should be none. --- .../prog/en/modules/patron_lists/add-modify.tt | 8 +++++--- .../prog/en/modules/patroncards/print.tt | 5 +---- .../prog/en/modules/plugins/plugins-disabled.tt | 12 ++++-------- .../prog/en/modules/plugins/plugins-upload.tt | 19 ++++++++----------- .../intranet-tmpl/prog/en/modules/tools/tools-home.tt | 16 ++++++++-------- .../prog/en/modules/virtualshelves/merge.tt | 15 --------------- 6 files changed, 26 insertions(+), 49 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt index bf89a4d..570b309 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt @@ -23,8 +23,9 @@ -
-
+
+
+

[% IF list.patron_list_id %] Modify patron list @@ -63,7 +64,8 @@ Cancel -

+
+
[% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt index fcf1d96..8c3ce77 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt @@ -8,12 +8,10 @@ [% INCLUDE intranetstylesheet.inc %] [% IF ( IntranetUserCSS ) %][% END %] [% INCLUDE 'doc-head-close.inc' popup => 1%] - -
-
+
[% IF ( batches ) %]

Click on the following link(s) to download the exported batch(es).

@@ -112,7 +110,6 @@
[% END %] -
[% IF ( IntranetUserJS ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt index dd42f5c..3b2a3fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-disabled.tt @@ -14,17 +14,13 @@ › Plugins disabled
-
-
-
-
-
-
+
+
+

Plugins disabled!

To enable Koha plugins, the system preference UseKohaPlugins must be enabled, and the flag enable_plugins must be set in the Koha configuration file

-
-
+ [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt index 070c03d..057e9ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Plugins › Upload Plugin +<title>Koha › Tools › Plugins › Upload plugin [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -11,16 +11,14 @@ -
-
-
-
-
-
-

Upload Koha Plugin

+
+
+
+ +

Upload Koha plugin

[% IF ( ERRORS ) %]
[% FOREACH ERROR IN ERRORS %] @@ -50,6 +48,5 @@
-
-
+ [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 4c8cca9..59d7575 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -8,11 +8,9 @@ -
-
-
- -
+
+
+

Patrons and circulation

[% IF (CAN_user_tools_manage_patron_lists) %] @@ -71,7 +69,9 @@ [% END %]
-
+ + +

Additional tools

[% IF ( CAN_user_tools_edit_calendar ) %] @@ -116,7 +116,7 @@
-
+

Catalog

[% IF ( CAN_user_tools_items_batchdel ) %] @@ -193,5 +193,5 @@
-
+ [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt deleted file mode 100644 index e3e374b..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt +++ /dev/null @@ -1,15 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › [% shelf %] merge -[% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] - -

[% session %]

- -[% IF ( fields ) %][% INCLUDE virtualshelves/merge/selection.tmpl %] -[% ELSE %] -

DOIT

[% new %]
-

ITEMS

[% items %]
-[% END %] - -[% INCLUDE 'intranet-bottom.inc' %] - -- 2.1.4