@@ -, +, @@ Additional tools - Calendar - CSV profiles - Log viewer - News - Task scheduler - Edit quotes for QOTD feature - Upload --- .../prog/en/modules/tools/csv-profiles.tt | 56 +- .../prog/en/modules/tools/holidays.tt | 402 +++++++------- .../prog/en/modules/tools/koha-news.tt | 134 ++--- .../prog/en/modules/tools/quotes-upload.tt | 602 ++++++++++----------- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 352 ++++++------ .../prog/en/modules/tools/scheduler.tt | 21 +- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 323 +++++------ .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 19 +- 8 files changed, 969 insertions(+), 940 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -1,28 +1,7 @@ -[% INCLUDE 'doc-head-open.inc' %]Koha › Tools › CSV export profiles[% INCLUDE 'doc-head-close.inc' %] - +[% SET footerjs = 1 %] +[% INCLUDE 'doc-head-open.inc' %] +Koha › Tools › CSV export profiles +[% INCLUDE 'doc-head-close.inc' %] @@ -304,4 +283,31 @@ function reloadPage(p) { [% INCLUDE 'tools-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -1,207 +1,9 @@ [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › [% Branches.GetName( branch ) %] calendar [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] -[% INCLUDE 'datatables.inc' %] - - - - [% IF ( plugin ) %] @@ -402,4 +244,165 @@ $(document).ready(function() { [% END %] + +[% MACRO jsinclude BLOCK %] + + [% INCLUDE 'datatables.inc' %] + + + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% USE AuthorisedValues %] [% USE Branches %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › @@ -11,8 +12,8 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] + [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] @@ -56,12 +57,12 @@ [% END %] [% BLOCK translate_log_interface %] -[% SWITCH interface %] +[% SWITCH log_interface %] [% CASE 'INTRANET' %]Intranet [% CASE 'OPAC' %]OPAC [% CASE 'SIP' %]SIP [% CASE 'COMMANDLINE' %]Command-line -[% CASE %][% interface %] +[% CASE %][% log_interface %] [% END %] [% END %] @@ -145,9 +146,9 @@ [% FOREACH interf IN [ 'INTRANET' 'OPAC' 'SIP' 'COMMANDLINE' ] %] [% IF interfaces.grep(interf).size %] - + [% ELSE %] - + [% END %] [% END %] @@ -244,7 +245,7 @@ [% loopro.info |html %] [% END %] - [% PROCESS translate_log_interface interface=loopro.interface %] + [% PROCESS translate_log_interface log_interface=loopro.interface %] [% END %] @@ -276,4 +277,10 @@ [% END %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'calendar.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --