Attachment 52533 Details for Bug 16709 – Bug 16709: Followup of bug 11038 for 3.20.x only

[patch] Bug 16709: Followup of bug 11038 for 3.20.x only

Bug-16709-Followup-of-bug-11038-for-320x-only.patch (text/plain), 2.43 KB, created by Jonathan Druart on 2016-06-19 11:08:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-06-19 11:08:31 UTC

Size: 2.43 KB

patch

obsolete

>From ac379745e5b8b6a1c8d8d45699e06169a92fcb7b Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 10 Jun 2016 16:48:35 +0200
>Subject: [PATCH] Bug 16709: Followup of bug 11038 for 3.20.x only
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: FrÃ©dÃ©ric Demians <f.demians@tamil.fr>
>  Good catch, bad bug
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Amended patch: remove space and apply same order than in master (CSS then
>JS)
>---
> C4/Auth.pm                                                  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index b52b55c..4ceea06 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -1224,8 +1224,8 @@ sub checkauth {
>         intranetbookbag                       => C4::Context->preference("intranetbookbag"),
>         IntranetNav                           => C4::Context->preference("IntranetNav"),
>         IntranetFavicon                       => C4::Context->preference("IntranetFavicon"),
>+        IntranetUserCSS                       => C4::Context->preference("IntranetUserCSS"),
>         intranetuserjs                        => C4::Context->preference("intranetuserjs"),
>-        IntranetUserJS                        => C4::Context->preference("IntranetUserJS"),
>         IndependentBranches                   => C4::Context->preference("IndependentBranches"),
>         AutoLocation                          => C4::Context->preference("AutoLocation"),
>         wrongip                               => $info{'wrongip'},
>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 88f1de1..56c7cac 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
>@@ -21,7 +21,6 @@
> [% IF ( bidi ) %]
>    <link rel="stylesheet" type="text/css" href="[% themelang %]/css/right-to-left.css" />
> [% END %]
>-[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% 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/shortcut/shortcut.js"></script>
>-- 
>2.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 16709: 52238 | 52414 | 52533