Attachment #84871 for bug #14272

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

Lines 98-104 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-1 / +4 lines)
98	<li>	98	<li>
99	<label for="to">Expiration date: </label>	99	<label for="to">Expiration date: </label>
100	<input id="to" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate \| html %]" class="datepickerto" />	100	<input id="to" type="text" name="expirationdate" size="15" value="[% new_detail.expirationdate \| html %]" class="datepickerto" />
101	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	101	<div class="hint">
		102	[% INCLUDE 'date-format.inc' %]
		103	<br>News will still be accessible by direct URL if expired.
		104	</div>
102	</li>	105	</li>
103	<li>	106	<li>
104	<label for="number">Appear in position: </label>	107	<label for="number">Appear in position: </label>




                    <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>
                [% END %]
            </div>

                [% END %]
            </div>

            [% END %] <!-- single news item -->

        [% ELSE %] <!-- koha news -->
            [% 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>


            [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock | $raw %]</div>[% END %]

        [% END %] <!-- koha news -->
        [% ELSE %] <!-- koha news -->
            [% 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 %]
        </div> <!-- / .span 7/9 -->

        [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
- 

Return to bug 14272

Lines 79-85 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-13 / +14 lines)
79	<div class="newsitem">	79	<div class="newsitem">
80	<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>	80	<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>
81	<div class="newsbody">[% koha_new.content \| $raw %]</div>	81	<div class="newsbody">[% koha_new.content \| $raw %]</div>
82	<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>	82	<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>
83	</div>	83	</div>
84	[% END %]	84	[% END %]
85	</div>	85	</div>
Lines 106-111 Link Here
106	[% END %]	106	[% END %]
107	</div>	107	</div>
108		108
		109	[% END %] <!-- single news item -->
		110
		111	[% ELSE %] <!-- koha news -->
		112	[% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
		113	<div id="news" class="newscontainer">
		114	<div class="newsitem">
		115	<div class="newsbody">No news to display.</div>
		116	<div class="newsfooter"></div>
		117	</div>
		118	</div>
		119	[% END %]
		120
109	[% IF ( display_daily_quote && daily_quote ) %]	121	[% IF ( display_daily_quote && daily_quote ) %]
110	<div id="daily-quote">	122	<div id="daily-quote">
111	<h3>Quote of the day</h3>	123	<h3>Quote of the day</h3>
Lines 117-133 Link Here
117		129
118	[% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock \| $raw %]</div>[% END %]	130	[% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock \| $raw %]</div>[% END %]
119		131
120	[% END %] <!-- single news item -->	132	[% END %] <!-- koha news -->
121	[% ELSE %] <!-- koha news -->
122	[% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
123	<div id="news" class="newscontainer">
124	<div class="newsitem">
125	<div class="newsbody">No news to display.</div>
126	<div class="newsfooter"></div>
127	</div>
128	</div>
129	[% END %]
130	[% END %]
131	</div> <!-- / .span 7/9 -->	133	</div> <!-- / .span 7/9 -->
132		134
133	[% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) \|\| OpacNavRight ) %]	135	[% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) \|\| OpacNavRight ) %]
134	-