From ed7543287b5e0bb3fadf851d761eb116a79ea727 Mon Sep 17 00:00:00 2001 From: Julian Maurice 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 '; +} + +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' %] - - - - +[% 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") %] - +[% 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 %] - +[% 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 @@ - - - - - +[% 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 ) %][% END %] +[% IF ( bidi ) %][% Asset.css("css/right-to-left.css") %][% END %] [% IF ( login ) %] - + [% Asset.css("css/login.css") %] [% END %] [% IF ( IntranetUserCSS ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/greybox.inc index 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 %] - - - - +[% 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' %] Online help - - +[% Asset.css("lib/jquery/jquery-ui-1.11.4.min.css") %] +[% Asset.css("css/print.css", { media = "print" }) %] [% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %] - + [% Asset.css("css/right-to-left.css") %] [% END %] - - - - +[% 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("js/staff-global.js") %] - +[% Asset.css("css/help.css") %] 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?:|^\/')) %] [% ELSE %] - + [% Asset.css("css/" _ intranetstylesheet) %] [% END %] 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 @@ [% END %] - - - - - - - - +[% 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") %] - - +[% Asset.js("js/staff-global.js") %] +[% Asset.js("js/commons.js") %] [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] @@ -52,11 +53,11 @@ //]]> - + [% Asset.js("js/basket.js") %] [% END %] [% IF LocalCoverImages %] - + [% Asset.js("js/localcovers.js") %] - - +[% Asset.css("lib/select2/css/select2.min.css") %] +[% Asset.css("css/select2.css") %] +[% Asset.js("lib/tiny_mce/tiny_mce.js") %] - + [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") %] + [% Asset.js("js/acquisitions-menu.js") %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("js/acq.js") %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] - - - - +[% 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 ) %] - - - - +[% 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") %] - +[% Asset.css("css/datatables.css") %] @@ -186,7 +187,7 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] - + [% Asset.js("js/autocomplete/patrons.js") %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("js/acquisitions-menu.js") %] + [% Asset.js("js/acq.js") %] [% INCLUDE 'additem.js.inc' %] - - - + [% Asset.js("js/additem.js") %] + [% Asset.js("js/cataloging.js") %] + [% Asset.js("js/prevent_submit.js") %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'additem.js.inc' %] - - - + [% Asset.js("js/additem.js") %] + [% Asset.js("js/cataloging.js") %] + [% Asset.js("js/prevent_submit.js") %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] + [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/acquisitions-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% 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' %] Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %] - +[% Asset.css("css/datatables.css") %] [% INCLUDE 'doc-head-close.inc' %] @@ -85,9 +86,9 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/admin-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("js/admin-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/tiny_mce/tiny_mce.js") %] - + [% Asset.js("js/admin-menu.js") %] + [% Asset.js("js/messaging-preference-form.js") %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - + [% 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' %] 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 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -174,7 +175,7 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/admin-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% 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 @@ [% MACRO jsinclude BLOCK %] - + [% 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 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/admin-menu.js") %] + [% Asset.js("js/admin-menu.js") %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] + [% Asset.js("js/admin-menu.js") %] + [% 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' %] 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 @@ -74,7 +75,7 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/admin-menu.js") %] + [% Asset.js("js/admin-menu.js") %] + [% 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 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/admin-menu.js") %] - + [% 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 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] [% ELSE %][% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] [% END %] [% IF ( print_basket ) %][% ELSE %][% END %] @@ -295,8 +296,8 @@ [% INCLUDE js_includes.inc %] [% UNLESS ( print_basket ) %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("js/cart.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% END %] 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' %] 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 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -858,7 +859,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] - + [% Asset.js("js/catalog.js") %] [% INCLUDE 'greybox.inc' %] [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectProfile') && ( normalized_isbn || normalized_upc ) ) %] - + [% Asset.js("https://imageserver.ebscohost.com/novelistselect/ns2init.js") %] [% END %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] [% INCLUDE 'browser-strings.inc' %] [% INCLUDE 'columns_settings.inc' %] - - + [% Asset.js("js/browser.js") %] + [% Asset.js("js/table_filters.js") %] + [% Asset.js("js/catalog.js") %] - + [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] + [% Asset.js("js/catalog.js") %] [% INCLUDE 'browser-strings.inc' %] - + [% Asset.js("js/browser.js") %] + [% Asset.js("js/catalog.js") %] [% INCLUDE 'browser-strings.inc' %] - + [% Asset.js("js/browser.js") %] - - + [% Asset.js("js/browser.js") %] + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] - +[% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] +[% Asset.js("js/cataloging.js") %] [% INCLUDE 'browser-strings.inc' %] - +[% Asset.js("js/browser.js") %] - +[% Asset.css("css/addbiblio.css") %] [% INCLUDE 'select2.inc' %] [% IF ( bidi ) %] - + [% Asset.css("css/right-to-left.css") %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 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' %] Koha › Cataloging › [% title |html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber %]) › Items - +[% Asset.css("css/datatables.css") %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - +[% Asset.js("js/cataloging.js") %] [% INCLUDE 'columns_settings.inc' %] [% INCLUDE 'browser-strings.inc' %] - +[% Asset.js("js/browser.js") %] - +[% Asset.css("css/addbiblio.css") %] [% INCLUDE 'select2.inc' %] [% IF ( bidi ) %] - + [% Asset.css("css/right-to-left.css") %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index fbf271b69c..5937800702 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -1,14 +1,15 @@ +[% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Editor [% INCLUDE 'doc-head-close.inc' %] - - - - +[% Asset.css("css/cateditor.css") %] +[% Asset.css("css/datatables.css") %] +[% Asset.css("lib/codemirror/codemirror.css") %] +[% Asset.css("css/humanmsg.css") %] [% IF ( bidi ) %] - + [% Asset.css("css/right-to-left.css") %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index 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; } [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/merge-record.js") %] [% INCLUDE 'merge-record-strings.inc' %] + [% Asset.js("js/xmlControlfield.js") %] + [% Asset.js("js/xmlControlfield.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'z3950_search.inc' %] - + [% 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' %] Koha › Z39.50/SRU search results [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -187,8 +188,8 @@ [% IF ( numberpending ) %]

Still [% numberpending %] servers to search

[% END %] [% MACRO jsinclude BLOCK %] - - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("js/z3950_search.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] [% INCLUDE 'timepicker.inc' %] - - - - - + [% 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") %] - + [% 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 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] 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 %] [% IF (AllowOfflineCirculation) %] @@ -216,9 +217,9 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - - - + [% 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' %] + [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] [% INCLUDE 'timepicker.inc' %] + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/tools-menu.js") %] +[% Asset.js("lib/tiny_mce/tiny_mce.js") %] [% INCLUDE intranetstylesheet.inc %] - +[% Asset.css("css/help.css") %]

Online Help

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' %] Koha › ILL requests › [% INCLUDE 'doc-head-close.inc' %] - - +[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] +[% Asset.css("css/datatables.css") %] [% INCLUDE 'datatables.inc' %] - +[% Asset.css("css/datatables.css") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] - + [% Asset.js("lib/jquery/jquery-2.2.3.min.js") %] + [% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") %] + [% Asset.js("js/members-menu.js") %] + [% 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 @@ [% MACRO jsinclude BLOCK %] - + [% 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 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/members-menu.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/members-menu.js") %] - + [% Asset.js("js/members-menu.js") %] + [% Asset.js("lib/jquery/plugins/jquery.treeview.pack.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] [% INCLUDE 'calendar.inc' %] - + [% Asset.js("js/members-menu.js") %] - - + [% 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 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/members-menu.js") %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") %] [% INCLUDE 'timepicker.inc' %] - - - - - - + [% 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") %] + [% 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' %] Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] [% IF ( saved1 ) %] - + [% Asset.css("css/datatables.css") %] [% END %] 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' %] Koha › Reports › Lost items [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -167,10 +168,10 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] [% INCLUDE 'columns_settings.inc' %] - - + [% Asset.js("js/table_filters.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] +[% Asset.js("js/circ-patron-search-results.js") %] + [% 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' %] Koha › Tools › Rotating collections › Collection [% colTitle %] ’ Add or remove items @@ -121,8 +122,8 @@ [% MACRO jsinclude BLOCK %] - - + [% 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' %] Koha › Tools › Rotating collections › @@ -137,8 +138,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/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 [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -67,8 +68,8 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - - + [% 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 @@ [% MACRO jsinclude BLOCK %] - - + [% 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 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] 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' %] Koha › Serials › Claims [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] 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' %] Koha › Serials › Serial collection information for [% bibliotitle %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -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?"); - - + [% Asset.js("js/serials-toolbar.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] - +[% Asset.js("js/cataloging.js") %] +[% Asset.js("js/prevent_submit.js") %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/serials-toolbar.js") %] - + [% Asset.js("js/serials-toolbar.js") %] - - + [% 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?"); - + [% Asset.js("js/serials-toolbar.js") %] + [% 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 @@ [% INCLUDE 'doc-head-close.inc' %] [% IF ( op_else ) %] - + [% Asset.css("css/datatables.css") %] [% END %] [% IF ( op_else ) %] 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' %] Home › Tools › Tags › [% IF ( do_it ) %]Review › [% ELSE %]Review tags[% END %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -184,10 +185,10 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("js/pages/batchMod.js") %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] - - +[% Asset.js("js/background-job-progressbar.js") %] +[% Asset.js("js/cataloging.js") %] +[% Asset.css("css/datatables.css") %] [% INCLUDE 'datatables.inc' %] - - +[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] +[% Asset.js("js/pages/batchMod.js") %] + [% 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' %] Koha › Tools › Batch record deletion [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -177,9 +178,9 @@ [% MACRO jsinclude BLOCK %] - + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("js/background-job-progressbar.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("js/tools-menu.js") %] - + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("js/tools-menu.js") %] [% IF ( opac_news_count ) %] [% INCLUDE 'datatables.inc' %] [% END %] - + [% Asset.js("lib/tiny_mce/tiny_mce.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] + [% Asset.js("lib/jquery/plugins/jquery.insertatcaret.js") %] - + [% Asset.js("js/tools-menu.js") %] +[% Asset.js("js/background-job-progressbar.js") %] [% INCLUDE 'datatables.inc' %] + [% Asset.js("js/tools-menu.js") %] - + [% 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' %] Koha › Tools › Batch patron modification [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] @@ -296,7 +297,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/tools-menu.js") %] - + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/members-menu.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - - + [% Asset.js("lib/jquery/plugins/dataTables.fnReloadAjax.js") %] + [% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'calendar.inc' %] - + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("lib/jsdiff/jsdiff.min.js") %] - - + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/background-job-progressbar.js") %] + [% Asset.js("js/file-upload.js") %] - - + [% Asset.js("js/tools-menu.js") %] + [% Asset.js("js/background-job-progressbar.js") %] + [% Asset.js("js/file-upload.js") %] + [% Asset.js("js/tools-menu.js") %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("js/file-upload.js") %] + [% 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' %] 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 %] [% INCLUDE 'doc-head-close.inc' %] - +[% Asset.css("css/datatables.css") %] [% BLOCK list_permissions %] @@ -415,7 +416,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] - + [% Asset.js("lib/jquery/plugins/jquery.dataTables.columnFilter.js") %] [% IF print %] - + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] + [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %] [% END %] +[% USE Asset %] +[% Asset.js("lib/jquery/plugins/jquery.dataTables.min.js") %] - \ 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 %] [% IF ( bidi ) %] - + [% Asset.css("lib/bootstrap/css/bootstrap-rtl.min.css") %] [% ELSE %] - + [% Asset.css("lib/bootstrap/css/bootstrap.min.css") %] [% END %] [% IF ( bidi ) %] - + [% Asset.css("lib/jquery/jquery-ui-rtl.css") %] [% ELSE %] - + [% 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?:|^\/')) %] [% ELSE %] - + [% Asset.css("css/" _ opaclayoutstylesheet) %] [% END %] [% IF ( OpacAdditionalStylesheet ) %] [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %] @@ -31,9 +32,9 @@ [% IF ( opac_css_override ) %] [% END %] - +[% Asset.css("css/print.css", { media = "print" }) %] [% IF ( bidi ) %] - + [% Asset.css("css/right-to-left.css") %] [% END %] [% IF ( OPACUserCSS ) %][% END %] [% IF SCO_login %] @@ -51,7 +52,7 @@ - - +[% 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 %] - - - - +[% 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 @@ - - +[% Asset.js("lib/jquery/jquery.js") %] +[% Asset.js("lib/jquery/jquery-ui.js") %] - - +[% Asset.js("lib/bootstrap/js/bootstrap.min.js") %] +[% Asset.js("js/global.js") %] - +[% Asset.js("js/amazonimages.js") %] [% END %] - - - - +[% 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") %] [% IF Koha.Preference( 'opacbookbag' ) == 1 %] - + [% Asset.js("js/basket.js") %] [% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %] - + [% Asset.js("js/basket.js") %] [% ELSE %] [% END %] -[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% END %][% ELSE %][% END %] +[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% Asset.js("js/tags.js") %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - + [% Asset.js("js/google-jackets.js") %] [% END %] [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] - + [% Asset.js("js/coce.js") %] + [% Asset.js("js/openlibrary.js") %] + [% Asset.js("js/localcovers.js") %] + [% Asset.js("js/bakertaylorimages.js") %] - + [% Asset.js("js/googleindictransliteration.js") %] [% END %] [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] @@ -246,7 +247,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); [% END %] - +[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] - +[% Asset.js("lib/jquery/plugins/jquery.deserialize.min.js") %] +[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") %] +[% Asset.js("/opac-tmpl/lib/jquery/plugins/jquery.jstree.js") %] + [% Asset.js("/opac-tmpl/lib/jquery/plugins/jquery.jstree.js") %] [% END %] [% END %] -[% IF ( OpacStarRatings != 'disable' ) %][% END %] +[% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") %][% END %] -[% IF ( OpacHighlightedWords ) %][% END %] +[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") %][% END %] + [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %] [% PROCESS 'password_check.inc' %] [% PROCESS 'add_password_check' new_password => 'borrower_password' %] - +[% Asset.js("js/overdrive.js") %] +[% Asset.js("lib/jquery/plugins/jquery.rating.js") %] + [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %] [% PROCESS 'password_check.inc' %] [% PROCESS 'add_password_check' new_password => 'Newkey' %] +[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% END %] -[% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %][% END %] -[% IF ( OverDriveEnabled ) %][% END %] - -[% IF ( OpacHighlightedWords ) %] +[% 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 %] +[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] +[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] +[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %] [% INCLUDE 'datatables.inc' %] [% IF Koha.Preference('OverDriveCirculation') %] - + [% Asset.js("js/overdrive.js") %] - +[% 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 @@ - - - +[% Asset.css("lib/bootstrap/css/bootstrap.min.css") %] +[% Asset.css("lib/jquery/jquery-ui.css") %] +[% Asset.css("css/sco.css") %] [% IF ( Koha.Preference('OPACUserCSS') ) %][% END %] [% IF ( Koha.Preference('SCOUserCSS') ) %][% END %]