@@ -, +, @@ Preferences - WYSIWYG editor - Confirmation messages - Table sorting - Multiple selects (CoceProviders for example) --- .../prog/en/modules/admin/preferences.tt | 93 +++++++------ .../prog/en/modules/admin/systempreferences.tt | 152 +++++++++++---------- 2 files changed, 123 insertions(+), 122 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -1,58 +1,12 @@ [% USE Koha %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › System preferences [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] -[% IF ( bidi ) %] - -[% END %] - - - - - - -[%# Add WYSIWYG editor for htmlarea system preferences %] -[% INCLUDE 'wysiwyg-systempreferences.inc' %] [% INCLUDE 'header.inc' %] @@ -195,4 +149,49 @@ [% INCLUDE 'prefs-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + + + + + + + [%# Add WYSIWYG editor for htmlarea system preferences %] + [% INCLUDE 'wysiwyg-systempreferences.inc' %] +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -1,85 +1,12 @@ [% USE Koha %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% IF ( add_form ) %] System preferences › [% IF ( modify ) %]Modify system preference '[% searchfield %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences › Data added[% END %] [% IF ( delete_confirm ) %] System preferences › [% searchfield %] › Confirm deletion of parameter '[% searchfield %]'[% END %][% IF ( delete_confirmed ) %] System preferences › Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %] [% INCLUDE 'doc-head-close.inc' %] -[%# Add WYSIWYG editor for htmlarea system preferences %] -[% INCLUDE 'wysiwyg-systempreferences.inc' %] -[% IF ( else ) %] -[% INCLUDE 'datatables.inc' %] - -[% END %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'prefs-admin-search.inc' %] @@ -449,4 +376,79 @@ [% INCLUDE 'prefs-menu.inc' %] + +[% MACRO jsinclude BLOCK %] + [%# Add WYSIWYG editor for htmlarea system preferences %] + [% INCLUDE 'wysiwyg-systempreferences.inc' %] + [% IF ( else ) %] + [% INCLUDE 'datatables.inc' %] + + [% END %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] --