Attachment 68080 Details for Bug 19356 – Bug 19356: Move staff client cart JavaScript to the footer

[patch] Bug 19356: Move staff client cart JavaScript to the footer

Bug-19356-Move-staff-client-cart-JavaScript-to-the.patch (text/plain), 2.37 KB, created by Owen Leonard on 2017-10-13 14:22:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2017-10-13 14:22:22 UTC

Size: 2.37 KB

patch

obsolete

>From 3563d62ea72ac147290df1971039519460305815 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 9 Jan 2017 16:31:19 +0000
>Subject: [PATCH] Bug 19356: Move staff client cart JavaScript to the footer
>
>This patch modifies the staff client cart template so that
>JavaScript is included in the footer instead of the header.
>
>To test, apply the patch and test the JavaScript-driven features of the
>cart: All button controls, DataTables functionality.
>
>Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
>
>Correction for QA: Removed contditional around footer JS (from
>copy-paste) because it will always be true.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>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 30f276c..428e5d4 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 @@
>+[% SET footerjs = 1 %]
> [% BLOCK controls %]
>     <p style="padding: 7px 0; border-top : 1px solid #E8E8E8;">
>         <a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a>
>@@ -31,10 +32,7 @@
>     @import url([% interface %]/[% theme %]/css/print.css);
> </style>
>     [% ELSE %][% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript" src="[% interface %]/[% theme %]/js/cart.js"></script>
>-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
> <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
>-[% INCLUDE 'datatables.inc' %]
> 	[% END %]
> </head>
> [% IF ( print_basket ) %]<body id="cart_basket" class="cart" onload="print();history.back();">[% ELSE %]<body id="cart_basket" class="cart">[% END %]
>@@ -289,5 +287,11 @@
> 
> </div>
> </div>
>-</body>
>+            [% INCLUDE js_includes.inc %]
>+            [% UNLESS ( print_basket ) %]
>+                [% INCLUDE 'datatables.inc' %]
>+                <script type="text/javascript" src="[% interface %]/[% theme %]/js/cart.js"></script>
>+                <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
>+            [% END %]
>+    </body>
> </html>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19356: 67278 | 67386 | 68080