@@ -, +, @@
intranetcolorstylesheet behave exactly like their opac
counterparts
---
.../prog/en/includes/doc-head-close.inc | 11 ++++++++---
.../en/modules/admin/preferences/staff_client.pref | 8 ++++----
2 files changed, 12 insertions(+), 7 deletions(-)
--- 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,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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
+++ a/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
--