Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 13618: Fix for news

Browse source 
Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
This commit is contained in:
Jonathan Druart 2015-09-01 08:55:10 +01:00 committed by Brendan Gallagher
parent a7731ffe25
commit ae5b98020a
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
View file

@ -174,7 +174,7 @@
[% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
[% FOREACH koha_new IN koha_news %]
<div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
<p>[% koha_new.new %]</p>
<p>[% koha_new.new.raw %]</p>
<p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %]
[% IF ( CAN_user_tools ) %]
<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
View file

@ -61,7 +61,7 @@ Date due: [% issueloo.date_due %]</p>
<!-- [% koha_news_count %] recent news item(s) -->
[% FOREACH koha_new IN koha_news %]
<div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5>
<p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new %]</p>
<p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new.raw %]</p>
<p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %]
</p><hr /></div>

4
koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
View file

@ -145,7 +145,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
[% END %]
</li>
<li><label for="new">News: </label>
<textarea name="new" id="new" cols="75" rows="10">[% new_detail.new %]</textarea>
<textarea name="new" id="new" cols="75" rows="10">[% new_detail.new.raw %]</textarea>
</li>
</ol>
</fieldset>
@ -247,7 +247,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
<td>[% opac_new.title %]</td>
<td>[% opac_new.author_title %] [% opac_new.author_firstname %] [% opac_new.author_surname %]</td>
<td>
[% opac_new.new %]
[% opac_new.new.raw %]
</td>
<td><a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew %]">Edit</a></td>
</tr>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
View file

@ -44,7 +44,7 @@
[% FOREACH koha_new IN koha_news %]
<div class="newsitem">
<a name="newsitem[% koha_new.idnew %]"></a><h4 class="newsheader">[% koha_new.title %]</h4>
<div class="newsbody">[% koha_new.new %]</div>
<div class="newsbody">[% koha_new.new.raw %]</div>
<div class="newsfooter">(published on [% koha_new.newdate %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %][% END %])</div>
</div>
[% END %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
View file

@ -8,7 +8,7 @@
[% FOREACH newsitem IN koha_news %]
<item>
<title>[% newsitem.title %]</title>
<description>[% newsitem.new %]</description>
<description>[% newsitem.new.raw %]</description>
<guid>[% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew %]</guid>
</item>
[% END %]