Attachment 18126 Details for Bug 10052 – [PASSED QA] Bug 10052 Followup for edithelp.tt and help-top.inc

[patch] [PASSED QA] Bug 10052 Followup for edithelp.tt and help-top.inc

PASSED-QA-Bug-10052-Followup-for-edithelptt-and-he.patch (text/plain), 6.49 KB, created by Katrin Fischer on 2013-05-14 06:29:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-05-14 06:29:50 UTC

Size: 6.49 KB

patch

obsolete

>From f6fbc22b83fd4399e2fa86ac18ea9397e62fe0a1 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Mon, 15 Apr 2013 13:01:45 +0200
>Subject: [PATCH] [PASSED QA] Bug 10052 Followup for edithelp.tt and
> help-top.inc
>
>A grep on the stylesheet names revealed that similar code was used in those
>template files.
>This patch moves the code from doc-head-close.inc to a new include file.
>Now, doc-head-close and the help templates refer to that one file.
>
>Test plan:
>If you tested the preceding two patches, now you only need to:
>1) Check included css via page source in browser from staff main page.
>2) Check it also from some other location.
>3) Check again from Help: e.g. /cgi-bin/koha/help.pl
>4) Check again from Edit Help: /cgi-bin/koha/edithelp.pl
>
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Template only, no string changes.
>Tested according to test plan.
>---
> .../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
>
>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 2def80d..8db3b2a 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,12 +3,7 @@
> <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" />
>-[% 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/[% intranetstylesheet %]" />
>-[% END %]
>+[% INCLUDE intranetstylesheet.inc %]
> [% IF ( bidi ) %]
>    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
> [% END %]
>@@ -28,15 +23,6 @@
>     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/wizard.css" />
> [% END %]
> 
>-
>-[% IF ( 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 %]
>-
>  
> <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
> <script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>index 72acc21..a530854 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
>@@ -4,21 +4,13 @@
> <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" />
> <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" />
> <link rel="stylesheet" type="text/css" media="print" href="[% themelang %]/css/print.css" />
>-[% IF ( intranetstylesheet ) %]
>-<link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
>-[% ELSE %]
>-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
>-[% END %]
>+[% INCLUDE intranetstylesheet.inc %]
> [% IF ( bidi ) %]
>    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
> [% END %]
> <script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
> <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui.js"></script>
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.hotkeys.min.js"></script>
>-
>-[% IF ( intranetcolorstylesheet ) %]
>-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" />
>-[% END %]
>  
> <script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script> 
> <script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc
>new file mode 100644
>index 0000000..8c5af96
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc
>@@ -0,0 +1,15 @@
>+[% 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/[% intranetstylesheet %]" />
>+[% END %]
>+
>+
>+[% IF ( 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/help/edithelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
>index fd274a2..734bf0d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tt
>@@ -21,14 +21,7 @@ tinyMCE.init({
> });
> //]]>
> </script>
>-[% IF ( intranetstylesheet ) %]
>-    <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
>-[% ELSE %]
>-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
>-[% END %]
>-[% IF ( intranetcolorstylesheet ) %]
>-    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/[% intranetcolorstylesheet %]" />
>-[% END %]
>+[% INCLUDE intranetstylesheet.inc %]
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/help.css" />
> </head>
> <body id="help">
>-- 
>1.7.9.5

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