Bug 21784: Clean up js_includes.inc

[koha-equinox.git] / koha-tmpl / intranet-tmpl / prog / en / includes / js_includes.inc

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 414425a..f91f734 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
@@ -1,7 +1,10 @@
+[% USE raw %]
+[% USE Asset %]
 [% USE AudioAlerts %]
+[% USE To %]
 [%# Prevent XFS attacks -%]
 [% UNLESS popup %]
-    <script type="text/javascript">
+    <script>
        if (self === top) {
            var antiClickjack = document.getElementById("antiClickjack");
            antiClickjack.parentNode.removeChild(antiClickjack);
@@ -11,30 +14,27 @@
     </script>
 [% END %]
 
-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script>
-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script>
+[% Asset.js("lib/jquery/jquery-2.2.3.min.js") | $raw %]
+[% Asset.js("lib/jquery/jquery-migrate-1.3.0.min.js") | $raw %]
+[% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %]
+[% Asset.js("lib/shortcut/shortcut.js") | $raw %]
+[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %]
+[% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") | $raw %]
+[% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
+[% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
 <!-- koha core js -->
-<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
+[% Asset.js("js/staff-global.js") | $raw %]
+[% Asset.js("js/commons.js") | $raw %]
 
 [% INCLUDE 'validator-strings.inc' %]
-[% PROCESS 'html_helpers.inc' %]
 [% IF ( IntranetUserJS ) %]
-    <script type="text/javascript">
-    //<![CDATA[
-    [% IntranetUserJS %]
-    //]]>
+    <script>
+    [% IntranetUserJS | $raw %]
     </script>
 [% END %]
 
 [% IF ( virtualshelves || intranetbookbag ) %]
-<script type="text/javascript">
-    //<![CDATA[
+    <script>
         var MSG_BASKET_EMPTY = _("Your cart is currently empty");
         var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
         var MSG_RECORD_ADDED = _("This item has been added to your cart");
@@ -49,27 +49,22 @@
         var MSG_ITEM_NOT_IN_CART = _("Add to cart");
         var MSG_ITEM_IN_CART = _("In your cart");
         var MSG_RECORD_REMOVED = _("The item has been removed from your cart");
-    //]]>
     </script>
 
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/basket.js"></script>
+    [% Asset.js("js/basket.js") | $raw %]
 [% END %]
 
 [% IF LocalCoverImages %]
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/localcovers.js"></script>
-    <script type="text/javascript">
-        //<![CDATA[
-            var NO_LOCAL_JACKET = _("No cover image available");
-        //]]>
+    [% Asset.js("js/localcovers.js") | $raw %]
+    <script>
+        var NO_LOCAL_JACKET = _("No cover image available");
     </script>
 [% END %]
 
 [% IF Koha.Preference('AudioAlerts') || AudioAlertsPage %]
-    <script type="text/javascript">
-        //<![CDATA[
-            var AUDIO_ALERT_PATH = '[% interface %]/[% theme %]/sound/';
-            var AUDIO_ALERTS = JSON.parse( '[% AudioAlerts.AudioAlerts | replace( "'", "\\'" ) | replace( '"', '\\"' ) %]' );
-        //]]>
+    <script>
+        var AUDIO_ALERT_PATH = '[% interface | html %]/[% theme | html %]/sound/';
+        var AUDIO_ALERTS = JSON.parse( "[% To.json(AudioAlerts.AudioAlerts) | $raw %]" );
 
         $( document ).ready(function() {
             if ( AUDIO_ALERTS ) {
@@ -87,7 +82,7 @@
 
 [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
     [% IF ( CircAutocompl ) %]
-        <script type="text/javascript">
+        <script>
             $(document).ready(function(){
                 var obj = $( "#findborrower" ).autocomplete({
                     source: "/cgi-bin/koha/circ/ysearch.pl",