From 164c228e97ba9f313351c0a5c50ce1370ef0fae3 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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. Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc | 5 ----- koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 3 +++ .../intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt | 2 +- .../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../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 d7a1879e47..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/browser-strings.inc +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index 7eba12b93e..ab53ca910a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -52,4 +52,7 @@ var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type"); var PATRON_NOTE = _("Patron note"); var CONFIRM_DELETE_RETURN_CLAIM = _("Are you sure you want to delete this return claim?"); + var BROWSER_RETURN_TO_SEARCH = _("Results"); + var BROWSER_PREVIOUS = _("Previous"); + var BROWSER_NEXT = _("Next"); 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 346b53b7a7..1e022b1b1d 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 %]