From 81ce8fccc8209b9bffd743b347315b42ad02926c Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 15 Apr 2013 11:11:20 +0200 Subject: [PATCH] Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts Content-Type: text/plain; charset=utf-8 Allow a relative path (within theme/css) in intranetstylesheet too. Allow a full path, local or remote with http(s), in intranetcolorstylesheet. This restores consistency between opac and staff. Test plan: First: the patch with the db revision should have been applied. And also the updatestructure step from the web installer should have been run. Clear intranetstylesheet. Check included stylesheet with page source in browser. Enter a full path with http or / in intranetstylesheet. Check again. Enter a relative path (such as staff-global.css). Check again. Clear intranetcolorstylesheet. Check if there is no reference with page source. Enter a full path with http or / in intranetcolorstylesheet. Check reference. Enter a relative path (such as blue.css). Check again. --- .../prog/en/includes/doc-head-close.inc | 11 ++++++++--- .../en/modules/admin/preferences/staff_client.pref | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 7c9722c..2def80d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -3,10 +3,11 @@ -[% IF ( intranetstylesheet ) %] +[% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %] +[% IF (intranetstylesheet.match('^https?:|^\/')) %] [% ELSE %] - + [% END %] [% IF ( bidi ) %] @@ -29,7 +30,11 @@ [% IF ( intranetcolorstylesheet ) %] - + [% IF (intranetcolorstylesheet.match('^https?:|^\/')) %] + + [% ELSE %] + + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref index 9754a47..462286a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref @@ -11,10 +11,10 @@ Staff Client: class: url - . - - - Include the stylesheet at + - Use the CSS stylesheet - pref: intranetstylesheet class: url - - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with http://.) + - on all pages in the staff interface, instead of the default css (used when leaving this field blank). Enter just a filename, a full local path or a complete URL starting with http:// (if the file lives on a remote server). Please note that if you just enter a filename, the file should be in the css subdirectory for each active theme and language within the Koha templates directory. A full local path is expected to start from your HTTP document root. - - "Use the following JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/:" - pref: IntranetSlipPrinterJS @@ -26,10 +26,10 @@ Staff Client: type: textarea class: code - - - Include the stylesheet /css/ + - Include the additional CSS stylesheet - pref: intranetcolorstylesheet class: file - - on all pages in the staff interface. (Leave blank to disable.) + - to override specified settings from the default stylesheet (leave blank to disable.) Enter just a filename, a full local path or a complete URL starting with http:// (if the file lives on a remote server). Please note that if you just enter a filename, the file should be in the css subdirectory for each active theme and language within the Koha templates directory. A full local path is expected to start from your HTTP document root. - - Use include files from the - pref: intranet_includes -- 1.7.7.6