Bugzilla – Attachment 71676 Details for
Bug 19641
Move patron templates JavaScript to the footer
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19641: (follow-up) Move patron templates to the footer
Bug-19641-follow-up-Move-patron-templates-to-the-f.patch (text/plain), 13.88 KB, created by
Jonathan Druart
on 2018-02-15 18:11:19 UTC
(
hide
)
Description:
Bug 19641: (follow-up) Move patron templates to the footer
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-02-15 18:11:19 UTC
Size:
13.88 KB
patch
obsolete
>From 472b41db3b666ec253c21fa12bf28d4ca9af7049 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 15 Feb 2018 15:09:35 -0300 >Subject: [PATCH] Bug 19641: (follow-up) Move patron templates to the footer > >Fix bad merge conflict with bug 12904 >--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt | 2 +- > .../intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt | 4 ++-- > 17 files changed, 19 insertions(+), 19 deletions(-) > >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 2195883c66..28efdaab5c 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 >@@ -3,7 +3,7 @@ > <title>Koha › Administration › Library groups</title> > [% INCLUDE 'doc-head-close.inc' %] > <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" /> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(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 542b5f6642..b266338ba8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1103,7 +1103,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% END %] > }); > </script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >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 52ed3156e8..660fd93a7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt >@@ -60,7 +60,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% 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 2ae59c3845..960fc620d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -73,7 +73,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% 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 5ea23dd8d6..70f727a182 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -44,7 +44,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >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 0d73773da2..947b8d20ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -84,7 +84,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > $(document).ready(function(){ > $(".confirmdelete").on("click", function(){ >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 71235a7524..ae36321bf2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -425,7 +425,7 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <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 21d6c555bf..72adcf6d06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -57,7 +57,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <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 cbcf2989cc..7817042d51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -70,7 +70,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <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-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt >index aaa11107ca..d27001deae 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 >@@ -90,7 +90,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <script type="text/JavaScript"> > > function generate_password() { >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 57e1b345fc..3a7819990a 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 >@@ -186,7 +186,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <script type="text/javascript"> > $(function() { > $( "#pending_updates" ).accordion(); >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 b0b39996ee..c23ba1b9e1 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 >@@ -77,7 +77,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >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 e85f517385..5813babaa9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -172,7 +172,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > <script type= "text/javascript"> > $(document).ready(function() { > $('#payindivfine, #woindivfine, #payfine').preventDoubleFormSubmit(); >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 ace0c15a1c..5484c2fc95 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 >@@ -100,7 +100,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> > $(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 9311d9af18..1cec765411 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 >@@ -84,7 +84,7 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' %] >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 ae5765a676..576356f079 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 >@@ -240,8 +240,8 @@ Alternatively, you can supply dates in ISO format. > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <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> > <script type="text/javascript"> > $(document).ready(function() { > [%# Make date fields have the datepicker %] >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 fa0db25e97..53484c73c7 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 >@@ -140,8 +140,8 @@ > </div> > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/tools-menu.js"></script> >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> >+ <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> > <script type="text/javascript"> > $(document).ready(function() { > $("#zipfile").click(function(){ >-- >2.11.0
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 19641
:
69200
|
69415
|
70428
|
70429
|
70433
|
70720
|
70723
|
70724
|
70725
|
70726
|
70953
|
71289
|
71290
|
71291
|
71292
| 71676 |
71677