From e0de2fd1c844a4c5791ca4ad73305f6f8126582e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 15 Aug 2016 16:02:26 +0000 Subject: [PATCH] Bug 12904 - Update template css and js file references Signed-off-by: Nick Clemens Signed-off-by: Olli-Antti Kivilahti Signed-off-by: Kyle M Hall --- .../prog/en/includes/cateditor-ui.inc | 10 +++-- .../prog/en/includes/columns_settings.inc | 2 + .../intranet-tmpl/prog/en/includes/datatables.inc | 12 +++--- .../prog/en/includes/doc-head-close-receipt.inc | 4 +- .../prog/en/includes/doc-head-close.inc | 15 ++++---- .../intranet-tmpl/prog/en/includes/greybox.inc | 8 ++-- .../intranet-tmpl/prog/en/includes/help-top.inc | 20 +++++----- .../prog/en/includes/installer-doc-head-close.inc | 19 ++++++---- .../prog/en/includes/intranetstylesheet.inc | 2 + .../prog/en/includes/wysiwyg-systempreferences.inc | 6 ++- .../prog/en/modules/acqui/acqui-home.tt | 8 ++-- .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++- .../prog/en/modules/acqui/basketgroup.tt | 22 ++++++----- .../prog/en/modules/acqui/basketheader.tt | 3 +- .../prog/en/modules/acqui/booksellers.tt | 4 +- .../prog/en/modules/acqui/edifactmsgs.tt | 3 +- .../prog/en/modules/acqui/histsearch.tt | 6 ++- .../prog/en/modules/acqui/invoice-files.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 3 +- .../prog/en/modules/acqui/invoices.tt | 4 +- .../prog/en/modules/acqui/lateorders.tt | 6 ++- .../prog/en/modules/acqui/neworderbiblio.tt | 4 +- .../prog/en/modules/acqui/neworderempty.tt | 12 +++--- .../prog/en/modules/acqui/newordersubscription.tt | 4 +- .../prog/en/modules/acqui/newordersuggestion.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +- .../prog/en/modules/acqui/orderreceive.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 7 ++-- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 4 +- .../prog/en/modules/acqui/supplier.tt | 4 +- .../prog/en/modules/acqui/uncertainprice.tt | 5 ++- .../prog/en/modules/acqui/z3950_search.tt | 8 ++-- .../prog/en/modules/admin/aqbudgetperiods.tt | 10 +++-- .../prog/en/modules/admin/aqbudgets.tt | 10 +++-- .../prog/en/modules/admin/aqcontract.tt | 4 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 6 ++- .../prog/en/modules/admin/audio_alerts.tt | 3 +- .../prog/en/modules/admin/auth_tag_structure.tt | 4 +- .../prog/en/modules/admin/authorised_values.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 4 +- .../prog/en/modules/admin/biblio_framework.tt | 6 ++- .../en/modules/admin/branch_transfer_limits.tt | 6 ++- .../prog/en/modules/admin/branches.tt | 8 ++-- .../prog/en/modules/admin/categories.tt | 5 ++- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 4 +- .../prog/en/modules/admin/currency.tt | 4 +- .../prog/en/modules/admin/items_search_fields.tt | 4 +- .../prog/en/modules/admin/itemtypes.tt | 3 +- .../prog/en/modules/admin/localization.tt | 4 +- .../en/modules/admin/marc_subfields_structure.tt | 4 +- .../prog/en/modules/admin/marctagstructure.tt | 6 ++- .../prog/en/modules/admin/preferences.tt | 21 ++++++----- .../prog/en/modules/admin/sms_providers.tt | 4 +- .../prog/en/modules/admin/systempreferences.tt | 3 +- .../prog/en/modules/admin/z3950servers.tt | 4 +- .../prog/en/modules/authorities/authorities.tt | 10 +++-- .../prog/en/modules/authorities/detail.tt | 4 +- .../prog/en/modules/authorities/merge.tt | 4 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 10 +++-- .../prog/en/modules/batch/print-notices.tt | 2 + .../prog/en/modules/catalogue/ISBDdetail.tt | 6 ++- .../prog/en/modules/catalogue/MARCdetail.tt | 6 ++- .../prog/en/modules/catalogue/advsearch.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 11 +++--- .../prog/en/modules/catalogue/issuehistory.tt | 3 +- .../prog/en/modules/catalogue/itemsearch.tt | 10 +++-- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 6 ++- .../prog/en/modules/catalogue/moredetail.tt | 7 ++-- .../prog/en/modules/catalogue/results.tt | 5 ++- .../prog/en/modules/catalogue/search-history.tt | 7 ++-- .../prog/en/modules/cataloguing/addbiblio.tt | 13 ++++--- .../prog/en/modules/cataloguing/additem.tt | 14 +++---- .../prog/en/modules/cataloguing/editor.tt | 14 ++++--- .../prog/en/modules/cataloguing/merge.tt | 4 +- .../cataloguing/value_builder/cn_browser.tt | 4 +- .../cataloguing/value_builder/marc21_field_006.tt | 4 +- .../cataloguing/value_builder/marc21_field_008.tt | 4 +- .../en/modules/cataloguing/z3950_auth_search.tt | 8 ++-- .../prog/en/modules/cataloguing/z3950_search.tt | 8 ++-- .../prog/en/modules/circ/circulation.tt | 15 ++++---- .../en/modules/circ/circulation_batch_checkouts.tt | 4 +- .../prog/en/modules/circ/offline-mf.tt | 40 ++++++++++---------- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 8 ++-- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 4 +- .../prog/en/modules/circ/printslip.tt | 3 +- .../prog/en/modules/circ/reserveratios.tt | 4 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 5 ++- .../prog/en/modules/circ/transferstoreceive.tt | 3 +- .../prog/en/modules/circ/view_holdsqueue.tt | 3 +- .../prog/en/modules/circ/waitingreserves.tt | 3 +- .../prog/en/modules/common/patron_search.tt | 3 +- .../en/modules/course_reserves/course-details.tt | 4 +- .../en/modules/course_reserves/course-reserves.tt | 4 +- .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 4 +- .../prog/en/modules/labels/label-edit-batch.tt | 4 +- .../prog/en/modules/labels/label-home.tt | 4 +- .../prog/en/modules/labels/label-manage.tt | 4 +- .../intranet-tmpl/prog/en/modules/labels/result.tt | 4 +- .../prog/en/modules/labels/spinelabel-print.tt | 8 ++-- .../prog/en/modules/members/boraccount.tt | 3 +- .../prog/en/modules/members/member-flags.tt | 6 ++- .../prog/en/modules/members/member.tt | 3 +- .../prog/en/modules/members/memberentrygen.tt | 5 ++- .../prog/en/modules/members/moremember-receipt.tt | 3 +- .../prog/en/modules/members/moremember.tt | 15 ++++---- .../prog/en/modules/members/notices.tt | 3 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 3 +- .../prog/en/modules/members/printfeercpt.tt | 4 +- .../prog/en/modules/members/printinvoice.tt | 3 +- .../en/modules/members/purchase-suggestions.tt | 3 +- .../prog/en/modules/members/readingrec.tt | 3 +- .../prog/en/modules/members/statistics.tt | 3 +- .../prog/en/modules/members/update-child.tt | 4 +- .../prog/en/modules/offline_circ/list.tt | 4 +- .../prog/en/modules/offline_circ/process_koc.tt | 6 ++- .../prog/en/modules/patron_lists/list.tt | 6 ++- .../prog/en/modules/patron_lists/lists.tt | 4 +- .../prog/en/modules/patroncards/edit-batch.tt | 4 +- .../prog/en/modules/patroncards/home.tt | 2 + .../en/modules/reports/guided_reports_start.tt | 5 ++- .../prog/en/modules/reports/itemslost.tt | 4 +- .../prog/en/modules/reports/itemtypes.tt | 4 +- .../prog/en/modules/reports/orders_by_budget.tt | 4 +- .../prog/en/modules/reports/serials_stats.tt | 4 +- .../prog/en/modules/reserve/request.tt | 3 +- .../rotating_collections/rotatingCollections.tt | 4 +- .../prog/en/modules/serials/add_fields.tt | 4 +- .../prog/en/modules/serials/claims.tt | 5 ++- .../prog/en/modules/serials/serials-collection.tt | 6 ++- .../prog/en/modules/serials/serials-edit.tt | 6 ++- .../prog/en/modules/serials/serials-search.tt | 6 ++- .../prog/en/modules/suggestion/suggestion.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/tags/list.tt | 4 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 6 ++- .../tools/automatic_item_modification_by_age.tt | 6 ++- .../prog/en/modules/tools/batchMod-del.tt | 8 ++-- .../prog/en/modules/tools/batchMod-edit.tt | 13 ++++--- .../prog/en/modules/tools/batch_delete_records.tt | 6 ++- .../en/modules/tools/batch_record_modification.tt | 8 ++-- .../prog/en/modules/tools/holidays.tt | 4 +- .../prog/en/modules/tools/inventory.tt | 6 ++- .../prog/en/modules/tools/koha-news.tt | 8 ++-- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 5 ++- .../prog/en/modules/tools/manage-marc-import.tt | 33 ++++++++++++++++- .../modules/tools/marc_modification_templates.tt | 4 +- .../prog/en/modules/tools/modborrowers.tt | 3 +- .../prog/en/modules/tools/quotes-upload.tt | 10 +++-- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 10 +++-- .../prog/en/modules/tools/showdiffmarc.tt | 4 +- .../prog/en/modules/tools/stage-marc-import.tt | 6 ++- .../prog/en/modules/tools/upload-images.tt | 6 ++- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 5 ++- .../prog/en/modules/virtualshelves/shelves.tt | 9 +++-- .../opac-tmpl/bootstrap/en/includes/datatables.inc | 6 ++- .../bootstrap/en/includes/doc-head-close.inc | 26 ++++++++----- .../opac-tmpl/bootstrap/en/includes/greybox.inc | 10 +++-- .../bootstrap/en/includes/opac-bottom.inc | 43 ++++++++++++---------- .../bootstrap/en/modules/opac-advsearch.tt | 5 ++- .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 3 +- .../bootstrap/en/modules/opac-auth-detail.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 3 +- .../bootstrap/en/modules/opac-course-details.tt | 3 +- .../bootstrap/en/modules/opac-course-reserves.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 15 ++++---- .../bootstrap/en/modules/opac-memberentry.tt | 5 ++- .../bootstrap/en/modules/opac-overdrive-search.tt | 7 ++-- .../bootstrap/en/modules/opac-results-grouped.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 11 +++--- .../bootstrap/en/modules/opac-search-history.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 3 +- .../bootstrap/en/modules/opac-suggestions.tt | 5 ++- .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 12 +++--- .../bootstrap/en/modules/sco/printslip.tt | 3 +- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 9 +++-- 178 files changed, 757 insertions(+), 421 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index a6ac276..53f1ade 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -1,7 +1,9 @@ - - - - +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] + + + + - - + + + + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc index c564793..aefe18e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-receipt.inc @@ -1,4 +1,6 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 48484f6..a4157a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -1,6 +1,7 @@ [% USE Koha %] [% USE String %] [% PROCESS 'html_helpers.inc' %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [%# Prevent XFS attacks -%] @@ -10,16 +11,16 @@ - - - - - + + + + + [% INCLUDE intranetstylesheet.inc %] -[% IF ( bidi ) %][% END %] +[% IF ( bidi ) %][% END %] [% IF ( login ) %] - + [% END %] [% IF ( IntranetUserCSS ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc index 11d7581..473ad54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc index 7d85d95..ff3fae9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc @@ -1,20 +1,22 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Online help - - + + [% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %] - + [% END %] - - - - + + + + - + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc index 16de754..97fa477 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc @@ -1,14 +1,17 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] - - - + + + + + + + + + - - - - - + + + - + + + - - - - + + + + + [% IF ( grouping ) %] - - - - + + + + - + [% INCLUDE 'datatables.inc' %] + + [% INCLUDE 'calendar.inc' %] -[% INCLUDE 'additem.js.inc' %] - - - + +[% INCLUDE 'additem_[% KOHA_VERSION %].js.inc' %] + + + - - + + + - + + - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index ddf104a..193dd67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -1,10 +1,12 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %] - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'z3950_search.inc' %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 7acb4d6..8ddd378 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF op =='add_form' %]Cities › [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 040b52e..c0e8ac5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE AuthorisedValues %] [% USE Price %] [% INCLUDE 'doc-head-open.inc' %] @@ -21,7 +22,7 @@ Data deleted [% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'greybox.inc' %] [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index a5d354d..9f90cf8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -1,4 +1,6 @@ [% USE AuthorisedValues %] +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF ( add_form ) %]MARC frameworks › [% action %] [% searchfield %][% END %] @@ -6,9 +8,9 @@ [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] [% IF ( else ) %]MARC frameworks[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + - - + + + - - - - + + + + [%# Add WYSIWYG editor for htmlarea system preferences %] [% INCLUDE 'wysiwyg-systempreferences.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt index c974417..6717a7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › SMS cellular providers [% INCLUDE 'doc-head-close.inc' %] @@ -9,7 +11,7 @@ var LABEL_SMS_EDIT_PROVIDER = _("Edit provider %s"); //]]> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index 4f8f511..a4cb17d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF ( add_form ) %] System preferences › [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences › Data added[% END %] [% IF ( delete_confirm ) %] System preferences › [% searchfield %] › Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences › Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %] @@ -6,7 +7,7 @@ [%# Add WYSIWYG editor for htmlarea system preferences %] [% INCLUDE 'wysiwyg-systempreferences.inc' %] [% IF ( else ) %] - + [% INCLUDE 'datatables.inc' %] - + + - + [% IF ( bidi ) %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt index e150232..c8e4ecb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% PROCESS 'authorities.inc' %] [% INCLUDE 'doc-head-open.inc' %] Koha › Authorities › @@ -9,7 +11,7 @@ [% INCLUDE 'doc-head-close.inc' %] [% IF ( displayhierarchy ) %] - + [% END %] + [% INCLUDE 'merge-record-strings.inc' %] [% ELSE %][% INCLUDE 'doc-head-close.inc' %] - - - + + + [% INCLUDE 'datatables.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt index ddf39a3..4810da2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Print Notices for [% today %] 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 abe3ea2..c83a6f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › [% IF ( unknownbiblionumber ) %] @@ -9,9 +11,9 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'browser-strings.inc' %] <!--[if lt IE 9]> -<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> +<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> <![endif]--> -<script type="text/javascript" src="[% interface %]/js/browser.js"></script> +<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> <script type="text/javascript"> //<![CDATA[ var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 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 004d77f..a3f6e8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Catalog › [% IF ( unknownbiblionumber ) %] @@ -9,9 +11,9 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'browser-strings.inc' %] <!--[if lt IE 9]> -<script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> +<script type="text/javascript" src="[% interface %]/lib/shims/json2.min_[% KOHA_VERSION %].js"></script> <![endif]--> -<script type="text/javascript" src="[% interface %]/js/browser.js"></script> +<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> <script type="text/javascript"> //<![CDATA[ var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 6a7e045..df2cedb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -1,8 +1,10 @@ [% USE Branches %] +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Catalog › Advanced search [% INCLUDE 'doc-head-close.inc' %] - + + [% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'browser-strings.inc' %] - + - - + + + + + + + - + + [% INCLUDE 'browser-strings.inc' %] - + - + [% INCLUDE 'select2.inc' %] [% IF ( bidi ) %] - + [% END %] 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 26ecf45..8537ec0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -1,18 +1,18 @@ [% USE Koha %] [% USE ColumnsSettings %] - +[% SET KOHA_VERSION = Koha.Preference(Version) %] [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber %]) › Items - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'browser-strings.inc' %] - + - + [% INCLUDE 'select2.inc' %] [% IF ( bidi ) %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index dd3ab74..e2ce3a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -1,13 +1,15 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Editor [% INCLUDE 'doc-head-close.inc' %] - - - - - + + + + + [% IF ( bidi ) %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index 464d763..5c59838 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -1,9 +1,11 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% PROCESS 'merge-record.inc' %] [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Merging records [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'merge-record-strings.inc' %] - + [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE intranetstylesheet.inc %] - +

Online Help

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index a096577..80ec75d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -1,6 +1,8 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha staff client - + [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index ed905a9..b0e6c7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -1,9 +1,11 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE ItemTypes %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'greybox.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'datatables.inc' %] + - + + + + [% INCLUDE 'calendar.inc' %] - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt index 2e00db9..34d0339 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -1,10 +1,11 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Print Receipt for [% cardnumber %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'slip-print.inc' #printThenClose %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 6e5308f..b18d06c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -3,6 +3,7 @@ [% USE KohaDates %] [% USE AuthorisedValues %] [% USE ColumnsSettings %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › [% IF ( unknowuser ) %] @@ -13,17 +14,17 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - + [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'strings.inc' %] - - + + [% INCLUDE 'timepicker.inc' %] - - - - + + + + + + - + + + + - + + [% INCLUDE 'calendar.inc' %] [% END %] [% IF ( op_else ) %] - + [% INCLUDE 'datatables.inc' %] - + [% END %] - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt index 798e252..d8819d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] + - + [% INCLUDE 'select2.inc' %] + - + + + [% END %] - + + - + + [% INCLUDE 'datatables.inc' %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 0ff04f5..dab4e5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -1,11 +1,12 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc'%] Koha › Tools › Batch patron modification [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] - + [% INCLUDE 'datatables.inc' %] + - + + + - + + [% END %] [% IF SCO_login %] @@ -43,13 +49,13 @@ [% END %] [% PROCESS cssinclude %] - + - - + + [% PROCESS 'html_helpers.inc' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc index 92ef62d..8a2331f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc @@ -1,7 +1,9 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] - - - - + + + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 80626e0..4afb558 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% UNLESS ( is_popup ) %] [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] [% IF ( opaccredits ) %] @@ -77,24 +79,24 @@ - - + + - - + + - + [% END %] - [% IF Koha.Preference( 'opacbookbag' ) == 1 %] - + [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %] - + [% ELSE %] [% END %] -[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %] +[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - + [% END %] [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] - + + + + - + +[% END %] +[% IF persona %] + + [% END %] - + - + + + + [% END %] [% ELSE %] - + [% INCLUDE 'datatables.inc' %] + [% END %] [% IF ( Babeltheque ) %] @@ -1371,16 +1372,16 @@ [% BLOCK jsinclude %] [% INCLUDE 'datatables.inc' %] [% IF ( SocialNetworks ) %] - - + [% END %] -[% IF ( OpacStarRatings != 'disable' ) %][% END %] +[% IF ( OpacStarRatings != 'disable' ) %][% END %] -[% IF ( OpacHighlightedWords ) %][% END %] +[% IF ( OpacHighlightedWords ) %][% END %] + - + + + [% END %] [% END %] -[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% END %] -[% IF ( OverDriveEnabled ) %][% END %] - -[% IF ( OpacHighlightedWords ) %] +[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% END %] +[% IF ( OverDriveEnabled ) %][% END %] + +[% IF ( OpacHighlightedWords ) %] [% END %] + + + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'masthead-sco.inc' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt index 025bf53..af8a4e3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt @@ -1,9 +1,10 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout › Print Receipt for [% borrowernumber %] - + [% IF stylesheet %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index f7fae7b..d4e9f40 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE KohaDates %] [% USE AudioAlerts %] [% INCLUDE 'doc-head-open.inc' %] @@ -6,9 +7,9 @@ - - - + + + [% IF ( OPACUserCSS ) %][% END %] [% IF ( SCOUserCSS ) %][% END %]