@@ -, +, @@ help-top.inc --- .../prog/en/includes/doc-head-close.inc | 16 +--------------- .../intranet-tmpl/prog/en/includes/help-top.inc | 10 +--------- .../prog/en/includes/intranetstylesheet.inc | 15 +++++++++++++++ .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 9 +-------- 4 files changed, 18 insertions(+), 32 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -3,12 +3,7 @@ -[% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %] -[% IF (intranetstylesheet.match('^https?:|^\/')) %] - -[% ELSE %] - -[% END %] +[% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %] [% END %] @@ -28,15 +23,6 @@ [% END %] - -[% IF ( intranetcolorstylesheet ) %] - [% IF (intranetcolorstylesheet.match('^https?:|^\/')) %] - - [% ELSE %] - - [% END %] -[% END %] - --- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc @@ -4,21 +4,13 @@ -[% IF ( intranetstylesheet ) %] - -[% ELSE %] - -[% END %] +[% INCLUDE intranetstylesheet.inc %] [% IF ( bidi ) %] [% END %] - -[% IF ( intranetcolorstylesheet ) %] - -[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc @@ -0,0 +1,15 @@ +[% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %] +[% IF (intranetstylesheet.match('^https?:|^\/')) %] + +[% ELSE %] + +[% END %] + + +[% IF ( intranetcolorstylesheet ) %] + [% IF (intranetcolorstylesheet.match('^https?:|^\/')) %] + + [% ELSE %] + + [% END %] +[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt @@ -21,14 +21,7 @@ tinyMCE.init({ }); //]]> -[% IF ( intranetstylesheet ) %] - -[% ELSE %] - -[% END %] -[% IF ( intranetcolorstylesheet ) %] - -[% END %] +[% INCLUDE intranetstylesheet.inc %] --