Attachment 83427 Details for Bug 14272 – Bug 14272: (follow-up) Fixing template error and layout

[patch] Bug 14272: (follow-up) Fixing template error and layout

Bug-14272-follow-up-Fixing-template-error-and-layo.patch (text/plain), 4.90 KB, created by Katrin Fischer on 2018-12-20 20:55:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-12-20 20:55:16 UTC

Size: 4.90 KB

patch

obsolete

>From 33def63371b5a54db2b618522baf4912e9c52cf8 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Wed, 4 Jul 2018 01:08:17 +0000
>Subject: [PATCH] Bug 14272: (follow-up) Fixing template error and layout
>
>To test, confirm that OpacMainUserBlock and Quote of the Day do not show
>if viewing a single news item, but do show otherwise. Confirm user
>dashboard shows where expected
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>UPDATE 24/Aug: Add expiration date text
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../opac-tmpl/bootstrap/en/modules/opac-main.tt    | 41 +++++++++++-----------
> 1 file changed, 20 insertions(+), 21 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>index a84ac575e7..46fea32942 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>@@ -65,7 +65,6 @@
> 
>         [% IF ( koha_news ) %]
> 
>-
>             [% IF single_news_error %]
> 
>                 <div class="alert alert-error">
>@@ -80,14 +79,14 @@
>                     <div class="newsitem">
>                         <a name="newsitem[% koha_new.idnew | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew %]"><h4 class="newsheader">[% koha_new.title | html %]</h4></a>
>                         <div class="newsbody">[% koha_new.content | $raw %]</div>
>-                        <div class="newsfooter">(published on [% koha_new.timestamp | $KohaDates with_hours = 1 | html %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %][% END %])</div>
>+                        <div class="newsfooter">(published on [% koha_new.timestamp | $KohaDates with_hours = 1 | html %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %][% END %][% IF ( koha_new.expirationdate ) %], expiry on [% koha_new.expirationdate %][% END %])</div>
>                     </div>
>                 [% END %]
>             </div>
> 
>             [% END %]
> 
>-            [% UNLESS news_item %] 
>+            [% UNLESS news_item %] 
> 
>             <div id="rssnews-container">
>                 
>@@ -106,31 +105,31 @@
>                     [% END %]
>                 [% END %]
>             </div>
>-            [% ELSE %]
>-                [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
>-                    <div id="news" class="newscontainer">
>-                        <div class="newsitem">
>-                            <div class="newsbody">No news to display.</div>
>-                            <div class="newsfooter"></div>
>-                        </div>
>+
>+            [% IF ( display_daily_quote && daily_quote ) %]
>+                <div id="daily-quote">
>+                    <h3>Quote of the day</h3>
>+                    <div>
>+                        <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
>                     </div>
>-                [% END %]
>+                </div>
>             [% END %]
> 
>-        [% IF ( display_daily_quote && daily_quote ) %]
>-            <div id="daily-quote">
>-                <h3>Quote of the day</h3>
>-                <div>
>-                    <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
>+            [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock | $raw %]</div>[% END %]
>+
>+            [% END %] 
>+        [% ELSE %] 
>+            [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
>+                <div id="news" class="newscontainer">
>+                    <div class="newsitem">
>+                        <div class="newsbody">No news to display.</div>
>+                        <div class="newsfooter"></div>
>+                    </div>
>                 </div>
>-            </div>
>+            [% END %]
>         [% END %]
>-
>-        [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock | $raw %]</div>[% END %]
>         </div> 
> 
>-        [% END %] 
>-
>         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
>             <div class="span3">
>                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 14272: 45721 | 45740 | 45741 | 45818 | 45820 | 45845 | 45846 | 45935 | 45936 | 45937 | 47556 | 47557 | 47558 | 47665 | 47666 | 47667 | 47668 | 47669 | 47670 | 47671 | 47672 | 47673 | 50557 | 50558 | 50559 | 59483 | 70728 | 70729 | 70730 | 70731 | 72065 | 72548 | 72549 | 72550 | 72551 | 76015 | 76307 | 76580 | 76662 | 77546 | 77564 | 77565 | 77566 | 77567 | 77568 | 77569 | 78104 | 78206 | 78207 | 78208 | 78231 | 81643 | 82713 | 83425 | 83426 | 83427 | 83428 | 83429 | 83430 | 84868 | 84869 | 84870 | 84871 | 84872 | 84873 | 84874