Bugzilla – Attachment 73836 Details for
Bug 20538
Remove the need of writing [% KOHA_VERSION %] everywhere
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere
Bug-20538-Remove-the-need-of-writing--KOHAVERSION-.patch (text/plain), 296.99 KB, created by
Julian Maurice
on 2018-04-08 10:52:20 UTC
(
hide
)
Description:
Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2018-04-08 10:52:20 UTC
Size:
296.99 KB
patch
obsolete
>From 1ba2b29c98b625e1463232dfad9ba33f0e46c76f Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Fri, 6 Apr 2018 17:02:55 +0200 >Subject: [PATCH] Bug 20538: Remove the need of writing [% KOHA_VERSION %] > everywhere > >Having to write [% KOHA_VERSION %] for each url is bad because: >- It's easily forgettable when adding new <script> or <link> >- It prevents grep'ing for the full filename >- It violates the DRY principle >- If at some point we want to change the "force js and css reload" > mechanism, it will be tedious > >This patch: >- adds a Template::Toolkit plugin that generates <script> and > <link> tags for JS and CSS files, and inserts automatically the Koha > version in the filename >- use the new plugin to remove all occurences of [% KOHA_VERSION %] >- remove the code that was adding KOHA_VERSION as a template variable > >Test plan: >1. Apply patch >2. Go to several different pages in Koha (opac and intranet) while > checking your browser's dev tools (there should be no 404 for JS and > CSS files, and the Koha version should appear in filenames) and the > server logs (there should be no "File not found") >3. `git grep KOHA_VERSION` should return nothing >4. prove t/db_dependent/Koha/Template/Plugin/Asset.t >--- > C4/Templates.pm | 3 - > Koha/Template/Plugin/Asset.pm | 110 +++++++++++++++++++++ > .../intranet-tmpl/prog/en/includes/datatables.inc | 11 ++- > .../prog/en/includes/doc-head-close-receipt.inc | 3 +- > .../prog/en/includes/doc-head-close.inc | 15 +-- > .../intranet-tmpl/prog/en/includes/greybox.inc | 9 +- > .../intranet-tmpl/prog/en/includes/help-top.inc | 19 ++-- > .../prog/en/includes/intranetstylesheet.inc | 5 +- > .../intranet-tmpl/prog/en/includes/js_includes.inc | 25 ++--- > .../intranet-tmpl/prog/en/includes/select2.inc | 5 +- > .../prog/en/includes/wysiwyg-systempreferences.inc | 3 +- > .../prog/en/modules/acqui/acqui-home.tt | 9 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 9 +- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 7 +- > .../prog/en/modules/acqui/basketgroup.tt | 21 ++-- > .../prog/en/modules/acqui/basketheader.tt | 5 +- > .../prog/en/modules/acqui/booksellers.tt | 5 +- > .../prog/en/modules/acqui/edifactmsgs.tt | 5 +- > .../prog/en/modules/acqui/histsearch.tt | 7 +- > .../prog/en/modules/acqui/invoice-files.tt | 5 +- > .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 5 +- > .../prog/en/modules/acqui/invoices.tt | 5 +- > .../prog/en/modules/acqui/lateorders.tt | 7 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 5 +- > .../prog/en/modules/acqui/neworderempty.tt | 11 ++- > .../prog/en/modules/acqui/newordersubscription.tt | 5 +- > .../prog/en/modules/acqui/newordersuggestion.tt | 5 +- > .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 5 +- > .../prog/en/modules/acqui/orderreceive.tt | 9 +- > .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 9 +- > .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 5 +- > .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 5 +- > .../prog/en/modules/acqui/supplier.tt | 5 +- > .../prog/en/modules/acqui/uncertainprice.tt | 7 +- > .../prog/en/modules/acqui/z3950_search.tt | 9 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 9 +- > .../prog/en/modules/admin/aqbudgets.tt | 11 ++- > .../prog/en/modules/admin/aqcontract.tt | 3 +- > .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 5 +- > .../prog/en/modules/admin/audio_alerts.tt | 5 +- > .../en/modules/admin/auth_subfields_structure.tt | 3 +- > .../prog/en/modules/admin/auth_tag_structure.tt | 5 +- > .../prog/en/modules/admin/authorised_values.tt | 5 +- > .../prog/en/modules/admin/authtypes.tt | 5 +- > .../prog/en/modules/admin/biblio_framework.tt | 7 +- > .../en/modules/admin/branch_transfer_limits.tt | 7 +- > .../prog/en/modules/admin/branches.tt | 7 +- > .../prog/en/modules/admin/categories.tt | 9 +- > .../prog/en/modules/admin/checkmarc.tt | 3 +- > .../intranet-tmpl/prog/en/modules/admin/cities.tt | 5 +- > .../prog/en/modules/admin/classsources.tt | 3 +- > .../prog/en/modules/admin/clone-rules.tt | 3 +- > .../prog/en/modules/admin/columns_settings.tt | 3 +- > .../prog/en/modules/admin/currency.tt | 5 +- > .../prog/en/modules/admin/didyoumean.tt | 3 +- > .../prog/en/modules/admin/edi_accounts.tt | 3 +- > .../prog/en/modules/admin/edi_ean_accounts.tt | 3 +- > .../prog/en/modules/admin/fieldmapping.tt | 3 +- > .../en/modules/admin/item_circulation_alerts.tt | 3 +- > .../prog/en/modules/admin/items_search_field.tt | 3 +- > .../prog/en/modules/admin/items_search_fields.tt | 5 +- > .../prog/en/modules/admin/itemtypes.tt | 5 +- > .../prog/en/modules/admin/koha2marclinks.tt | 5 +- > .../prog/en/modules/admin/library_groups.tt | 5 +- > .../prog/en/modules/admin/localization.tt | 3 +- > .../en/modules/admin/marc_subfields_structure.tt | 5 +- > .../prog/en/modules/admin/marctagstructure.tt | 7 +- > .../prog/en/modules/admin/matching-rules.tt | 3 +- > .../prog/en/modules/admin/oai_set_mappings.tt | 3 +- > .../prog/en/modules/admin/oai_sets.tt | 3 +- > .../prog/en/modules/admin/patron-attr-types.tt | 3 +- > .../prog/en/modules/admin/preferences.tt | 13 +-- > .../prog/en/modules/admin/printers.tt | 3 +- > .../admin/searchengine/elasticsearch/mappings.tt | 3 +- > .../prog/en/modules/admin/smart-rules.tt | 3 +- > .../prog/en/modules/admin/sms_providers.tt | 5 +- > .../prog/en/modules/admin/sru_modmapping.tt | 3 +- > .../prog/en/modules/admin/systempreferences.tt | 3 +- > .../prog/en/modules/admin/transport-cost-matrix.tt | 3 +- > .../prog/en/modules/admin/usage_statistics.tt | 5 +- > .../prog/en/modules/admin/z3950servers.tt | 5 +- > .../prog/en/modules/authorities/auth_finder.tt | 3 +- > .../prog/en/modules/authorities/authorities.tt | 9 +- > .../prog/en/modules/authorities/detail.tt | 3 +- > .../prog/en/modules/authorities/merge.tt | 3 +- > .../modules/authorities/searchresultlist-auth.tt | 3 +- > .../intranet-tmpl/prog/en/modules/basket/basket.tt | 7 +- > .../prog/en/modules/catalogue/ISBDdetail.tt | 5 +- > .../prog/en/modules/catalogue/MARCdetail.tt | 5 +- > .../prog/en/modules/catalogue/advsearch.tt | 3 +- > .../prog/en/modules/catalogue/detail.tt | 13 +-- > .../prog/en/modules/catalogue/imageviewer.tt | 3 +- > .../prog/en/modules/catalogue/issuehistory.tt | 3 +- > .../prog/en/modules/catalogue/itemsearch.tt | 9 +- > .../prog/en/modules/catalogue/labeledMARCdetail.tt | 5 +- > .../prog/en/modules/catalogue/moredetail.tt | 5 +- > .../prog/en/modules/catalogue/results.tt | 7 +- > .../prog/en/modules/catalogue/search-history.tt | 5 +- > .../prog/en/modules/cataloguing/addbiblio.tt | 11 ++- > .../prog/en/modules/cataloguing/additem.tt | 11 ++- > .../prog/en/modules/cataloguing/editor.tt | 11 ++- > .../prog/en/modules/cataloguing/merge.tt | 3 +- > .../cataloguing/value_builder/cn_browser.tt | 3 +- > .../cataloguing/value_builder/marc21_field_006.tt | 3 +- > .../cataloguing/value_builder/marc21_field_008.tt | 3 +- > .../en/modules/cataloguing/z3950_auth_search.tt | 7 +- > .../prog/en/modules/cataloguing/z3950_search.tt | 7 +- > .../prog/en/modules/circ/circulation.tt | 19 ++-- > .../en/modules/circ/circulation_batch_checkouts.tt | 3 +- > .../intranet-tmpl/prog/en/modules/circ/offline.tt | 7 +- > .../prog/en/modules/circ/on-site_checkouts.tt | 3 +- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 3 +- > .../prog/en/modules/circ/pendingreserves.tt | 3 +- > .../prog/en/modules/circ/printslip.tt | 3 +- > .../prog/en/modules/circ/request-article.tt | 3 +- > .../prog/en/modules/circ/reserveratios.tt | 3 +- > .../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/clubs/club-enrollments.tt | 5 +- > .../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 5 +- > .../prog/en/modules/common/patron_search.tt | 3 +- > .../en/modules/course_reserves/course-details.tt | 3 +- > .../en/modules/course_reserves/course-reserves.tt | 3 +- > .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 5 +- > .../prog/en/modules/ill/ill-requests.tt | 5 +- > .../intranet-tmpl/prog/en/modules/intranet-main.tt | 3 +- > .../prog/en/modules/labels/label-edit-batch.tt | 3 +- > .../prog/en/modules/labels/label-home.tt | 3 +- > .../prog/en/modules/labels/label-manage.tt | 3 +- > .../intranet-tmpl/prog/en/modules/labels/result.tt | 3 +- > .../prog/en/modules/labels/spinelabel-print.tt | 7 +- > .../prog/en/modules/members/boraccount.tt | 5 +- > .../prog/en/modules/members/deletemem.tt | 3 +- > .../prog/en/modules/members/discharge.tt | 3 +- > .../prog/en/modules/members/discharges.tt | 3 +- > .../intranet-tmpl/prog/en/modules/members/files.tt | 3 +- > .../prog/en/modules/members/holdshistory.tt | 5 +- > .../prog/en/modules/members/housebound.tt | 3 +- > .../prog/en/modules/members/mancredit.tt | 3 +- > .../prog/en/modules/members/maninvoice.tt | 3 +- > .../prog/en/modules/members/member-flags.tt | 7 +- > .../prog/en/modules/members/member-password.tt | 3 +- > .../prog/en/modules/members/member.tt | 5 +- > .../prog/en/modules/members/memberentrygen.tt | 9 +- > .../prog/en/modules/members/members-update.tt | 3 +- > .../prog/en/modules/members/moremember-receipt.tt | 3 +- > .../prog/en/modules/members/moremember.tt | 19 ++-- > .../prog/en/modules/members/nl-search.tt | 3 +- > .../prog/en/modules/members/notices.tt | 5 +- > .../intranet-tmpl/prog/en/modules/members/pay.tt | 5 +- > .../prog/en/modules/members/paycollect.tt | 3 +- > .../prog/en/modules/members/printfeercpt.tt | 3 +- > .../prog/en/modules/members/printinvoice.tt | 3 +- > .../en/modules/members/purchase-suggestions.tt | 5 +- > .../prog/en/modules/members/readingrec.tt | 5 +- > .../prog/en/modules/members/routing-lists.tt | 3 +- > .../prog/en/modules/members/statistics.tt | 5 +- > .../prog/en/modules/members/update-child.tt | 5 +- > .../prog/en/modules/offline_circ/list.tt | 3 +- > .../prog/en/modules/offline_circ/process_koc.tt | 5 +- > .../prog/en/modules/patron_lists/add-modify.tt | 3 +- > .../prog/en/modules/patron_lists/list.tt | 7 +- > .../prog/en/modules/patron_lists/lists.tt | 5 +- > .../prog/en/modules/patroncards/edit-batch.tt | 3 +- > .../prog/en/modules/patroncards/edit-template.tt | 3 +- > .../prog/en/modules/patroncards/print.tt | 5 +- > .../prog/en/modules/plugins/plugins-home.tt | 3 +- > .../prog/en/modules/reports/cash_register_stats.tt | 3 +- > .../en/modules/reports/guided_reports_start.tt | 3 +- > .../prog/en/modules/reports/itemslost.tt | 9 +- > .../prog/en/modules/reports/itemtypes.tt | 3 +- > .../prog/en/modules/reports/orders_by_budget.tt | 3 +- > .../prog/en/modules/reports/serials_stats.tt | 3 +- > .../prog/en/modules/reserve/request.tt | 5 +- > .../prog/en/modules/reviews/reviewswaiting.tt | 3 +- > .../en/modules/rotating_collections/addItems.tt | 5 +- > .../rotating_collections/editCollections.tt | 5 +- > .../rotating_collections/rotatingCollections.tt | 7 +- > .../rotating_collections/transferCollection.tt | 5 +- > .../prog/en/modules/serials/add_fields.tt | 3 +- > .../prog/en/modules/serials/claims.tt | 3 +- > .../prog/en/modules/serials/serials-collection.tt | 7 +- > .../prog/en/modules/serials/serials-edit.tt | 5 +- > .../prog/en/modules/serials/serials-home.tt | 3 +- > .../prog/en/modules/serials/serials-search.tt | 5 +- > .../prog/en/modules/serials/subscription-add.tt | 5 +- > .../prog/en/modules/serials/subscription-detail.tt | 3 +- > .../modules/serials/subscription-numberpatterns.tt | 5 +- > .../prog/en/modules/suggestion/suggestion.tt | 9 +- > .../intranet-tmpl/prog/en/modules/tags/list.tt | 3 +- > .../intranet-tmpl/prog/en/modules/tags/review.tt | 7 +- > .../tools/automatic_item_modification_by_age.tt | 7 +- > .../prog/en/modules/tools/batchMod-del.tt | 9 +- > .../prog/en/modules/tools/batchMod-edit.tt | 13 +-- > .../prog/en/modules/tools/batchMod.tt | 3 +- > .../prog/en/modules/tools/batch_delete_records.tt | 7 +- > .../en/modules/tools/batch_record_modification.tt | 9 +- > .../prog/en/modules/tools/cleanborrowers.tt | 3 +- > .../prog/en/modules/tools/csv-profiles.tt | 3 +- > .../intranet-tmpl/prog/en/modules/tools/export.tt | 3 +- > .../prog/en/modules/tools/holidays.tt | 5 +- > .../prog/en/modules/tools/import_borrowers.tt | 5 +- > .../prog/en/modules/tools/inventory.tt | 7 +- > .../prog/en/modules/tools/koha-news.tt | 7 +- > .../intranet-tmpl/prog/en/modules/tools/letter.tt | 9 +- > .../prog/en/modules/tools/manage-marc-import.tt | 7 +- > .../modules/tools/marc_modification_templates.tt | 5 +- > .../prog/en/modules/tools/modborrowers.tt | 5 +- > .../prog/en/modules/tools/overduerules.tt | 3 +- > .../prog/en/modules/tools/picture-upload.tt | 5 +- > .../prog/en/modules/tools/quotes-upload.tt | 11 ++- > .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 11 ++- > .../prog/en/modules/tools/scheduler.tt | 3 +- > .../prog/en/modules/tools/showdiffmarc.tt | 5 +- > .../prog/en/modules/tools/stage-marc-import.tt | 7 +- > .../prog/en/modules/tools/upload-images.tt | 7 +- > .../intranet-tmpl/prog/en/modules/tools/upload.tt | 7 +- > .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +- > .../prog/en/modules/virtualshelves/shelves.tt | 9 +- > .../opac-tmpl/bootstrap/en/includes/datatables.inc | 5 +- > .../bootstrap/en/includes/doc-head-close.inc | 21 ++-- > .../opac-tmpl/bootstrap/en/includes/greybox.inc | 9 +- > .../bootstrap/en/includes/opac-bottom.inc | 45 ++++----- > .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 3 +- > .../bootstrap/en/modules/opac-advsearch.tt | 5 +- > .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 3 +- > .../bootstrap/en/modules/opac-auth-detail.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 | 11 ++- > .../bootstrap/en/modules/opac-memberentry.tt | 3 +- > .../bootstrap/en/modules/opac-overdrive-search.tt | 7 +- > .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 3 +- > .../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/opac-user.tt | 3 +- > .../opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 11 ++- > .../opac-tmpl/bootstrap/en/modules/sco/help.tt | 9 +- > .../bootstrap/en/modules/sco/printslip.tt | 7 +- > .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 9 +- > t/db_dependent/Koha/Template/Plugin/Asset.t | 99 +++++++++++++++++++ > 246 files changed, 1020 insertions(+), 571 deletions(-) > create mode 100644 Koha/Template/Plugin/Asset.pm > create mode 100644 t/db_dependent/Koha/Template/Plugin/Asset.t > >diff --git a/C4/Templates.pm b/C4/Templates.pm >index d1b7a57543..343a374199 100644 >--- a/C4/Templates.pm >+++ b/C4/Templates.pm >@@ -242,9 +242,6 @@ sub gettemplate { > languages_loop => $languages_loop, > one_language_enabled => $one_language_enabled, > ) unless $one_language_enabled; >- $template->param( >- KOHA_VERSION => C4::Context->preference('Version') >- ); > > return $template; > } >diff --git a/Koha/Template/Plugin/Asset.pm b/Koha/Template/Plugin/Asset.pm >new file mode 100644 >index 0000000000..caf1786c5d >--- /dev/null >+++ b/Koha/Template/Plugin/Asset.pm >@@ -0,0 +1,110 @@ >+package Koha::Template::Plugin::Asset; >+ >+# Copyright Marc Véron / marc veron ag, Switzerland >+ >+# This file is part of Koha. >+# >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. >+# >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. >+# >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. >+ >+use Modern::Perl; >+ >+use Template::Plugin; >+use base qw( Template::Plugin ); >+ >+use File::Basename; >+use File::Spec; >+use C4::Context; >+ >+sub new { >+ my ($class, $context) = @_; >+ >+ my $self = { >+ _CONTEXT => $context, >+ }; >+ >+ return bless $self, $class; >+} >+ >+sub js { >+ my ( $self, $filename, $attributes ) = @_; >+ >+ my $url = $self->url($filename); >+ unless ($url) { >+ warn "File not found : $filename"; >+ return; >+ } >+ >+ $attributes->{src} = $url; >+ >+ return $self->tag('script', $attributes) . '</script>'; >+} >+ >+sub css { >+ my ( $self, $filename, $attributes ) = @_; >+ >+ my $url = $self->url($filename); >+ unless ($url) { >+ warn "File not found : $filename"; >+ return; >+ } >+ >+ $attributes->{rel} = 'stylesheet'; >+ $attributes->{type} = 'text/css'; >+ $attributes->{href} = $url; >+ >+ return $self->tag('link', $attributes); >+} >+ >+sub url { >+ my ( $self, $filename ) = @_; >+ >+ my $stash = $self->{_CONTEXT}->stash(); >+ my $interface = $stash->get('interface'); >+ my $theme = $stash->get('theme'); >+ >+ my $configkey = $interface =~ /opac/ ? 'opachtdocs' : 'intrahtdocs'; >+ my $root = C4::Context->config($configkey); >+ >+ my ($basename, $dirname, $suffix) = fileparse($filename, qr/\.[^.]*/); >+ >+ my $type = substr $suffix, 1; >+ my @dirs = ( >+ "$theme", >+ ".", >+ ); >+ >+ my $version = C4::Context->preference('Version'); >+ foreach my $dir (@dirs) { >+ my $abspath = File::Spec->catfile($root, $dir, $filename); >+ if (-e $abspath) { >+ return File::Spec->catfile($interface, $dir, $dirname, "${basename}_${version}${suffix}"); >+ } >+ } >+} >+ >+sub tag { >+ my ($self, $name, $attributes) = @_; >+ >+ my @attributes_strs; >+ if ($attributes) { >+ while (my ($key, $value) = each %$attributes) { >+ push @attributes_strs, qq{$key="$value"}; >+ } >+ } >+ my $attributes_str = join ' ', @attributes_strs; >+ >+ return "<$name $attributes_str>"; >+} >+ >+1; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >index d27059c45f..3a79dacb5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% INCLUDE 'format_price.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/buttons.dataTables.min_[% KOHA_VERSION %].css" /> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.buttons.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/buttons.colVis.min_[% KOHA_VERSION %].js"></script> >+[% Asset.css("css/buttons.dataTables.min.css") %] >+[% Asset.js("lib/jquery/plugins/jquery.dataTables.min.js") %] >+[% Asset.js("lib/jquery/plugins/dataTables.buttons.min.js") %] >+[% Asset.js("lib/jquery/plugins/buttons.colVis.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > var MSG_DT_FIRST = _("First"); >@@ -22,4 +23,4 @@ > var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/datatables.js") %] >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 7dc56b3286..a380870023 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,5 @@ >+[% USE Asset %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/print.css", { media = "print" }) %] > >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 319bcda340..a0722f203f 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,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE String %] > [% PROCESS 'html_helpers.inc' %] >@@ -10,16 +11,16 @@ > > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> > >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap-theme.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") %] >+[% Asset.css("lib/bootstrap/bootstrap.min.css") %] >+[% Asset.css("lib/bootstrap/bootstrap-theme.min.css") %] >+[% Asset.css("lib/font-awesome/css/font-awesome.min.css") %] >+[% Asset.css("css/print.css", { media = "print" }) %] > [% INCLUDE intranetstylesheet.inc %] >-[% IF ( bidi ) %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" />[% END %] >+[% IF ( bidi ) %][% Asset.css("css/right-to-left.css") %][% END %] > > [% IF ( login ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/login_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/login.css") %] > [% END %] > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >index 620c254dd0..84918c2dc1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc >@@ -1,7 +1,8 @@ >+[% USE Asset %] > <script type="text/javascript"> > var GB_ROOT_DIR = "[% interface %]/lib/greybox/"; > </script> >-<script type="text/javascript" src="[% interface %]/lib/greybox/AJS_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/greybox/AJS_fx_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/greybox/gb_scripts_[% KOHA_VERSION %].js"></script> >-<link href="[% interface %]/lib/greybox/gb_styles_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >+[% Asset.js("lib/greybox/AJS.js") %] >+[% Asset.js("lib/greybox/AJS_fx.js") %] >+[% Asset.js("lib/greybox/gb_scripts.js") %] >+[% Asset.css("lib/greybox/gb_styles.css") %] >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 4c2f955abe..99946e26de 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,21 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Online help</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") %] >+[% Asset.css("css/print.css", { media = "print" }) %] > [% INCLUDE intranetstylesheet.inc %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/jquery-2.2.3.min.js") %] >+[% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %] >+[% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") %] >+[% Asset.js("lib/shortcut/shortcut.js") %] > <!-- koha core js --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/staff-global.js") %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/help.css") %] > </head> > <body id="help" class="help"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >index ce3c1c4cfb..884aaea881 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc >@@ -1,8 +1,9 @@ >-[% SET intranetstylesheet='staff-global_' _ KOHA_VERSION _ '.css' UNLESS intranetstylesheet %] >+[% USE Asset %] >+[% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %] > [% IF (intranetstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% intranetstylesheet %]" /> >+ [% Asset.css("css/" _ intranetstylesheet) %] > [% END %] > > <!-- local colors --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc >index 4ac51f9803..de81f3f146 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AudioAlerts %] > [%# Prevent XFS attacks -%] > [% UNLESS popup %] >@@ -11,17 +12,17 @@ > </script> > [% END %] > >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/jquery-2.2.3.min.js") %] >+[% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %] >+[% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") %] >+[% Asset.js("lib/shortcut/shortcut.js") %] >+[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] >+[% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %] >+[% Asset.js("lib/bootstrap/bootstrap.min.js") %] >+[% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %] > <!-- koha core js --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/commons_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/staff-global.js") %] >+[% Asset.js("js/commons.js") %] > > [% INCLUDE 'validator-strings.inc' %] > [% IF ( IntranetUserJS ) %] >@@ -52,11 +53,11 @@ > //]]> > </script> > >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/basket.js") %] > [% END %] > > [% IF LocalCoverImages %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/localcovers.js") %] > <script type="text/javascript"> > //<![CDATA[ > var NO_LOCAL_JACKET = _("No cover image available"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc >index 7f395fb60e..8817860e9a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc >@@ -1,6 +1,7 @@ >+[% USE Asset %] > <script src="[% interface %]/lib/select2/js/select2.min.js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/select2/css/select2.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/select2_[% KOHA_VERSION %].css" /> >+[% Asset.css("lib/select2/css/select2.min.css") %] >+[% Asset.css("css/select2.css") %] > <script> > jQuery.extend($.fn.select2.defaults, { > allowClear: true, >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 d96a2799b3..b2d3fe5ecd 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,6 @@ >+[% USE Asset %] > [% #Enable tinymce for system preferences %] >-<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/tiny_mce/tiny_mce.js") %] > <script> > > [%# Save TinyMCE content and trigger an event on the original element %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index b6fc28e528..5864a2f655 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -1,11 +1,12 @@ >+[% USE Asset %] > [% USE Price %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >-<link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >+[% Asset.css("css/datatables.css") %] >+[% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") %] > </head> > > <body id="acq_acqui-home" class="acq"> >@@ -169,8 +170,8 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] >+ [% Asset.js("js/acquisitions-menu.js") %] > <script type="text/javascript"> > dt_overwrite_html_sorting_localeCompare(); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index d679a5bd47..26574f0439 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -9,7 +10,7 @@ > › Batch list > [% END %] > </title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > [% INCLUDE 'doc-head-close.inc' %] > </head> >@@ -425,10 +426,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("js/acq.js") %] > <script type="text/JavaScript"> > $(document).ready(function() { > $("#files").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 19030de3b4..e9a94f8701 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% BLOCK csv_export %] > <div class="btn-group"> > <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]"><i class="fa fa-download"></i> Export as CSV</a> >@@ -19,7 +20,7 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% booksellername|html %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > .sortmsg {font-size: 80%;} >@@ -685,9 +686,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] > <script type="text/javascript"> > function updateColumnsVisibility(visible) { > if ( visible ) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index df6f723623..d872672ad0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -1,19 +1,20 @@ >+[% USE Asset %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Basket grouping for [% booksellername |html %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/menu/menu-min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/basketgroup_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/yui/utilities/utilities.js") %] >+[% Asset.js("lib/yui/button/button-min.js") %] >+[% Asset.js("lib/yui/container/container_core-min.js") %] >+[% Asset.js("lib/yui/menu/menu-min.js") %] >+[% Asset.js("js/basketgroup.js") %] > [% IF ( grouping ) %] >-<script type="text/javascript" src="[% interface %]/lib/yui/yahoo-dom-event/yahoo-dom-event_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/animation/animation-min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/dragdrop/dragdrop-min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/lib/yui/element/element-min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/yui/yahoo-dom-event/yahoo-dom-event.js") %] >+[% Asset.js("lib/yui/animation/animation-min.js") %] >+[% Asset.js("lib/yui/dragdrop/dragdrop-min.js") %] >+[% Asset.js("lib/yui/element/element-min.js") %] > <style type="text/css"> > /*margin and padding on body element > can introduce errors in determining >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index 2aeeb4a1ea..240226eeb3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% USE Koha %] > [% SET footerjs = 1 %] >@@ -140,8 +141,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] >+ [% Asset.js("js/acq.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index 183b806f89..f8c092df10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -8,7 +9,7 @@ > vertical-align: top; > } > </style> >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="acq_booksellers" class="acq"> >@@ -186,7 +187,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index fccd57fe68..67e47313f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › EDIFACT messages</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > #EDI_modal { width : 80%; } @media (max-width: 767px) { #EDI_modal { margin: 0; width : auto; } } >@@ -110,7 +111,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index 94ccbf3105..99fcc9688b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( order_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -207,11 +208,11 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/autocomplete/patrons_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/autocomplete/patrons.js") %] > <script type="text/javascript"> > var MSG_REMOVE_PATRON = _("Remove"); > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index 1e6ca4b794..350b3a19b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoice › Files</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -85,7 +86,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >index 33838e50a9..38a886f0c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoice</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -210,7 +211,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index b7264b981d..2b5e550797 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Invoices</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > > </head> >@@ -294,7 +295,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 4c142a15cf..6362597dce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE ColumnsSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Late orders</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -191,10 +192,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > var late_orderst; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 5d9a0ac331..877e41a417 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -1,7 +1,8 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Search existing records</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -107,7 +108,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index f9b4a15dcb..07c7bc19a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >@@ -489,12 +490,12 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] >+ [% Asset.js("js/acq.js") %] > [% INCLUDE 'additem.js.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/additem_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/additem.js") %] >+ [% Asset.js("js/cataloging.js") %] >+ [% Asset.js("js/prevent_submit.js") %] > <script type="text/javascript"> > actTotal = ""; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index 38491d8bbf..fd225b9c15 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials [% biblionumber %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -96,7 +97,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > function updateRowsVisibility(show_only_renewed) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index a8f9c41a24..9b5fd90f86 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -1,7 +1,8 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Add order from a suggestion</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -74,7 +75,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index e7c3040350..802ae058a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Ordered</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -96,7 +97,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 8ec42ad3a5..abd35a62db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Price %] >@@ -262,12 +263,12 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'additem.js.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/additem_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/additem.js") %] >+ [% Asset.js("js/cataloging.js") %] >+ [% Asset.js("js/prevent_submit.js") %] > <script type="text/javascript"> > function Check(form) { > [% IF (AcqCreateItemReceiving) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 863dbd2eb3..96c2f51ee3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( date ) %] > Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -422,10 +423,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] > <style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style> > <script type="text/javascript"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index cf90e34085..ee0ecd04fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Receive shipment from vendor [% name %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -201,7 +202,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index f608c41bd1..ec91e86d59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Spent</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -104,7 +105,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 4e01547e57..1d7b033a97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% BLOCK edit_contact %] > <ol id="contact-form"> >@@ -88,7 +89,7 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Vendor [% name %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -351,7 +352,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > function confirm_deletion() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index e92456f71d..0b24419928 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -138,7 +139,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >@@ -156,7 +157,7 @@ > }); > var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acq.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.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 d1e677d65d..81445f0a03 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,7 +1,8 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > .linktools { background-color:#FFF;border-top:1px solid #DDD; border-left: 1px solid #DDD; border-right: 1px solid #666; border-bottom:1px solid #666;display: none; white-space: nowrap;} >@@ -191,9 +192,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %] > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acquisitions-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > $(document).ready(function(){ > var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, { >@@ -223,7 +224,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > }); > </script> > [% INCLUDE 'z3950_search.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/z3950_search.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index afd893f1b5..ea68e0db1d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Price %] > [% SET footerjs = 1 %] >@@ -34,9 +35,9 @@ > > [% INCLUDE 'doc-head-open.inc' %] > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% IF close_form %] >- <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >+ [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") %] > [% END %] > > <title> >@@ -495,9 +496,9 @@ > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% IF close_form %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] > [% END %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acq.js") %] > <script type="text/javascript"> > // ################################################################################# > // Javascript >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index e64c9e962d..1e797823b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -1,11 +1,12 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >-<link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >+[% Asset.css("css/datatables.css") %] >+[% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -440,14 +441,14 @@ > </div> > </div> > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acq.js") %] > <script type="text/javascript"> > var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n"; > var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n"; > var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n"; > </script> > >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acq.js") %] > [% IF op == 'add_form' %] > <script type="text/javascript"> > //<![CDATA[ >@@ -606,7 +607,7 @@ > </script> > [% ELSIF op == 'list' %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] > > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index 8103bc1367..4b0ab5f55c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -176,7 +177,7 @@ > </div> > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acq.js") %] > <script type="text/javascript"> > //<![CDATA[ > // to check if the data are correctly entered. >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index af39e1e443..324e08946c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -269,8 +270,8 @@ > </div> > </div> > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("js/acq.js") %] > <script type="text/javascript"> > //<![CDATA[ > function Check(f) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >index c615159857..ecf62266ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -132,12 +133,12 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > var MSG_AUDIO_EMPTY_SOUND = _("Please select or enter a sound."); > var MSG_AUDIO_CONFIRM_DELETE = _("Are you sure you want to delete the selected audio alerts?"); > var MSG_AUDIO_CHECK_CHECKBOXES = _("Check the box next to the alert you want to delete.") > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/audio_alerts_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/audio_alerts.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index 3101ae790f..8e6e6d3acb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authority MARC subfield structure</title> >@@ -333,7 +334,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $('#subfieldtabs').tabs(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index 2ca2b14729..435210f511 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -7,7 +8,7 @@ > [% ELSE %]› [% action %][% END %][% END %][% IF ( delete_confirm ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Confirm deletion[% END %][% IF ( delete_confirmed ) %]› [% IF ( authtypecode ) %][% authtypecode %] Framework[% ELSE %]Default framework[% END %] › Data deleted[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_auth_tag_structure" class="admin"> >@@ -234,7 +235,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#table_authtagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 359caa5a28..a728a45e33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authorized values >@@ -9,7 +10,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > > <style type="text/css"> > fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; } >@@ -281,7 +282,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index 97bdfa216d..c75e410da8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Authority types >@@ -8,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_authtypes" class="admin"> >@@ -174,7 +175,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#authtypes").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index 56f979dee3..beeaa66f8d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › MARC frameworks >@@ -8,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_biblio_framework" class="admin"> >@@ -281,7 +282,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > /* Set some variable needed in biblio_framework.js */ > var MSG_IMPORT_ERROR = _("Error importing the framework"); >@@ -290,6 +291,6 @@ > var MSG_IMPORTING_TO_FRAMEWORK = _("Importing to framework: %s. Importing from file: %s."); > var template_path = "[% interface %]/[% theme %]"; > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/biblio_framework_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/biblio_framework.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.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 44eaee44d3..3dd10b8001 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,10 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Library checkin and transfer policy</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css">td { text-align: center; } .sorted { min-width: 50%; }</style> > </head> > >@@ -85,9 +86,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > $(document).ready(function(){ > $("#CheckAll").click(function(){ $("#transferlimit_tabs").checkCheckboxes(); return false; }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 99777c86ab..cbb07301f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Libraries >@@ -8,7 +9,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_branches" class="admin"> >@@ -242,9 +243,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/tiny_mce/tiny_mce.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#branchest").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >index 4ad11ea9f7..c71e6fb7e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] >@@ -7,7 +8,7 @@ > [% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode |html %] in use[% ELSE %]Confirm deletion of category '[% categorycode |html %]'[% END %][% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css">#enrolmentmessage.hint { display : none; }</style> > </head> > >@@ -491,14 +492,14 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] >+ [% Asset.js("js/messaging-preference-form.js") %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _."); > var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date."); > </script> >- <script type="text/javascript" src="[% themelang %]/js/categories_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/categories.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >index 4fecf601d4..db49419b1f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › MARC check >@@ -279,6 +280,6 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.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 f3e3d8823e..f7daa3ca2e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>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 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_cities" class="admin"> >@@ -174,7 +175,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >index 6211bfed67..c89bfdb486 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Classification sources >@@ -268,6 +269,6 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >index fee48e09ae..9adae50971 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -67,7 +68,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >index adac3ab3fd..cfc12772ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% SET panel_id = 0 %] > [% BLOCK pagelist %] >@@ -165,7 +166,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready( function() { > var accordion = $( "#modules" ).accordion({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >index 94d3480f5f..f9178a9939 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% USE HtmlTags %] >@@ -8,7 +9,7 @@ > [% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency %]'[% END %] > [% IF op == 'list' %]Currencies[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_currency" class="admin"> >@@ -225,7 +226,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >index b47e49701f..ecaad4f789 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% BLOCK pluginlist %] > <div class="pluginlist"> >@@ -68,7 +69,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $( ".pluginlist" ).sortable(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 814cde30f9..2dc1c0958c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › EDI accounts >@@ -325,6 +326,6 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >index 2feff31a01..70887362b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Library EANs >@@ -171,6 +172,6 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt >index 96913220dd..1f6b36df74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Keyword to MARC mapping</title> >@@ -74,7 +75,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $('#selectframework').find("input:submit").hide(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >index 0c26a0ff87..f47d5f9412 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -158,7 +159,7 @@ table.grid td.default { > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > var $branch = "[% branch %]"; > $(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >index ac5aa57455..c0ad079227 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -41,7 +42,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >index 3b0b18fd82..8db4c85beb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -109,11 +110,11 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > var MSG_ITEM_SEARCH_DELETE_CONFIRM = _("Are you sure you want to delete this field?"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/item_search_fields_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/item_search_fields.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.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 faead47407..526ea9c2d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Price %] >@@ -22,7 +23,7 @@ Data deleted > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > fieldset.rows div.toptabs li { clear:none;margin-right:.5em;padding-bottom:0;width:auto; } > fieldset.rows div.toptabs .ui-tabs-nav li.ui-tabs-active {background-color : #F4F8F9; } >@@ -395,7 +396,7 @@ Item types administration > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'greybox.inc' %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >index a402183375..a692ad2eea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Koha to MARC mapping</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_koha2marclinks" class="admin"> >@@ -68,7 +69,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > function AddFld(kohafield) { > var fieldstr = prompt( _("Adding a mapping for: %s.").format(kohafield) + "\n" + _("Please enter field tag and subfield code, separated by a comma. (For control fields: add '@' as subfield code.)\nThe change will be applied immediately.") ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >index eaa1aba8b4..b9b433ffe0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE KohaSpan %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Library groups</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> >+[% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") %] >+[% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >index eedd8a2221..fc62473f92 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Localization</title> > [% INCLUDE 'doc-head-close.inc' popup => 1 %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_localization" class="admin"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index da640d18e3..199bbe8eb4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration ›[% IF ( add_form ) %][% IF ( use_heading_flags_p ) %][% IF ( heading_edit_subfields_p ) %] MARC subfield structure › Edit MARC subfields constraints[% END %][% ELSE %] MARC subfield structure › [% action %][% END %][% END %] >@@ -318,7 +319,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_subfields_structure_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] >+ [% Asset.js("js/marc_subfields_structure.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.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 f4d8023da1..1a8b27f1c5 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,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -7,7 +8,7 @@ > [% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %] > [% IF ( else ) %]MARC frameworks[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_marctagstructure" class="admin"> >@@ -242,8 +243,8 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#table_marctagstructure").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >index a084e9d5b8..fce8032083 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Record matching rules >@@ -579,7 +580,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > var maxMatchPoint = [% max_matchpoint %]; > var maxMatchCheck = [% max_matchcheck %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >index a223d93792..4846dc5a0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › OAI sets › OAI set mappings</title> >@@ -93,7 +94,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#mappingform").submit(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index f4d4ba9186..056365ab8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › [% IF ( op_new ) %]OAI sets configuration › Add a new OAI set[% ELSE %]OAI sets configuration[% END %]</title> >@@ -113,7 +114,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > function newDescField() { > $("#adddescription").before( >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >index 963d93faef..5232b795ca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -299,7 +300,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > if ( $("#branches option:selected").length < 1 ) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 4bff6d47d0..2db4b2d68c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -1,12 +1,13 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › System preferences</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/preferences_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/plugins/multiple-select/multiple-select_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/humanmsg_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] >+[% Asset.css("css/preferences.css") %] >+[% Asset.css("lib/jquery/plugins/multiple-select/multiple-select.css") %] >+[% Asset.css("css/humanmsg.css") %] > </head> > <body id="admin_preferences" class="admin"> > [% INCLUDE 'header.inc' %] >@@ -154,8 +155,8 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/multiple-select/jquery.multiple.select_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] >+ [% Asset.js("lib/jquery/plugins/multiple-select/jquery.multiple.select.js") %] > <script type="text/javascript"> > [% UNLESS ( searchfield ) %]$(document).ready(function(){ > $('#toolbar').fixFloat(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >index 0690b086c0..7542190562 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › > [% IF ( add_form ) %][% IF ( searchfield ) %] Printers › Modify printer '[% searchfield %]'[% ELSE %] Printers › New printer[% END %][% END %] >@@ -7,7 +8,7 @@ > [% IF ( else ) %]Printers[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( loop ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >index cc6f94c173..cecd8de1b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt >@@ -1,7 +1,8 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Elastic Search mappings</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.tablednd_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.tablednd.js") %] > <script type="text/javascript"> > function clean_line( line ) { > $(line).find('input[type="text"]').val(""); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index ffa8776491..fbaadceb76 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -731,7 +732,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > >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 04331b54e4..4c41178faa 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,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › SMS cellular providers</title> >@@ -96,13 +97,13 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > var MSG_SMS_PATRONS_USING = _("Are you sure you want to delete %s? %s patron(s) are using it!"); > var MSG_SMS_DELETE_CONFIRM = _("Are you sure you want to delete %s?"); > var LABEL_SMS_ADD_PROVIDER = _("Add an SMS cellular provider"); > var LABEL_SMS_EDIT_PROVIDER = _("Edit provider %s"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/sms_providers_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/sms_providers.js") %] > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >index a73ecb4865..341a7035c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › SRU search fields mapping</title> >@@ -71,7 +72,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#form01").submit(function(event) { >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 04f0d48288..c0b1148a42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>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 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="admin_systempreferences" class="admin"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >index 4376eb6024..17349ed0b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -91,7 +92,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script type="text/javascript"> > function check_transport_cost(e) { > var val = e.value; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index 2b7f8ae110..5819de043d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% USE Koha %] > [% USE KohaDates %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Administration › Koha usage statistics</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/lib/leaflet/leaflet_[% KOHA_VERSION %].css" /> >+[% Asset.css("lib/leaflet/leaflet.css") %] > </head> > > <body id="admin_usage_statistics" class="admin"> >@@ -228,7 +229,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > <script src="[% interface %]/lib/leaflet/leaflet.js"></script> > <script type="text/javascript"> > function positionMap() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index 8bf8483ac9..6af148ec3e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > >@@ -16,7 +17,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > > [% IF op == 'list' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > </head> > >@@ -198,7 +199,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/admin-menu.js") %] > [% IF op == 'list' %] > [% INCLUDE 'datatables.inc' %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt >index a7e1aaa7ab..8539ab17ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging authority plugin</title> >@@ -15,7 +16,7 @@ > var index = "[% index %]"; > var authtypecode = "[% authtypecode %]"; > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/auth-finder-search_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/auth-finder-search.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' popup_window = 1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index 785f854f64..1fbfd130b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Authorities › [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority ([% authtypetext %])[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] >+[% Asset.js("js/cataloging.js") %] > > <script type="text/javascript"> > //<![CDATA[ >@@ -152,7 +153,7 @@ function confirmnotdup(redirect){ > } > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/addbiblio.css") %] > > [% INCLUDE 'select2.inc' %] > <script> >@@ -162,7 +163,7 @@ function confirmnotdup(redirect){ > </script> > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] > </head> > <body id="auth_authorities" class="auth"> >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 95c331f768..2dc44b4eda 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,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% PROCESS 'authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -96,7 +97,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'authorities_js.inc' %] > [% IF ( displayhierarchy ) %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jstree_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.jstree.js") %] > [% END %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 20ade54ddd..f9412b0d8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% PROCESS 'merge-record.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -106,7 +107,7 @@ div#result { margin-top: 1em; } > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'merge-record-strings.inc' %] > [% INCLUDE 'authorities_js.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/merge-record_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/merge-record.js") %] > [% INCLUDE 'merge-record-strings.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >index f8c86cfbb9..39b06c164f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -89,7 +90,7 @@ > var index = "[% index %]"; > var authtypecode = "[% authtypecode %]"; > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/auth-finder-search_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/auth-finder-search.js") %] > <script type="text/javascript"> > > function jumpfull(page){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 28c0e78ffd..6b1d28f904 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% BLOCK controls %] > <p style="padding: 7px 0; border-top : 1px solid #E8E8E8;"> >@@ -32,7 +33,7 @@ > @import url([% interface %]/[% theme %]/css/print.css); > </style> > [% ELSE %][% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% END %] > </head> > [% IF ( print_basket ) %]<body id="cart_basket" class="cart" onload="print();history.back();">[% ELSE %]<body id="cart_basket" class="cart">[% END %] >@@ -295,8 +296,8 @@ > [% INCLUDE js_includes.inc %] > [% UNLESS ( print_basket ) %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/cart_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/cart.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > [% END %] > </body> > </html> >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 3a42fd1aeb..e292c145e1 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,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › >@@ -48,9 +49,9 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/catalog.js") %] > [% INCLUDE 'browser-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/browser.js") %] > <script type="text/javascript"> > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); > browser.show(); >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 dfe1e1c435..3b7c161553 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,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › >@@ -177,9 +178,9 @@ > </div> > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/catalog.js") %] > [% INCLUDE 'browser-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/browser.js") %] > <script type="text/javascript"> > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); > browser.show(); >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 51b5e34057..5be1aa54c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -276,7 +277,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] > <script type="text/JavaScript"> > /** > * Function add_field(); >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 9b1eb1ade4..bc830562b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE AuthorisedValues %] >@@ -33,7 +34,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="catalog_detail" class="catalog"> >@@ -858,7 +859,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/catalog.js") %] > [% INCLUDE 'greybox.inc' %] > <script type="text/javascript"> > // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html >@@ -1046,14 +1047,14 @@ > });[% END %] > </script> > [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %] >- <script type="text/javascript" src="https://imageserver.ebscohost.com/novelistselect/ns2init_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("https://imageserver.ebscohost.com/novelistselect/ns2init.js") %] > [% END %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] > [% INCLUDE 'browser-strings.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/table_filters_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/browser.js") %] >+ [% Asset.js("js/table_filters.js") %] > <script type="text/javascript"> > var browser; > browser = KOHA.browser('[% searchid %]', parseInt(biblionumber, 10)); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index b434c9a8e8..99bed914c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Details for [% biblio.title |html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title> >@@ -90,7 +91,7 @@ img.thumbnail { > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/catalog.js") %] > <script type="text/javascript"> > $(document).ready(function(){ > showCover([% imagenumber %]); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index e278c3de8b..28800abd6d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Checkout history for [% biblio.title |html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="catalog_issuehistory" class="catalog"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >index 172920b593..ee130b6fda 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE JSON.Escape %] > > [% BLOCK form_label %] >@@ -102,8 +103,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › Item search</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/itemsearchform_[% KOHA_VERSION %].css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/itemsearchform.css") %] >+ [% Asset.css("css/datatables.css") %] > </head> > > <body id="catalog_itemsearch" class="catalog"> >@@ -204,8 +205,8 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] > <script type="text/javascript"> > var authorised_values = [% authorised_values_json %]; > >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 9ca854ed75..e3b472b7c6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > >@@ -76,9 +77,9 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/catalog.js") %] > [% INCLUDE 'browser-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/browser.js") %] > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >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 ad8aefbb9a..b1a261fa26 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -277,9 +278,9 @@ > </div> > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'catalog-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/catalog_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/catalog.js") %] > [% INCLUDE 'browser-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/browser.js") %] > <script type="text/javascript"> > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); > browser.show(); >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 459bc085df..127bd8c9a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Biblio %] > [% USE KohaDates %] >@@ -622,9 +623,9 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'browser-strings.inc' %] >- <script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/browser.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > var MSG_NO_ITEM_SELECTED = _("Nothing is selected."); > var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be placed on hold."); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index 5d62c85cb1..43a9bfab03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > [% USE Koha %] > [% USE KohaDates %] > <title>Koha › Catalog › Search history</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="catalogue_search-history" class="catalogue"> >@@ -193,7 +194,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >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 c92d51e62d..fa5862989b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -1,11 +1,12 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] >+[% Asset.js("js/cataloging.js") %] > [% INCLUDE 'browser-strings.inc' %] >-<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/browser.js") %] > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >@@ -383,7 +384,7 @@ function Changefwk() { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/addbiblio.css") %] > > [% INCLUDE 'select2.inc' %] > <script> >@@ -393,7 +394,7 @@ function Changefwk() { > </script> > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] > </head> > <body id="cat_addbiblio" class="cat"> >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 8df082e259..6b86b21447 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -1,15 +1,16 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE ColumnsSettings %] > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber %]) › Items</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/cataloging.js") %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'browser-strings.inc' %] >-<script type="text/javascript" src="[% interface %]/js/browser_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/browser.js") %] > <script type="text/javascript"> > //<![CDATA[ > var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >@@ -129,7 +130,7 @@ function confirm_deletion() { > > //]]> > </script> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/addbiblio.css") %] > > [% INCLUDE 'select2.inc' %] > <script type="text/javascript"> >@@ -139,7 +140,7 @@ function confirm_deletion() { > </script> > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] > </head> > <body id="cat_additem" class="cat"> >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 14f75a4218..c1e96f3ad4 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,14 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › Editor</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/cateditor_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" href="[% interface %]/lib/codemirror/codemirror_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/humanmsg_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/cateditor.css") %] >+[% Asset.css("css/datatables.css") %] >+[% Asset.css("lib/codemirror/codemirror.css") %] >+[% Asset.css("css/humanmsg.css") %] > <script src="[% interface %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] > </head> > <body id="cat_addbiblio" class="cat"> >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 3dfdf735bb..c94d88de30 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% PROCESS 'merge-record.inc' %] > >@@ -186,7 +187,7 @@ div#result { margin-top: 1em; } > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/merge-record_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/merge-record.js") %] > [% INCLUDE 'merge-record-strings.inc' %] > <script type="text/javascript"> > [% UNLESS (result) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >index 1bf749743b..122da191e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >@@ -1,6 +1,7 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >index eb4e0f0839..524687a758 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › 006 builder</title> >@@ -31,7 +32,7 @@ > </form> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield_[% KOHA_VERSION %].js'></script> >+ [% Asset.js("js/xmlControlfield.js") %] > <script type="text/javascript"> > var objXmlControlField; > var tr_result; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >index a271c3837e..f8746e5370 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Cataloging › 008 builder</title> >@@ -32,7 +33,7 @@ > </form> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src='[% interface %]/[% theme %]/js/xmlControlfield_[% KOHA_VERSION %].js'></script> >+ [% Asset.js("js/xmlControlfield.js") %] > <script type="text/javascript"> > var objXmlControlField; > var tr_result; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index 0a15b33a67..5bc8f9d8d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF ( opsearch ) %] >@@ -6,7 +7,7 @@ > <title>Koha › Z39.50 authority search results</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > #marcPreview { width : 90%; top: 5%; } .modal-body { max-height: 380px; } .modal-header { padding: 0 14px; } @media (max-width: 767px) { #marcPreview { margin: 0; width : auto; } } > </style> >@@ -166,7 +167,7 @@ > [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %] > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >@@ -221,7 +222,7 @@ > }); > </script> > [% INCLUDE 'z3950_search.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/z3950_search.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index ee05d96733..7325414d88 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Z39.50/SRU search results</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > #dataPreview { width : 90%; top: 5%; } .modal-body { max-height: 380px; } .modal-header { padding: 0 14px; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } } > </style> >@@ -187,8 +188,8 @@ > [% IF ( numberpending ) %]<h3 align="center">Still [% numberpending %] servers to search</h3>[% END %] > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/z3950_search_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("js/z3950_search.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 198c47dd12..b2c883432c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >@@ -15,7 +16,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_circulation" class="circ"> >@@ -975,14 +976,14 @@ No patron matched <span class="ex">[% message | html %]</span> > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] > [% INCLUDE 'timepicker.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") %] >+ [% Asset.js("js/pages/circulation.js") %] >+ [% Asset.js("js/checkouts.js") %] >+ [% Asset.js("js/holds.js") %] >+ [% Asset.js("js/circ-patron-search-results.js") %] > <script type="text/javascript"> > /* Set some variable needed in circulation.js */ > var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning."); >@@ -1103,7 +1104,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% END %] > }); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 87860b92c4..d45cb3d224 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% USE KohaDates %] > [% USE Price %] >@@ -11,7 +12,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_circulation_batch_checkouts" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >index 4d4ec7437b..fd701cacaa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > <!DOCTYPE html> > [% IF (AllowOfflineCirculation) %] >@@ -216,9 +217,9 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.indexeddb_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/offlinecirc_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.indexeddb.js") %] >+ [% Asset.js("js/offlinecirc.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] > [% INCLUDE 'timepicker.inc' %] > <script type="text/javascript"> > var ALERT_SUCCESSFUL_CHECKIN = _("Checked in item."); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 0d6826d545..70e24ae17d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Pending on-site checkouts</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_stats" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index eaf0472a9e..12966ed356 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE KohaDates %] > [%- USE Branches -%] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Items overdue as of [% todaysdate %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > .sql {display:none;} > </style> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index b706e8f960..e3492a5d96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE ColumnsSettings %] > [% USE AuthorisedValues %] >@@ -7,7 +8,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds to pull</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_pendingreserves" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >index 315f835de9..f73771d288 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF ( caller == 'hold-transfer' ) %] >@@ -12,7 +13,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/print.css") %] > [% IF ( Koha.Preference('SlipCSS') ) %] > <link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') %]" /> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index a64dc1206d..ca1aa1b109 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE ItemTypes %] >@@ -7,7 +8,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Request article</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_request-article" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 6125bd7b37..3c35d865da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Hold ratios</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > .sql { display: none; } > .ulined { text-decoration: underline; } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index f18ea69023..3e3bd61082 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Koha %] >@@ -31,7 +32,7 @@ > > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Check in [% title |html %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -693,7 +694,7 @@ > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] > [% INCLUDE 'timepicker.inc' %] > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 34834d2531..3afff1909b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Transfers to receive</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_transferstoreceive" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index 80ff386483..e8a3670d05 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE ItemTypes %] >@@ -10,7 +11,7 @@ > <title>Koha › Circulation › Holds queue</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> p { margin-top: 0; }</style> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_view_holdsqueue" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index c2ada8386b..87434daa44 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds awaiting pickup</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="circ_waitingreserves" class="circ"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >index 02b5b2181e..d0d7268e7e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Koha %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron clubs › Club enrollments</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="club_enrollments" class="clubs"> >@@ -51,7 +52,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > eTable = $('#enrollments-table').dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 2a9d3e0984..895ac37746 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% USE Koha %] >@@ -6,7 +7,7 @@ > <title>Koha › Tools › Patron clubs</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="clubs_clubs" class="clubs"> >@@ -221,7 +222,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > tTable = $('#club-templates-table').dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >index e2345cec51..476bf893c7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patron search</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="common_patron_search" class="common"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index dec2c5d24e..11a495eef9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE ItemTypes %] > [% USE Branches %] >@@ -6,7 +7,7 @@ > <title>Koha › Course reserves › Course details for [% course.course_name %]</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="courses_course_details" class="course"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >index 1308d582ba..2a8528b3eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Course reserves</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="courses_course_reserves" class="course"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >index ae5cb530e6..f447d547e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt >@@ -1,6 +1,7 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Online help</title> >-<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/tiny_mce/tiny_mce.js") %] > <script type="text/javascript">//<![CDATA[ > tinyMCE.baseURL = "[% interface %]/lib/tiny_mce"; > tinyMCE.init({ >@@ -23,7 +24,7 @@ tinyMCE.init({ > //]]> > </script> > [% INCLUDE intranetstylesheet.inc %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/help_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/help.css") %] > </head> > <body id="help_edithelp" class="help"> > <h1>Online Help</h1> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index aab9a75346..70f31cad16 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% USE Koha %] > [% USE KohaDates %] >@@ -5,8 +6,8 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › ILL requests ›</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css"> >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >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 dc619926ba..ca68bec2dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha staff client</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/mainpage.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="main_intranet-main" class="intranet-main"> >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 8381dda007..178151edcd 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,10 @@ >+[% USE Asset %] > [% USE ItemTypes %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >index e3b01097fb..79f790795c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Label creator</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] > </head> > <body id="labels_label-home" class="tools labels"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >index a079caa177..18a4467ffe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% BLOCK translate_label_element %] > [%- SWITCH element -%] > [%- CASE 'layout' -%]layout >@@ -75,7 +76,7 @@ > //]]> > </script> > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >index 9bf4e1ad73..c02a2170d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Barcodes and labels › Search results</title> > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >index 4400bb75fe..4c71cfcc70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > <!DOCTYPE html> > [% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %] > <head> > <title>Koha › Tools › Spine labels</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/spinelabel_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/spinelabel.css") %] > > <style type="text/css"> > @media print { >@@ -12,8 +13,8 @@ > </style> > [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] > [% IF ( IntranetUserJS ) %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/jquery-2.2.3.min.js") %] >+ [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > [% IntranetUserJS %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index d7684a6f89..20339d7a3f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE ColumnsSettings %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_borraccount" class="pat"> >@@ -124,7 +125,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > var dateformat = "[% Koha.Preference('dateformat') %]"; > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >index 68561e30ae..7db850593e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -61,7 +62,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >index 01b2e9d4f3..27a4cdda24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -73,7 +74,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >index 254a1d9e84..bac9d69c92 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% USE KohaDates %] > [% SET footerjs = 1 %] >@@ -50,7 +51,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > > [% INCLUDE 'datatables.inc' %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index 947b8d20ef..96d4c836b8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] >@@ -84,7 +85,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function(){ > $(".confirmdelete").on("click", function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index b5a0728f87..68f3a2bf11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Koha %] > [% USE AuthorisedValues %] >@@ -7,7 +8,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_holdshistory" class="pat"> >@@ -105,7 +106,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript" id="js"> > $(document).ready(function() { > var columns_settings = [% ColumnsSettings.GetColumns('members', 'holdshistory', 'holdshistory-table', 'json') %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index cfbb3b388a..f6c4f6c675 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE AuthorisedValues %] >@@ -425,7 +426,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("a.delete").click(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >index 5f68a4c6fb..0736b7feeb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -57,7 +58,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function(){ > $('#mancredit').preventDoubleFormSubmit(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >index 71eeb78176..01ea093056 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -70,7 +71,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > var type_fees = {'L':'','F':'','A':'','N':'','M':''}; > [% FOREACH invoice_types_loo IN invoice_types_loop %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >index 5c1bbf0f98..d380187b65 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% PROCESS 'permissions.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Set permissions for [% patron.surname %], [% patron.firstname %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview_[% KOHA_VERSION %].css"/> >+[% Asset.css("css/treeview/jquery.treeview.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -76,8 +77,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.treeview.pack.js") %] > <!-- set up tree --> > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >index df7bb77364..250ed4eb99 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -90,7 +91,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/JavaScript"> > > function generate_password() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index b40bb0337f..866dd279b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE ColumnsSettings %] > [% USE Branches %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons [% IF ( searching ) %]› Search results[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_member" class="pat"> >@@ -224,7 +225,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $('#add_to_patron_list_submit').prop('disabled', true); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index 4309824da9..e3db7c955c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -1155,9 +1156,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > >@@ -1314,8 +1315,8 @@ > [% END %] > > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members.js") %] >+ [% Asset.js("js/messaging-preference-form.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >index 3a7819990a..1276f0ce1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE Categories %] >@@ -186,7 +187,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(function() { > $( "#pending_updates" ).accordion(); >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 49d0f55057..8ec67a68d1 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,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/print.css") %] > </head> > > <body id="pat_moremember-receipt" class="pat"> >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 44cdb94df9..40a106e657 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >@@ -11,7 +12,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_moremember" class="pat"> >@@ -546,15 +547,15 @@ > [% INCLUDE 'columns_settings.inc' %] > [% INCLUDE 'strings.inc' %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] > [% INCLUDE 'timepicker.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") %] >+ [% Asset.js("js/pages/circulation.js") %] >+ [% Asset.js("js/checkouts.js") %] >+ [% Asset.js("js/holds.js") %] >+ [% Asset.js("js/members-menu.js") %] >+ [% Asset.js("js/messaging-preference-form.js") %] > <script type="text/javascript"> > /* Set some variable needed in circulation.js */ > var interface = "[% interface %]"; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt >index c23ba1b9e1..6f7d71a6ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -77,7 +78,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index fecf201ed5..66a9d13f47 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > .notice { display: none; } > .notice-title { font-weight: bold; display: block; } >@@ -89,7 +90,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 34b6d1150c..80abac023e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -136,8 +137,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type= "text/javascript"> > function enableCheckboxActions(){ > // Enable/disable controls if checkboxes are checked >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index 39df1437c0..b9e03cf60f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -172,7 +173,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > <script type= "text/javascript"> > $(document).ready(function() { > $('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >index a6c5a3ad74..1e9ad5b274 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Print receipt for [% patron.cardnumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/printreceiptinvoice.css") %] > [% INCLUDE 'blocking_errors.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >index 151d9456de..ec3ddf6331 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Print receipt for [% patron.cardnumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/printreceiptinvoice.css") %] > </head> > > <body id="printinvoice" class="pat"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index f95c0097b3..6794bc0810 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -100,7 +101,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index dd32e0c7d8..36f52810ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Koha %] > [% USE AuthorisedValues %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Circulation History for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_readingrec" class="pat"> >@@ -118,7 +119,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript" id="js"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >index 90c059e2a8..1cbbfa674c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -84,7 +85,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >index 6519628adb..14742eb0f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -9,7 +10,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_statistics" class="pat"> >@@ -89,7 +90,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >index 23d80196f5..d5cd974565 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Choose adult category</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="pat_update-child" class="pat"> >@@ -93,7 +94,7 @@ > window.close(); > </script> > [% END %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/members-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index 31c7adec94..c5803ae91c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE "doc-head-open.inc" %] > <title>Koha › Circulation › Offline circulation</title> >@@ -87,7 +88,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > $(document).ready(function() { > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index cccdca9388..b7f50e6b29 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Offline circulation file upload</title> >@@ -67,8 +68,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/background-job-progressbar.js") %] >+ [% Asset.js("js/file-upload.js") %] > <script type="text/javascript"> > var xhr; > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >index 2a27110bcc..bf89a4db9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists › >@@ -65,7 +66,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index 935a409d7b..cde655d518 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists › [% list.name %] › Add patrons</title> > [% INCLUDE 'doc-head-close.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > #add_patrons_by_search { > display: none; >@@ -162,10 +163,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] > >- <script type="text/javascript" src="[% interface %]/js/autocomplete/patrons_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/autocomplete/patrons.js") %] > <script type="text/javascript"> > var MSG_REMOVE_PATRON = _("Remove"); > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index a1402f7613..f2cd32df5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron lists</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'greybox.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="patlist_lists" class="pat patlist"> >@@ -104,7 +105,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] > > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >index 4ea92aec0e..1eaaa95065 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron card creator › Batches › [% IF batch_id %]Edit ([% batch_id %])[% ELSE %]New[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > </head> > > <body id="pcard_edit-batch" class="tools pcard"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >index 36437dd6fd..3fa08fc0dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Patron card creator › Templates › [% IF (template_id) %]Edit ([% template_id %])[% ELSE %]New[% END %]</title> >@@ -158,7 +159,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script> > $(document).ready(function(){ > var selectedUnit = $("#units option:selected").attr("value"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >index 203e7cee4d..fcf1d96bb8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > <!DOCTYPE html> > [% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %] >@@ -115,8 +116,8 @@ > </div> > > [% IF ( IntranetUserJS ) %] >- <script src="[% interface %]/lib/jquery/jquery-2.2.3.min_[% KOHA_VERSION %].js"></script> >- <script src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/jquery-2.2.3.min.js") %] >+ [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %] > <script> > [% IntranetUserJS %] > function Done() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index 4f895f4c77..ee9c1a0d4c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -132,7 +133,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index f3db10be80..d38df2f949 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Price %] > [% USE ItemTypes %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports [% IF ( do_it ) %]› Cash register statistics › Results[% ELSE %]› Cash register statistics[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="cash_register_stats" class="rep"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index 7f5d368eeb..b4a380e99b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Koha %] > [% USE ColumnsSettings %] >@@ -50,7 +51,7 @@ > } > </style> > [% IF ( saved1 ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index 7412ef4027..83c82eb125 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE ColumnsSettings %] >@@ -7,7 +8,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Reports › Lost items</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="rep_itemslost" class="rep"> >@@ -167,10 +168,10 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] > [% INCLUDE 'columns_settings.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/table_filters_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/table_filters.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type='text/javascript'> > $(document).ready(function() { > var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ) %]; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index 44b2ca4534..d1cb134e6d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% USE ItemTypes %] > [% SET footerjs = 1 %] >@@ -5,7 +6,7 @@ > <title>Koha › Reports › Catalog by item types</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( do_it ) %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% END %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 33c1fed94c..edea6ad546 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -8,7 +9,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>[% IF ( get_orders ) %] › <a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</a> › Results[% ELSE %] › Orders by fund[% END %]</div> > > <div id="doc3" class="yui-t2"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index 0e67d9c1e5..25af72f510 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -7,7 +8,7 @@ > <style type="text/css"> > .sql {display: none;} > </style> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="rep_serials_stats" class="rep"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index b8b5d98a7f..91e9e5b754 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -10,10 +11,10 @@ > <title>Koha › Circulation › Holds › Confirm holds</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/circ-patron-search-results.js") %] > <script type="text/javascript"> > // <![CDATA[ > var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index 5cf457bb4d..37e478c9ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Comments › [% IF ( status ) %] Approved comments[% ELSE %] Comments awaiting moderation[% END %]</title> >@@ -75,7 +76,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >index a5dc9acb81..365745db99 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Rotating collections › Collection [% colTitle %] ’ Add or remove items</title> >@@ -121,8 +122,8 @@ > </div> <!-- /#bd --> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/rotating-collections_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/rotating-collections.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >index 1bfe14d7e5..0f0f755017 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Rotating collections › >@@ -137,8 +138,8 @@ > </div> <!-- /#bd --> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/rotating-collections_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/rotating-collections.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index 111e92d615..f3602eea9a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Rotating collections</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="rcoll_rotatingCollections" class="tools rcoll"> >@@ -67,8 +68,8 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/rotating-collections_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/rotating-collections.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >index 51777738bb..123be6114e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -59,8 +60,8 @@ > </div> <!-- /#bd --> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/rotating-collections_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/rotating-collections.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >index 06ee078858..d93cc20c31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -10,7 +11,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="ser_add_fields" class="ser"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index 5c823b98e9..8f5f54700f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Claims</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="ser_claims" class="ser"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index f59fd350fd..c00c7beb13 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE KohaDates %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Serial collection information for [% bibliotitle %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="ser_serials-collection" class="ser"> >@@ -270,8 +271,8 @@ > var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?"); > var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/serials-toolbar_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/serials-toolbar.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > function generateReceive(subscriptionid) { > if(nbissues=prompt(_("How many issues do you want to receive ?"))){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index 09af141b18..e23d35d0d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Serial edition [% bibliotitle %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/prevent_submit_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/cataloging.js") %] >+[% Asset.js("js/prevent_submit.js") %] > [% INCLUDE 'calendar.inc' %] > <script language="JavaScript" type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >index 5305fa8b21..d6ecbc4b54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -23,7 +24,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/serials-toolbar_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/serials-toolbar.js") %] > <script type="text/javascript"> > var subscriptionid = "[% subscriptionid %]"; > var MSG_CLOSE_SUBSCRIPTION = _("Are you sure you want to close this subscription?"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 756b8df731..73b0c1623e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE KohaDates %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials [% biblionumber %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css">input.dt-filter { width : 100%; font-size : 85%; }</style> > </head> > >@@ -424,7 +425,7 @@ > var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?"); > var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/serials-toolbar_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/serials-toolbar.js") %] > <script type="text/javascript"> > $(document).ready(function() { > var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index b986e099fc..8f95b49d27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -508,8 +509,8 @@ fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ > var MSG_PUB_DATE_UNDEFINED = _("First publication date is not defined"); > var MSG_NEXT_ISSUE_UNDEFINED = _("Next issue publication date is not defined"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/subscription-add_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/showpredictionpattern_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/subscription-add.js") %] >+ [% Asset.js("js/showpredictionpattern.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index f487738b52..ac4b8f8a83 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE AuthorisedValues %] >@@ -378,7 +379,7 @@ > var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?"); > var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/serials-toolbar_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/serials-toolbar.js") %] > <script type="text/javascript"> > // the english words used in display purposes > var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern", >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >index c544519aa1..18f0ec6d7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Serials › Numbering patterns</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="ser_subscription_numberpatterns" class="ser"> >@@ -301,7 +302,7 @@ > > [% MACRO jsinclude BLOCK %] > [% IF (daily_options) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/showpredictionpattern_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/showpredictionpattern.js") %] > [% END %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 5885912cf6..16f4ccf256 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% USE AuthorisedValues %] > [% USE KohaDates %] >@@ -19,7 +20,7 @@ > </title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( op_else ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > [% IF ( op_else ) %] > <style type="text/css"> >@@ -766,7 +767,7 @@ > [% END %] > [% IF ( op_else ) %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > /** > * displayOther. >@@ -921,8 +922,8 @@ > }); > </script> > [% END %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acq_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/acquisitions-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/acq.js") %] >+ [% Asset.js("js/acquisitions-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.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 da4dfdee86..e1ced5b598 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : transparent; }</style> > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index eacb7d8cec..6898da40b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > .setlabel {width: 6em; font-family: courier; background-color:#E8E8E8;} > .rejected { color: #CC0033; } >@@ -225,8 +226,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/tags-review_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("js/pages/tags-review.js") %] > <script type="text/javascript"> > var MSG_AJAX_APPROVE_FAILED = _("AJAX failed to approve tag: %s"); > var MSG_AJAX_REJECTION_FAILED = _("AJAX failed to reject tag: %s"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >index dd98249218..7e1d5a3851 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Automatic item modifications by age</title> >@@ -223,9 +224,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/automatic_item_modification_by_age_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] >+ [% Asset.js("js/automatic_item_modification_by_age.js") %] > [% IF op == 'edit_form' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 1894e2846d..835be89507 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -1,8 +1,9 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item deletion</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <!--[if IE]> > <style type="text/css">#selections { display: none; }</style> > <![endif]--> >@@ -184,10 +185,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/pages/batchMod.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > // Prepare array of all column headers, incrementing each index by > // two to accommodate control and title columns >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 0f40e2c02a..32577c8674 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -1,13 +1,14 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item modification</title> > [% INCLUDE 'doc-head-close.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cataloging_[% KOHA_VERSION %].js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.js("js/background-job-progressbar.js") %] >+[% Asset.js("js/cataloging.js") %] >+[% Asset.css("css/datatables.css") %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+[% Asset.js("js/pages/batchMod.js") %] > <script type="text/javascript"> > //<![CDATA[ > >@@ -41,7 +42,7 @@ $(document).ready(function(){ > <style type="text/css">#selections { display: none; }</style> > <![endif]--> > <style type="text/css">input[type=checkbox]{ margin : 0 .5em; }</style> >-<link type="text/css" rel="stylesheet" href="[% interface %]/[% theme %]/css/addbiblio_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/addbiblio.css") %] > > [% INCLUDE 'select2.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >index 3f1cd9b86f..50a7b8ec3d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% IF ( del ) %]Batch item deletion[% ELSE %]Batch item modification[% END %] </title> >@@ -74,7 +75,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.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 913905afbc..cd789a9ef5 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,9 +1,10 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record deletion</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_batch_delete_records" class="tools"> >@@ -177,9 +178,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > var MSG_CANNOT_BE_DELETED = _("This record cannot be deleted, at least one item is currently checked out."); > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 1fa782a029..a1d5d7535c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% PROCESS 'authorities-search-results.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record modification</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_batch_record_modification" class="tools"> >@@ -235,10 +236,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("js/background-job-progressbar.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#selectall").click(function(e){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >index 2dcde9fc72..271a78d4ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -215,7 +216,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index 06d21cea66..9856dec628 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › CSV export profiles</title> >@@ -286,7 +287,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > function reloadPage(p) { > var id = p.value; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >index adf520af5e..6d09067bcf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -288,7 +289,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index 89db4cfb6e..5d65cef917 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › [% Branches.GetName( branch ) %] calendar</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> .key { padding : 3px; white-space:nowrap; line-height:230%; } > .ui-datepicker { font-size : 150%; } > .ui-datepicker th, .ui-datepicker .ui-datepicker-title select { font-size : 80%; } >@@ -340,7 +341,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > var weekdays = new Array(_("Sundays"),_("Mondays"),_("Tuesdays"),_("Wednesdays"),_("Thursdays"),_("Fridays"),_("Saturdays")); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >index 99894145e8..f2b5c3c588 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -289,8 +290,8 @@ you can supply dates in ISO format (e.g., '2010-10-28'). > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > [%# Make date fields have the datepicker %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index 346b36d7dc..be5aee522a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Inventory</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_inventory" class="tools"> >@@ -249,10 +250,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > function checkForm() { > if ( $('#uploadbarcodes').val() ) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index 76ecd89287..f50b80681c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -5,7 +6,7 @@ > <title>Koha › Tools › News</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( opac_news_count ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > </head> > >@@ -225,7 +226,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% IF ( opac_news_count ) %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >@@ -265,7 +266,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > }); > </script> > [% END %] >- <script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/tiny_mce/tiny_mce.js") %] > <script type="text/javascript"> > tinyMCE.baseURL = "[% interface %]/lib/tiny_mce"; > tinyMCE.init({ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index c3c4b42dd1..0dd88e915a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Notices[% IF ( add_form or copy_form ) %][% IF ( modify ) %] › Modify notice[% ELSE %] › Add notice[% END %][% END %][% IF ( add_validate or copy_validate) %] › Notice added[% END %][% IF ( delete_confirm ) %] › Confirm deletion[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_letter" class="tools"> >@@ -404,10 +405,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.insertatcaret_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.insertatcaret.js") %] > <script type="text/javascript"> > $(document).ready(function() { > [% IF add_form or copy_form %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 21cd576aa2..cff595afcf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Manage staged MARC records >@@ -6,7 +7,7 @@ > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css"> > #jobpanel,#jobstatus,#jobfailed { display : none; } > span.change-status { font-style:italic; color:#666; display:none; } >@@ -380,8 +381,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+[% Asset.js("js/background-job-progressbar.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index 4af74671d3..b281356246 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › MARC modification templates</title> >@@ -335,7 +336,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > var MSG_MMT_SUBFIELDS_MATCH = _("Both subfield values should be filled or empty."); > var MSG_MMT_DESTINATION_REQUIRED = _("The destination should be filled."); >@@ -350,7 +351,7 @@ > var MSG_MMT_EDIT_ACTION = _("Edit action %s"); > var MSG_MMT_UPDATE_ACTION = _("Update action"); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/marc_modification_templates_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/marc_modification_templates.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.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 bbf39a0551..c00a1a5598 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -5,7 +6,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch patron modification</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_modborrowers" class="tools"> >@@ -296,7 +297,7 @@ > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > var patron_attributes_lib = new Array(); > var patron_attributes_values = new Array(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >index 6928ee5464..8dc1df06a4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% SET footerjs = 1 %] >@@ -156,7 +157,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > <script type="text/javascript"> > var tab_map = { "1" : _("First"), "2" : _("Second"), "3" : _("Third")}; > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >index 53484c73c7..87151c7f39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Upload patron images</title> >@@ -140,8 +141,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/members-menu.js") %] > <script type="text/javascript"> > $(document).ready(function() { > $("#zipfile").click(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >index 9840e862be..5cf4ade49d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt >@@ -1,10 +1,11 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote uploader</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/uploader_[% KOHA_VERSION %].css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes_[% KOHA_VERSION %].css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/uploader.css") %] >+ [% Asset.css("css/quotes.css") %] >+ [% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_quotes" class="tools"> >@@ -73,9 +74,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") %] > <script type="text/javascript"> > var oTable; //DataTable object > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >index f70beb120d..4013b3ddcd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Quote editor</title> > [% INCLUDE 'doc-head-close.inc' %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/quotes_[% KOHA_VERSION %].css" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/quotes.css") %] >+ [% Asset.css("css/datatables.css") %] > </head> > > <body id="tools_quotes" class="tools"> >@@ -61,10 +62,10 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/dataTables.fnReloadAjax_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.jeditable.mini_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/dataTables.fnReloadAjax.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") %] > <script type="text/javascript"> > var oTable; /* oTable needs to be global */ > var sEmptyTable = _("No quotes available. Please use the 'Add quote' button to add a quote."); /* override the default message in datatables.inc */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >index 8491538da2..e8ff186c3c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Task scheduler</title> >@@ -91,7 +92,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index 5f3700da3d..89b71d3ec2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Manage staged MARC records › Compare matched records</title> >@@ -47,8 +48,8 @@ > <p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid %]">Return to staged MARC batch [% batchid %]</a></p> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jsdiff/jsdiff.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("lib/jsdiff/jsdiff.min.js") %] > <script type="text/javascript"> > $(document).ready(function(){ > var diff1 = $("#col1 pre").text(); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >index 37a1a38a48..29a49a8c3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Stage MARC records for import</title> >@@ -197,9 +198,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/background-job-progressbar.js") %] >+ [% Asset.js("js/file-upload.js") %] > <script type="text/javascript"> > var xhr; > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index bdd4357d12..d5f79031f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Upload images</title> >@@ -109,9 +110,9 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] >+ [% Asset.js("js/background-job-progressbar.js") %] >+ [% Asset.js("js/file-upload.js") %] > <script type="text/javascript"> > function StartUpload() { > if( $('#fileToUpload').prop('files').length == 0 ) return; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 4508582fe7..a4e6147f6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -7,7 +8,7 @@ > <title>Koha › Tools › Upload</title> > [% END %] > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > > [% BLOCK plugin_pars %] > [% IF plugin %] >@@ -246,7 +247,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > var errMESSAGES = [ >@@ -260,7 +261,7 @@ > _("File or upload record could not be deleted."), > ]; > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/file-upload.js") %] > <script type="text/javascript"> > function StartUpload() { > if( $('#fileToUpload').prop('files').length == 0 ) return; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index 93932e7016..b183dcac28 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -288,7 +289,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/tools-menu.js") %] > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index d3c4ac4002..35a70ff8d3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% SET PRIVATE = 1 %] >@@ -6,7 +7,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › [% IF op == 'view' %]Lists › Contents of [% shelf.shelfname | html %][% ELSE %]Lists[% END %][% IF op == 'add_form' %] › Create new list[% END %][% IF op == 'edit_form' %] › Edit list [% shelf.shelfname | html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/datatables.css") %] > <style type="text/css">textarea { width: 100%; }</style> > > [% BLOCK list_permissions %] >@@ -415,7 +416,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] > [% IF print %] > <script type="text/javascript"> > $( document ).ready(function() { >@@ -426,8 +427,8 @@ > [% END %] > > [% IF op == 'view' %] >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >- <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+ [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] > [% END %] > <script type="text/javascript"> > var MSG_NO_ITEM_SELECTED = _("Nothing is selected."); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >index b2f3e2a30b..f968278617 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >@@ -1,4 +1,5 @@ >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min_[% KOHA_VERSION %].js"></script> >+[% USE Asset %] >+[% Asset.js("lib/jquery/plugins/jquery.dataTables.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > var MSG_DT_FIRST = _("First"); >@@ -17,4 +18,4 @@ > var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables_[% KOHA_VERSION %].js"></script> >\ No newline at end of file >+[% Asset.js("js/datatables.js") %] >\ No newline at end of file >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >index 8445567ee8..24faf4d4f9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc >@@ -1,25 +1,26 @@ > [%- USE KohaPlugins -%] >+[% USE Asset %] > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <meta name="viewport" content="width=device-width, initial-scale=1" /> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap-rtl.min_[% KOHA_VERSION %].css" /> >+ [% Asset.css("lib/bootstrap/css/bootstrap-rtl.min.css") %] > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> >+ [% Asset.css("lib/bootstrap/css/bootstrap.min.css") %] > [% END %] > > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui-rtl_[% KOHA_VERSION %].css" /> >+ [% Asset.css("lib/jquery/jquery-ui-rtl.css") %] > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >+ [% Asset.css("lib/jquery/jquery-ui.css") %] > [% END %] > >-[% SET opaclayoutstylesheet='opac_' _ KOHA_VERSION _ '.css' UNLESS opaclayoutstylesheet %] >+[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] > [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] > <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" /> > [% ELSE %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% opaclayoutstylesheet %]" /> >+ [% Asset.css("css/" _ opaclayoutstylesheet) %] > [% END %] > [% IF ( OpacAdditionalStylesheet ) %] > [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %] >@@ -31,9 +32,9 @@ > [% IF ( opac_css_override ) %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/[% opac_css_override %]" /> > [% END %] >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/print.css", { media = "print" }) %] > [% IF ( bidi ) %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/right-to-left.css") %] > [% END %] > [% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS %]</style>[% END %] > [% IF SCO_login %] >@@ -51,7 +52,7 @@ > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min_[% KOHA_VERSION %].css" /> >+[% Asset.js("lib/modernizr.min.js") %] >+[% Asset.css("lib/font-awesome/css/font-awesome.min.css") %] > [% PROCESS 'html_helpers.inc' %] > [% KohaPlugins.get_plugins_opac_head %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc >index ca12389cc0..76cc419246 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/greybox.inc >@@ -1,7 +1,8 @@ >+[% USE Asset %] > <script type="text/javascript"> > var GB_ROOT_DIR = "[% interface %]/[% theme %]/lib/greybox/"; > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/AJS_fx_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/greybox/gb_scripts_[% KOHA_VERSION %].js"></script> >-<link href="[% interface %]/[% theme %]/lib/greybox/gb_styles_[% KOHA_VERSION %].css" rel="stylesheet" type="text/css" /> >+[% Asset.js("lib/greybox/AJS.js") %] >+[% Asset.js("lib/greybox/AJS_fx.js") %] >+[% Asset.js("lib/greybox/gb_scripts.js") %] >+[% Asset.css("lib/greybox/gb_styles.css") %] >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 e96299e67c..1d91ef734f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -1,4 +1,5 @@ > [%- USE KohaPlugins -%] >+[% USE Asset %] > [% UNLESS ( is_popup ) %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] > [% IF ( opaccredits ) %] >@@ -78,24 +79,24 @@ > > > <!-- JavaScript includes --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/jquery.js") %] >+[% Asset.js("lib/jquery/jquery-ui.js") %] > <script type="text/javascript"> > // Resolve name collision between jQuery UI and Twitter Bootstrap > $.widget.bridge('uitooltip', $.ui.tooltip); > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/bootstrap/js/bootstrap.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/global_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/bootstrap/js/bootstrap.min.js") %] >+[% Asset.js("js/global.js") %] > <script type="text/javascript"> > Modernizr.load([ > // Test need for polyfill > { > test: window.matchMedia, >- nope: "[% interface %]/[% theme %]/lib/media.match.min_[% KOHA_VERSION %].js" >+ nope: "[% Asset.url('lib/media.match.min.js') %]" > }, > // and then load enquire >- "[% interface %]/[% theme %]/lib/enquire.min_[% KOHA_VERSION %].js", >- "[% interface %]/[% theme %]/js/script_[% KOHA_VERSION %].js" >+ "[% Asset.url('lib/enquire.min.js') %]", >+ "[% Asset.url('js/script.js') %]", > ]); > > // Fix for datepicker in a modal >@@ -106,13 +107,13 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > var NO_AMAZON_IMAGE = _("No cover image available"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/amazonimages_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/amazonimages.js") %] > [% END %] > >-<script src="[% interface %]/lib/emoji-picker/js/config_[% KOHA_VERSION %].js"></script> >-<script src="[% interface %]/lib/emoji-picker/js/util_[% KOHA_VERSION %].js"></script> >-<script src="[% interface %]/lib/emoji-picker/js/jquery.emojiarea_[% KOHA_VERSION %].js"></script> >-<script src="[% interface %]/lib/emoji-picker/js/emoji-picker_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/emoji-picker/js/config.js") %] >+[% Asset.js("lib/emoji-picker/js/util.js") %] >+[% Asset.js("lib/emoji-picker/js/jquery.emojiarea.js") %] >+[% Asset.js("lib/emoji-picker/js/emoji-picker.js") %] > > <script type="text/javascript"> > //<![CDATA[ >@@ -178,16 +179,16 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > > [% IF Koha.Preference( 'opacbookbag' ) == 1 %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/basket.js") %] > [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/basket.js") %] > [% ELSE %] > <script type="text/javascript">var readCookie;</script> > [% END %] > >-[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/tags_[% KOHA_VERSION %].js"></script>[% END %][% ELSE %][% END %] >+[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% Asset.js("js/tags.js") %][% END %][% ELSE %][% END %] > [% IF ( GoogleJackets ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/google-jackets_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/google-jackets.js") %] > <script type="text/javascript"> > //<![CDATA[ > var NO_GOOGLE_JACKET = _("No cover image available"); >@@ -195,7 +196,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > [% END %] > [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/coce_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/coce.js") %] > <script type="text/javascript"> > //<![CDATA[ > var NO_COCE_JACKET = _("No cover image available"); >@@ -204,7 +205,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > > [% IF OpenLibraryCovers || OpenLibrarySearch %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/openlibrary_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/openlibrary.js") %] > <script type="text/javascript"> > //<![CDATA[ > var NO_OL_JACKET = _("No cover image available"); >@@ -214,7 +215,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > > [% IF OPACLocalCoverImages %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/localcovers.js") %] > <script type="text/javascript"> > //<![CDATA[ > var NO_LOCAL_JACKET = _("No cover image available"); >@@ -223,7 +224,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > > [% IF ( BakerTaylorEnabled ) %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/bakertaylorimages_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/bakertaylorimages.js") %] > <script type="text/javascript"> > //<![CDATA[ > var NO_BAKERTAYLOR_IMAGE = _("No cover image available"); >@@ -235,7 +236,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > [% END %] > [% IF ( GoogleIndicTransliteration ) %] > <script type="text/javascript" src="https://www.google.com/jsapi"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/googleindictransliteration_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/googleindictransliteration.js") %] > [% END %] > > [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] >@@ -246,7 +247,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); > </script> > [% END %] > >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] > <script type="text/javascript"> > $(document).ready(function() { > if($('#searchsubmit').length) { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index 41985f0fe6..807aa8fa4c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] >@@ -7,7 +8,7 @@ > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your fines and charges</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > </head> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >index f5308ea7e2..1b7fb90c06 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -396,8 +397,8 @@ > [% END %] > > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.deserialize.min_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.cookie.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.deserialize.min.js") %] >+[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function() { > $('#advsearches').tabs(); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index 12bf37402d..a2cf3a43f3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% PROCESS 'opac-authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -63,7 +64,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree_[% KOHA_VERSION %].js"></script> >+[% Asset.js("/opac-tmpl/lib/jquery/plugins/jquery.jstree.js") %] > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index c73bd15df6..f166f42734 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% PROCESS 'opac-authorities.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -128,7 +129,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% IF ( displayhierarchy ) %] >- <script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("/opac-tmpl/lib/jquery/plugins/jquery.jstree.js") %] > [% END %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >index 7724cb97b9..5e34f52c53 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE AuthorisedValues %] >@@ -7,7 +8,7 @@ > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Course reserves for [% course.course_name %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > > </head> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >index eb20071e9c..eacb243ed4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE AuthorisedValues %] > >@@ -5,7 +6,7 @@ > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Courses</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/datatables.css") %] > [% END %] > > </head> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index f4b823c2c7..21c6ccd2c1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Math %] > [% USE Koha %] > [% USE KohaDates %] >@@ -34,13 +35,13 @@ > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield |html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( bidi ) %] >- [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/right-to-left_[% KOHA_VERSION %].css" />[% END %] >+ [% BLOCK cssinclude %][% Asset.css("css/right-to-left.css") %][% END %] > [% END %] > [% IF ( OpacStarRatings != 'disable' ) %] >- [% BLOCK cssinclude %]<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating_[% KOHA_VERSION %].css" />[% END %] >+ [% BLOCK cssinclude %][% Asset.css("css/jquery.rating.css") %][% END %] > [% END %] > [% INCLUDE greybox.inc %] >- <link href="[% interface %]/lib/emoji-picker/css/emoji_[% KOHA_VERSION %].css" rel="stylesheet"> >+ [% Asset.css("lib/emoji-picker/css/emoji.css") %] > </head> > [% INCLUDE 'bodytag.inc' bodyid='opac-detail' bodyclass='scrollto' %] > [% INCLUDE 'masthead.inc' %] >@@ -1388,9 +1389,9 @@ > </script> > <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> > [% END %] >-[% IF ( OpacStarRatings != 'disable' ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script>[% END %] >+[% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %] > >-[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3_[% KOHA_VERSION %].js"></script>[% END %] >+[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %][% END %] > > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index c903453687..eacd423363 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE AuthorisedValues %] > [% USE Categories %] > [% USE Koha %] >@@ -933,7 +934,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.validate.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %] > [% PROCESS 'password_check.inc' %] > [% PROCESS 'add_password_check' new_password => 'borrower_password' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >index 727a2a58db..32d2734b80 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >@@ -1,9 +1,10 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]'</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/jquery.rating.css") %] > <style> > .actions a.addtocart { > display: inline; >@@ -59,8 +60,8 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script> >+[% Asset.js("js/overdrive.js") %] >+[% Asset.js("lib/jquery/plugins/jquery.rating.js") %] > <script type="text/javascript"> > var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]"; > var results_per_page = [% OPACnumSearchResults %]; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >index 32e3208582..f799524147 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Change your password</title> >@@ -86,7 +87,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.validate.min_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %] > [% PROCESS 'password_check.inc' %] > [% PROCESS 'add_password_check' new_password => 'Newkey' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >index a08f7c4820..e1216995db 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › >@@ -278,7 +279,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index 3803627763..8c65b2a1b4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnList ) %] > [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %] >@@ -12,7 +13,7 @@ > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %] > [% BLOCK cssinclude %] >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/jquery.rating_[% KOHA_VERSION %].css" /> >+ [% Asset.css("css/jquery.rating.css") %] > [% END %] > [% END %] > >@@ -590,10 +591,10 @@ > [% IF ( LibraryThingForLibrariesID ) %] > <script src="https://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&systype=koha" type="text/javascript"></script> > [% END %] >-[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script>[% END %] >-[% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive_[% KOHA_VERSION %].js"></script>[% END %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >-[% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.highlight-3_[% KOHA_VERSION %].js"></script> >+[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %] >+[% IF ( OverDriveEnabled ) %][% Asset.js("js/overdrive.js") %][% END %] >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] >+[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %] > [% END %]<script type="text/javascript"> > //<![CDATA[ > [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index 25f834c18b..9ad78c3f91 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -215,7 +216,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete selected search history entries?"); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index b5a6496b10..8efbec1e20 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% SET PRIVATE = 1 %] > [% SET PUBLIC = 2 %] >@@ -751,7 +752,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > <script type="text/javascript"> > //<![CDATA[ > var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?"); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >index 5906c83fca..0dff37f6b7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE Branches %] > [% USE AuthorisedValues %] >@@ -273,7 +274,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.checkboxes.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > //<![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 9eabf10dcd..9ce4add254 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE Branches %] >@@ -1043,7 +1044,7 @@ Using this account is not recommended because some parts of Koha will not functi > //]]> > </script> > [% IF Koha.Preference('OverDriveCirculation') %] >- <script type="text/javascript" src="[% interface %]//[% theme %]/js/overdrive_[% KOHA_VERSION %].js"></script> >+ [% Asset.js("js/overdrive.js") %] > <script type="text/JavaScript"> > $(document).ready(function() { > [% IF ( overdrive_error ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt >index e042aee850..f751934f56 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt >@@ -1,3 +1,4 @@ >+[% USE Asset %] > [%# Includes %] > [% USE Koha %] > [% USE KohaDates %] >@@ -28,10 +29,10 @@ > [% ELSE %] > <link rel="shortcut icon" href="[% interface %]/[% theme %]/images/favicon.ico" type="image/x-icon" /> > [% END %] >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/font-awesome/css/font-awesome.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sci_[% KOHA_VERSION %].css" /> >+[% Asset.css("lib/bootstrap/css/bootstrap.min.css") %] >+[% Asset.css("lib/jquery/jquery-ui.css") %] >+[% Asset.css("lib/font-awesome/css/font-awesome.min.css") %] >+[% Asset.css("css/sci.css") %] > [% IF ( Koha.Preference('OPACUserCSS') ) %]<style type="text/css">[% Koha.Preference('OPACUserCSS') %]</style>[% END %] > [% IF ( Koha.Preference('SelfCheckInUserCSS') ) %]<style type="text/css">[% Koha.Preference('SelfCheckInUserCSS') %]</style>[% END %] > <!--[if lt IE 9]> >@@ -40,7 +41,7 @@ > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/modernizr.min.js") %] > </head> > <body id="sci_main" class="sci" onload="dofocus();" onunload="mungeHistory();"> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >index 83454538b1..349cbf5c50 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt >@@ -1,12 +1,13 @@ >+[% USE Asset %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout help</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> >- <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco_[% KOHA_VERSION %].css" /> >+ [% Asset.css("lib/bootstrap/css/bootstrap.min.css") %] >+[% Asset.css("lib/jquery/jquery-ui.css") %] >+[% Asset.css("css/sco.css") %] > [% IF ( OPACUserCSS ) %]<style>[% OPACUserCSS %]</style>[% END %] > [% IF ( SCOUserCSS ) %]<style>[% SCOUserCSS %]</style>[% END %] > <!--[if lt IE 9]> >@@ -15,7 +16,7 @@ > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/modernizr.min.js") %] > </head> > <body id="sco_help" class="sco"> > [% 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 cd87e00dac..191548a7c9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt >@@ -1,16 +1,17 @@ >+[% USE Asset %] > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout › Print Receipt for [% borrowernumber %]</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/print_[% KOHA_VERSION %].css" /> >+[% Asset.css("css/print.css") %] > [% IF stylesheet %] > <link rel="stylesheet" type="text/css" href="[% stylesheet %]" /> > [% END %] > > <!-- JavaScript includes --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/jquery_[% KOHA_VERSION %].js"></script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/global_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/jquery/jquery.js") %] >+[% Asset.js("js/global.js") %] > > [% INCLUDE 'slip-print.inc' %] > >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 8cadb1712f..48274b04f5 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,3 +1,4 @@ >+[% USE Asset %] > [% USE Koha %] > [% USE KohaDates %] > [% USE AudioAlerts %] >@@ -7,9 +8,9 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> > <link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon') ) %][% Koha.Preference('OpacFavicon') %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/bootstrap/css/bootstrap.min_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/sco_[% KOHA_VERSION %].css" /> >+[% Asset.css("lib/bootstrap/css/bootstrap.min.css") %] >+[% Asset.css("lib/jquery/jquery-ui.css") %] >+[% Asset.css("css/sco.css") %] > [% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') %]</style>[% END %] > [% IF ( Koha.Preference('SCOUserCSS') ) %]<style>[% Koha.Preference('SCOUserCSS') %]</style>[% END %] > <!--[if lt IE 9]> >@@ -18,7 +19,7 @@ > <script type="text/javascript"> > function _(s) { return s } // dummy function for gettext > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/lib/modernizr.min_[% KOHA_VERSION %].js"></script> >+[% Asset.js("lib/modernizr.min.js") %] > </head> > <body id="sco_main" class="sco" onload="dofocus();" onunload="mungeHistory();"> > [% INCLUDE 'masthead-sco.inc' %] >diff --git a/t/db_dependent/Koha/Template/Plugin/Asset.t b/t/db_dependent/Koha/Template/Plugin/Asset.t >new file mode 100644 >index 0000000000..0c82af0b06 >--- /dev/null >+++ b/t/db_dependent/Koha/Template/Plugin/Asset.t >@@ -0,0 +1,99 @@ >+#!/usr/bin/env perl >+ >+use Modern::Perl; >+ >+use Test::More tests => 16; >+use Template; >+ >+use C4::Context; >+ >+my $version = C4::Context->preference('Version'); >+ >+my $template = Template->new({ >+ PLUGIN_BASE => 'Koha::Template::Plugin', >+}); >+ >+my $intranet_vars = { >+ interface => '/intranet-tmpl', >+ theme => 'prog', >+}; >+ >+my $opac_vars = { >+ interface => '/opac-tmpl', >+ theme => 'bootstrap', >+}; >+ >+my $output; >+ >+$output = ''; >+$template->process(url_template("js/staff-global.js"), $intranet_vars, \$output); >+is($output, "/intranet-tmpl/prog/js/staff-global_$version.js"); >+ >+$output = ''; >+$template->process(url_template("js/browser.js"), $intranet_vars, \$output); >+is($output, "/intranet-tmpl/js/browser_$version.js"); >+ >+$output = ''; >+$template->process(url_template("css/staff-global.css"), $intranet_vars, \$output); >+is($output, "/intranet-tmpl/prog/css/staff-global_$version.css"); >+ >+$output = ''; >+$template->process(url_template("lib/font-awesome/css/font-awesome.min.css"), $intranet_vars, \$output); >+is($output, "/intranet-tmpl/lib/font-awesome/css/font-awesome.min_$version.css"); >+ >+$output = ''; >+$template->process(url_template("js/global.js"), $opac_vars, \$output); >+is($output, "/opac-tmpl/bootstrap/js/global_$version.js"); >+ >+$output = ''; >+$template->process(url_template("lib/jquery/plugins/jquery.dataTables.min.js"), $opac_vars, \$output); >+is($output, "/opac-tmpl/lib/jquery/plugins/jquery.dataTables.min_$version.js"); >+ >+$output = ''; >+$template->process(url_template("css/opac.css"), $opac_vars, \$output); >+is($output, "/opac-tmpl/bootstrap/css/opac_$version.css"); >+ >+$output = ''; >+$template->process(url_template("lib/emoji-picker/css/emoji.css"), $opac_vars, \$output); >+is($output, "/opac-tmpl/lib/emoji-picker/css/emoji_$version.css"); >+ >+$output = ''; >+$template->process(css_template("css/opac.css"), $opac_vars, \$output); >+like($output, qr/<link .*href="\/opac-tmpl\/bootstrap\/css\/opac_\Q$version\E\.css".*>/); >+like($output, qr/<link .*type="text\/css".*>/); >+like($output, qr/<link .*rel="stylesheet".*>/); >+ >+$output = ''; >+$template->process(\'[% USE Asset %][% Asset.css("css/print.css", { media = "print" }) %]', $opac_vars, \$output); >+like($output, qr/<link .*href="\/opac-tmpl\/bootstrap\/css\/print_\Q$version\E\.css".*>/); >+like($output, qr/<link .*type="text\/css".*>/); >+like($output, qr/<link .*rel="stylesheet".*>/); >+like($output, qr/<link .*media="print".*>/); >+ >+$output = ''; >+$template->process(js_template("js/global.js"), $opac_vars, \$output); >+like($output, qr/<script .*src="\/opac-tmpl\/bootstrap\/js\/global_\Q$version\E\.js".*>/); >+ >+sub url_template { >+ my ($filename) = @_; >+ >+ my $template = "[% USE Asset %][% Asset.url(\"$filename\") %]"; >+ >+ return \$template; >+} >+ >+sub css_template { >+ my ($filename) = @_; >+ >+ my $template = "[% USE Asset %][% Asset.css(\"$filename\") %]"; >+ >+ return \$template; >+} >+ >+sub js_template { >+ my ($filename) = @_; >+ >+ my $template = "[% USE Asset %][% Asset.js(\"$filename\") %]"; >+ >+ return \$template; >+} >-- >2.14.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20538
:
73791
|
73836
|
74048
|
74049
|
74053
|
74054
|
74056
|
74057
|
74058
|
74059
|
74060
|
74061
|
74062
|
74063
|
74171
|
74835