Attachment 97698 Details for Bug 23884 – Bug 23884: Merge strings.inc and browser-strings.inc

[patch] Bug 23884: Merge strings.inc and browser-strings.inc

Bug-23884-Merge-stringsinc-and-browser-stringsinc.patch (text/plain), 8.93 KB, created by Jonathan Druart on 2020-01-22 10:38:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-01-22 10:38:43 UTC

Size: 8.93 KB

patch

obsolete

>From 62a19256bb4c681b2f0ccada25381fb61b1e3dcd 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.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> 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 d7a1879e47..0000000000
>--- 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 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");
> </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 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 %]
>     <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 9e357cb2a1..0816c6379c 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 50b2ac9d66..57f0352273 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -1015,7 +1015,7 @@ Note that permanent location is a code, and location may be an authval.
>     [% 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 4a398096cb..01bd490a73 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 6f3ba54ad0..62352fc4cd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -298,7 +298,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 fe22771aa1..e0da564ccf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -665,7 +665,7 @@
>      </div> 
> 
> [% 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 92aea46250..26d6604dbc 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> 
> 
> [% 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 cb7d480338..8904afaa5a 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 d5320e6949..641053149c 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 'calendar.inc' %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23884: 94615 | 97659 | 97682 | 97698