@@ -, +, @@ The rest --- .../prog/en/includes/popup-bottom.inc | 4 + .../prog/en/modules/admin/clone-rules.tt | 2 + .../prog/en/modules/admin/currency.tt | 81 ++--- .../prog/en/modules/admin/edi_accounts.tt | 5 + .../prog/en/modules/admin/edi_ean_accounts.tt | 5 + .../prog/en/modules/admin/itemtypes.tt | 1 + .../prog/en/modules/admin/localization.tt | 375 +++++++++++---------- .../prog/en/modules/admin/sru_modmapping.tt | 56 +-- 8 files changed, 276 insertions(+), 253 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc @@ -1,2 +1,6 @@ + [% IF ( footerjs ) %] + [% INCLUDE js_includes.inc %] + [% jsinclude # Parse the page template's JavaScript block if necessary %] + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -1,4 +1,5 @@ [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Circulation and fine rules › Clone circulation and fine rules [% INCLUDE 'doc-head-close.inc' %] @@ -64,4 +65,5 @@ [% INCLUDE 'admin-menu.inc' %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -1,6 +1,7 @@ [% USE KohaDates %] [% USE ColumnsSettings %] [% USE HtmlTags %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Currencies & Exchange rates › [% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %] @@ -8,50 +9,12 @@ [% IF op == 'list' %]Currencies[% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'columns_settings.inc' %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'currencies-admin-search.inc' %] - - + +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] + +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -1,3 +1,4 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › EDI accounts [% IF acct_form %] @@ -322,4 +323,8 @@ [% INCLUDE 'admin-menu.inc' %] </div> </div> + +[% MACRO jsinclude BLOCK %] + <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu.js"></script> +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -1,3 +1,4 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Administration › Library EANs [% IF ean_form %] @@ -168,4 +169,8 @@ [% INCLUDE 'admin-menu.inc' %] </div> </div> + +[% MACRO jsinclude BLOCK %] + <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu.js"></script> +[% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -422,4 +422,5 @@ Item types administration }); </script> [% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt @@ -1,193 +1,10 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Localization [% INCLUDE 'doc-head-close.inc' popup => 1 %] -[% INCLUDE 'greybox.inc' %] -[% INCLUDE 'datatables.inc' %] - +
@@ -233,5 +50,189 @@
- - + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + +[% END %] +[% INCLUDE 'popup-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt @@ -1,32 +1,7 @@ +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › SRU search fields mapping [% INCLUDE 'doc-head-close.inc' %] - - @@ -95,4 +70,31 @@ -[% INCLUDE 'intranet-bottom.inc' %] +[% MACRO jsinclude BLOCK %] + + +[% END %] + +[% INCLUDE 'popup-bottom.inc' %] --