Attachment 83428 Details for Bug 14272 – Bug 14272: (follow-up) Fixing layout issues and expiration date hint

[patch] Bug 14272: (follow-up) Fixing layout issues and expiration date hint

Bug-14272-follow-up-Fixing-layout-issues-and-expir.patch (text/plain), 4.57 KB, created by Katrin Fischer on 2018-12-20 20:55:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

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

Size: 4.57 KB

patch

obsolete

>From 731699270d6ea10c125d6bdc542923c9c264a414 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Tue, 28 Aug 2018 22:32:28 +0000
>Subject: [PATCH] Bug 14272: (follow-up) Fixing layout issues and expiration
> date hint
>
>Misunderstood the first time.
>
>I've added the hint to the news form on staff side.
>I've fixed the layout on OPAC.
>The RSS feed shows on the main page, but is hidden if there is no news
>and if viewing one news item.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/tools/koha-news.tt             |  5 ++++-
> .../opac-tmpl/bootstrap/en/modules/opac-main.tt    | 26 ++++++++++++----------
> 2 files changed, 18 insertions(+), 13 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>index d73f2c7c0a..2b70768fda 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
>@@ -97,7 +97,10 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
>             <li>
>                 <label for="to">Expiration date: </label>
>                 <input id="to" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate | html %]" class="datepickerto" />
>-				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                <div class="hint">
>+                    [% INCLUDE 'date-format.inc' %]
>+                    <br>News will still be accessible by direct URL if expired.
>+                </div>
>             </li>
>             <li>
>                 <label for="number">Appear in position: </label>
>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 46fea32942..a2d9ef8454 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
>@@ -79,7 +79,7 @@
>                     <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 %][% IF ( koha_new.expirationdate ) %], expiry on [% koha_new.expirationdate %][% 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 %])</div>
>                     </div>
>                 [% END %]
>             </div>
>@@ -106,6 +106,18 @@
>                 [% END %]
>             </div>
> 
>+            [% 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>
>+            [% END %]
>+
>             [% IF ( display_daily_quote && daily_quote ) %]
>                 <div id="daily-quote">
>                     <h3>Quote of the day</h3>
>@@ -117,17 +129,7 @@
> 
>             [% 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>
>-            [% END %]
>-        [% END %]
>+        [% END %] 
>         </div> 
> 
>         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
>-- 
>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