From 45eefe42022323403e35067c3bc9b5b462e4c889 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 15 Aug 2016 16:02:26 +0000 Subject: [PATCH] Bug 12904 - Update template css and js file references --- .../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 | 35 +++++++++--------- .../intranet-tmpl/prog/en/includes/greybox.inc | 8 +++-- .../intranet-tmpl/prog/en/includes/help-top.inc | 20 ++++++----- .../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 | 4 ++- .../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 | 6 ++-- .../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/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/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/detail.tt | 11 +++--- .../prog/en/modules/catalogue/itemsearch.tt | 10 +++--- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 6 ++-- .../prog/en/modules/catalogue/moredetail.tt | 5 +-- .../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 | 12 ++++--- .../prog/en/modules/cataloguing/merge.tt | 4 ++- .../cataloguing/value_builder/cn_browser.tt | 4 ++- .../en/modules/cataloguing/z3950_auth_search.tt | 6 ++-- .../prog/en/modules/cataloguing/z3950_search.tt | 6 ++-- .../prog/en/modules/circ/circulation.tt | 13 +++---- .../en/modules/circ/circulation_batch_checkouts.tt | 4 ++- .../intranet-tmpl/prog/en/modules/circ/offline.tt | 8 +++-- .../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 | 4 ++- .../prog/en/modules/circ/view_holdsqueue.tt | 4 ++- .../prog/en/modules/circ/waitingreserves.tt | 4 ++- .../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 | 3 +- .../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 | 3 +- .../prog/en/modules/members/moremember-print.tt | 4 ++- .../prog/en/modules/members/moremember-receipt.tt | 3 +- .../prog/en/modules/members/moremember.tt | 16 +++++---- .../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/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 ++-- .../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 | 6 ++-- .../modules/tools/marc_modification_templates.tt | 4 ++- .../prog/en/modules/tools/modborrowers.tt | 4 ++- .../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 | 25 +++++++------ .../opac-tmpl/bootstrap/en/includes/greybox.inc | 10 +++--- .../bootstrap/en/includes/opac-bottom.inc | 41 +++++++++++----------- .../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 | 3 +- .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 10 +++--- .../bootstrap/en/modules/sco/printslip.tt | 4 ++- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 9 ++--- 165 files changed, 666 insertions(+), 384 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index b065a35..c4efc26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE ColumnsSettings %] - - + + + + - + 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..2a6053d 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 f72425d..21c305c 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 AudioAlerts %] [% USE String %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [%# Prevent XFS attacks -%] @@ -18,29 +19,29 @@ - - - - + + + + [% INCLUDE intranetstylesheet.inc %] -[% IF ( bidi ) %][% END %] +[% IF ( bidi ) %][% END %] - - - - - - - - + + + + + + + + [% IF ( login ) %] - + [% END %] [% IF ( IntranetUserCSS ) %][% END %] - + [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] @@ -71,11 +72,11 @@ //]]> - + [% END %] [% IF LocalCoverImages %] - + - - - + + + 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..2b1593f 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/intranetstylesheet.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc index 54ead22..5a0a474 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %] [% IF (intranetstylesheet.match('^https?:|^\/')) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc index 89230df..4c79c54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc @@ -1,5 +1,7 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% #Enable tinymce for system preferences %] - + + + - + + + - - - - + + + + + [% IF ( grouping ) %] - - - - + + + + - + + + + [% END %] - + - + [% IF op == 'add_form' %] [% ELSIF op == 'list' %] - + [% INCLUDE 'datatables.inc' %] - - + + + - + + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt index 94b0753..dd2d8f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -1,9 +1,11 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Library checkin and transfer policy [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.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 25a6564..b52fb37 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 9a8f431..ae0cd42 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 1f0a5d8..2f93be7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -1,3 +1,5 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF ( add_form ) %]MARC frameworks › [% action %] [% searchfield %][% END %] @@ -5,9 +7,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/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt index b035d00..ca3c4bb 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 295c325..659d16b 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 1c61305..1b2142f 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 992bd0a..cf1aff8 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/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 0e4773d..08480a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE KohaDates %] [% USE AuthorisedValues %] [% USE Branches %] @@ -27,7 +28,7 @@ [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %] - + [% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'browser-strings.inc' %] - + - - + + + + + + + - + + [% INCLUDE 'browser-strings.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 8c642b5..7e58094 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 %][% END %] (Record #[% biblionumber %]) › Items - + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - + [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'browser-strings.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 f94affa..8ffaed5 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 2805661..a85eba0 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 b251d9b..267a340 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -1,7 +1,8 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% INCLUDE 'doc-head-open.inc' %] Koha staff client - + [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.inc' %] + - + + + - + [% INCLUDE 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index f087760..1847da7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -1,12 +1,14 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE Branches %] [% USE KohaDates %] +[% SET KOHA_VERSION = Koha.Preference(Version) %] [% INCLUDE 'doc-head-open.inc' %] Summary for [% firstname %] [% surname %] ([% cardnumber %]) [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'slip-print.inc' #printThenClose %] 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 071b750..0e270de 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 65bdb7a..53f9984 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -1,7 +1,9 @@ [% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% USE KohaDates %] [% USE AuthorisedValues %] [% USE ColumnsSettings %] +[% SET KOHA_VERSION = Koha.Preference(Version) %] [% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %] [% SET exports_enabled = 1 %] [% END %] @@ -15,17 +17,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 919c8fe..6c1df4c 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 'header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt index 6f6f58a..7d71f8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt @@ -1,10 +1,12 @@ +[% USE Koha %] +[% SET KOHA_VERSION = Koha.Preference('Version') %] [% PROCESS 'authorities-search-results.inc' %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › Batch record deletion [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'datatables.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 54227e6..4a691c8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -1,9 +1,11 @@ +[% USE Koha %] [% USE KohaDates %] +[% 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 %] @@ -46,12 +49,12 @@ [% END %] [% PROCESS cssinclude %] - + - - + + 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 9d9af2c..fd109f2 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 # / IF persona %] - + - + + + + [% END %] [% ELSE %] - + [% INCLUDE 'datatables.inc' %] + [% END %] [% IF ( Babeltheque ) %] @@ -1329,16 +1330,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' %]