Attachment 18110 Details for Bug 10052 – Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts

[patch] Bug 10052: Make intranetstylesheet and intranetcolorstylesheet behave exactly like their opac counterparts

Bug-10052-Make-intranetstylesheet-and-intranetcolo.patch (text/plain), 5.33 KB, created by Marcel de Rooy on 2013-05-13 07:16:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2013-05-13 07:16:09 UTC

Size: 5.33 KB

patch

obsolete

>From cfb7d6a5029a34f7075ae92289b312401e652bd0 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>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.
>
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>---
> .../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 @@
> <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" />
> <link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" />
> <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
>-[% IF ( intranetstylesheet ) %]
>+[% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %]
>+[% IF (intranetstylesheet.match('^https?:|^\/')) %]
>     <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
> [% ELSE %]
>-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
>+    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetstylesheet %]" />
> [% END %]
> [% IF ( bidi ) %]
>    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
>@@ -29,7 +30,11 @@
> 
> 
> [% IF ( intranetcolorstylesheet ) %]
>-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" />
>+    [% IF (intranetcolorstylesheet.match('^https?:|^\/')) %]
>+        <link rel="stylesheet" type="text/css" href="[% intranetcolorstylesheet %]" />
>+    [% ELSE %]
>+        <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" />
>+    [% 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 <code>http://</code>.)
>+            - 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 <code>http://</code> (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 <code>/css/</code>
>+            - 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 <code>http://</code> (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

Actions: View | Diff | Splinter Review

Attachments on bug 10052: 17441 | 17442 | 17443 | 17444 | 17445 | 17446 | 17465 | 17918 | 17919 | 17920 | 18109 | 18110 | 18111 | 18112 | 18124 | 18125 | 18126 | 18127