Attachment 81068 Details for Bug 20554 – Bug 20554: (follow-up) KOHA_VERSION is not needed in opaclayoutstylesheet

[patch] Bug 20554: (follow-up) KOHA_VERSION is not needed in opaclayoutstylesheet

Bug-20554-follow-up-KOHAVERSION-is-not-needed-in-o.patch (text/plain), 1.25 KB, created by Jonathan Druart on 2018-10-24 13:23:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-10-24 13:23:24 UTC

Size: 1.25 KB

patch

obsolete

>From 6b6c9b4faf518c2eb1e495330ecc13511796dd6c Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Wed, 24 Oct 2018 15:09:07 +0200
>Subject: [PATCH] Bug 20554: (follow-up) KOHA_VERSION is not needed in
> opaclayoutstylesheet
>
>SET opaclayoutstylesheet does not need KOHA_VERSION, its defined by Asset.css()
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Fix a bad resolution conflict
>---
> koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>index 4dfd532c2c..22160e92de 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>@@ -17,7 +17,7 @@
>     [% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
> [% END %]
> 
>-[% SET opaclayoutstylesheet='opac_' _ KOHA_VERSION _ '.css' UNLESS opaclayoutstylesheet %]
>+[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
> [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
>     <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet | html %]" />
> [% ELSE %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20554: 73941 | 73942 | 74090 | 74091 | 74656 | 74657 | 74715 | 74716 | 74717 | 76523 | 76524 | 77689 | 77690 | 77906 | 77907 | 77908 | 77909 | 77913 | 78257 | 78258 | 78360 | 78666 | 78667 | 78730 | 78731 | 78811 | 78813 | 78814 | 79905 | 79906 | 79907 | 80742 | 80743 | 80744 | 81067 | 81068