View | Details | Raw Unified | Return to bug 13618
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +1 lines)
Lines 174-180 Link Here
174
            [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
174
            [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
175
            [% FOREACH koha_new IN koha_news %]
175
            [% FOREACH koha_new IN koha_news %]
176
                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
176
                <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
177
                    <p>[% koha_new.new %]</p>
177
                    <p>[% koha_new.new.raw %]</p>
178
                    <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 %]
178
                    <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 %]
179
                        [% IF ( CAN_user_tools ) %]
179
                        [% IF ( CAN_user_tools ) %]
180
                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
180
                            <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt (-1 / +1 lines)
Lines 61-67 Date due: [% issueloo.date_due %]</p> Link Here
61
                       <!-- [% koha_news_count %] recent news item(s) -->
61
                       <!-- [% koha_news_count %] recent news item(s) -->
62
            [% FOREACH koha_new IN koha_news %]
62
            [% FOREACH koha_new IN koha_news %]
63
                    <div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5>
63
                    <div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5>
64
                                        <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new %]</p>
64
                                        <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new.raw %]</p>
65
                                       <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %]
65
                                       <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %]
66
66
67
</p><hr /></div>
67
</p><hr /></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-2 / +2 lines)
Lines 145-151 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
145
                [% END %]
145
                [% END %]
146
            </li>
146
            </li>
147
            <li><label for="new">News: </label>
147
            <li><label for="new">News: </label>
148
            <textarea name="new" id="new"  cols="75" rows="10">[% new_detail.new %]</textarea>
148
            <textarea name="new" id="new"  cols="75" rows="10">[% new_detail.new.raw %]</textarea>
149
            </li>
149
            </li>
150
            </ol>
150
            </ol>
151
			</fieldset>
151
			</fieldset>
Lines 247-253 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
247
                            <td>[% opac_new.title %]</td>
247
                            <td>[% opac_new.title %]</td>
248
                            <td>[% opac_new.author_title %] [% opac_new.author_firstname %] [% opac_new.author_surname %]</td>
248
                            <td>[% opac_new.author_title %] [% opac_new.author_firstname %] [% opac_new.author_surname %]</td>
249
                           <td>
249
                           <td>
250
                                [% opac_new.new %]
250
                                [% opac_new.new.raw %]
251
                            </td>
251
                            </td>
252
                            <td><a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew %]">Edit</a></td>
252
                            <td><a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew %]">Edit</a></td>
253
                        </tr>
253
                        </tr>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
Lines 44-50 Link Here
44
                [% FOREACH koha_new IN koha_news %]
44
                [% FOREACH koha_new IN koha_news %]
45
                    <div class="newsitem">
45
                    <div class="newsitem">
46
                        <a name="newsitem[% koha_new.idnew %]"></a><h4 class="newsheader">[% koha_new.title %]</h4>
46
                        <a name="newsitem[% koha_new.idnew %]"></a><h4 class="newsheader">[% koha_new.title %]</h4>
47
                        <div class="newsbody">[% koha_new.new %]</div>
47
                        <div class="newsbody">[% koha_new.new.raw %]</div>
48
                        <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>
48
                        <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>
49
                    </div>
49
                    </div>
50
                [% END %]
50
                [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt (-2 / +1 lines)
Lines 8-14 Link Here
8
      [% FOREACH newsitem IN koha_news %]
8
      [% FOREACH newsitem IN koha_news %]
9
      <item>
9
      <item>
10
        <title>[% newsitem.title %]</title>
10
        <title>[% newsitem.title %]</title>
11
        <description>[% newsitem.new %]</description>
11
        <description>[% newsitem.new.raw %]</description>
12
        <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew %]</guid>
12
        <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew %]</guid>
13
      </item>
13
      </item>
14
      [% END %]
14
      [% END %]
15
- 

Return to bug 13618