From 306b55b4e11fe8def723b81db3ce7c4570ffcf6a Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Wed, 23 Oct 2019 13:16:45 +0000 Subject: [PATCH] Bug 23884: Merge strings.inc and browser-strings.inc This patch take the contents of the JavaScript in browser-strings.inc and puts it in strings.inc. browser-strings.inc is deleted. To test, apply the patch and perform a catalog search in the staff client. - View any result. In the left-hand sidebar there should be a search results browser box with "previous" and "next" arrows and a link back to search results. - Click on each different "view" tab and confirm that the search results navigation box persists: Normal, MARC, Labeled MARC, ISBD, Items. - From any of these views select Edit -> Edit items. The same navigation box should appear. Note: addbiblio.tt and stockrotation.tt are modified but feature doesn't currently work on those pages. --- koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc | 5 ----- koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +- 11 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc deleted file mode 100644 index d7a1879e47e..00000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc +++ /dev/null @@ -1,5 +0,0 @@ -<script> - var BROWSER_RETURN_TO_SEARCH = _("Results"); - var BROWSER_PREVIOUS = _("Previous"); - var BROWSER_NEXT = _("Next"); -</script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index eb7bfda1394..ff5291dcf91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -46,4 +46,7 @@ var CURRENT = _(" (current) "); var MSG_NO_ITEMTYPE = _("No itemtype"); var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type"); + var BROWSER_RETURN_TO_SEARCH = _("Results"); + var BROWSER_PREVIOUS = _("Previous"); + var BROWSER_NEXT = _("Next"); </script> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt index 346b53b7a77..1e022b1b1de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt @@ -56,7 +56,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] [% Asset.js("js/catalog.js") | $raw %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] <script> var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt index 9e357cb2a16..0816c6379ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -186,7 +186,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] [% Asset.js("js/catalog.js") | $raw %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] <script> var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index f3bb3a1bf47..4a22939d299 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -982,7 +982,7 @@ [% END %] [% INCLUDE 'datatables.inc' %] [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") | $raw %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% INCLUDE 'columns_settings.inc' %] [% Asset.js("js/browser.js") | $raw %] [% Asset.js("js/table_filters.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt index 4a398096cb8..01bd490a733 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt @@ -79,7 +79,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] [% Asset.js("js/catalog.js") | $raw %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] <script> //<![CDATA[ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 0a6d0609eb0..473a96e6d55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -288,7 +288,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] [% Asset.js("js/catalog.js") | $raw %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] <script> var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index d52245a71d1..326b60fa3ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -664,7 +664,7 @@ </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] [% Asset.js("lib/hc-sticky.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt index 92aea46250e..26d6604dbc2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt @@ -167,7 +167,7 @@ </div> <!-- /.row --> [% MACRO jsinclude BLOCK %] - [% INCLUDE 'browser-strings.inc' %] + [% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] <script> var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 635b6cceb3a..92403a56f67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -6,7 +6,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% Asset.js("lib/hc-sticky.js") | $raw %] [% Asset.js("js/cataloging.js") | $raw %] -[% INCLUDE 'browser-strings.inc' %] +[% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] <script> var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 39476f623a5..4a5b114da56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -9,7 +9,7 @@ [% INCLUDE 'datatables.inc' %] [% Asset.js("js/cataloging.js") | $raw %] [% INCLUDE 'columns_settings.inc' %] -[% INCLUDE 'browser-strings.inc' %] +[% INCLUDE 'strings.inc' %] [% Asset.js("js/browser.js") | $raw %] [% INCLUDE 'select2.inc' %] [% INCLUDE 'str/cataloging_additem.inc' %] -- 2.11.0