From cdd956bc5fbabd9fe5bd79aa1d57a9acf1ba3753 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 23 Apr 2018 18:26:14 +0000 Subject: [PATCH] Bug 20641: Switch single-column templates to Bootstrap grid: Various, part 2 This patch updates various unrelated templates to use the Bootstrap grid. In each case, confirm that the indicated page looks correct. - Acquisitions -> Vendor -> Add to basket -> From a staged file. - Logged-in user menu (in the upper right) -> Search history. - With plugins disabled in koha-conf.xml, go to Tools -> Tools plugins. - With the EasyAnalyticalRecords system preference set to 'Display,' view a bibliographic record. - Choose Edit -> Link to host item. - Submit a barcode to be linked. - Configure a MARC subfield (e.g. 100$a) to use the unimarc_field_225a_bis plugin. From the MARC edit page, trigger the plugin and confirm that the page in the popup window looks correct. Confirm that changes made in the popup window are saved to the corresponding field in the editor. - Administration -> Funds -> Edit a fund. - Click 'Select owner.' - Search for a patron. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- .../prog/en/modules/acqui/addorderiso2709.tt | 14 ++++++-------- .../prog/en/modules/catalogue/search-history.tt | 16 +++++++--------- .../prog/en/modules/cataloguing/linkitem.tt | 7 +++++-- .../value_builder/unimarc_field_225a_bis.tt | 12 +----------- .../prog/en/modules/common/patron_search.tt | 5 +---- .../prog/en/modules/labels/label-print.tt | 6 +++--- 6 files changed, 23 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 2d54193db2..3f5d736548 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -19,10 +19,10 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] -
-
-
-
+ +
+
+
[% IF ( allmatch ) %]

No records imported

No record have been imported because they all match an existing record in your catalog.
You'll have to treat them individually. @@ -420,10 +420,8 @@
[% END %] -
-
-
-
+
[% # /div.col-sm-6 %] +
[% # /div.row %] [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index a69e7a205f..ba8b175e44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -17,11 +17,10 @@ HomeCatalog › Search history
-
+
+
+
-
-
-

Search history

    @@ -186,11 +185,10 @@ [% IF !current_authority_searches && !previous_authority_searches %]

    Your authority search history is empty.

    [% END %] -
-
-
-
-
+
[% # /authority_tab %] +
[% # /tabs %] +
[% # /div.col-md-8 %] + [% # /div.row %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt index 0741fce9ad..98ad4d15b5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt @@ -6,7 +6,10 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -
+ +
+
+
[% IF ( error ) %]
@@ -19,7 +22,7 @@ [% ELSE %] [% IF ( success ) %] -
The item has successfully been linked to [% bibliotitle |html %].
+
The item has successfully been linked to [% bibliotitle |html %].
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt index 7499cf4d73..c86d9c90f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a_bis.tt @@ -2,20 +2,11 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › UNIMARC field 225a builder [% INCLUDE 'doc-head-close.inc' %] - -
-
+

UNIMARC field 225a builder

@@ -30,7 +21,6 @@
-
[% MACRO jsinclude BLOCK %]