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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-22 / +20 lines)
Lines 65-71 Link Here
65
65
66
        [% IF ( koha_news ) %]
66
        [% IF ( koha_news ) %]
67
67
68
69
            [% IF single_news_error %]
68
            [% IF single_news_error %]
70
69
71
                <div class="alert alert-error">
70
                <div class="alert alert-error">
Lines 80-93 Link Here
80
                    <div class="newsitem">
79
                    <div class="newsitem">
81
                        <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>
82
                        <div class="newsbody">[% koha_new.content | $raw %]</div>
81
                        <div class="newsbody">[% koha_new.content | $raw %]</div>
83
                        <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>
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>
84
                    </div>
83
                    </div>
85
                [% END %]
84
                [% END %]
86
            </div>
85
            </div>
87
86
88
            [% END %]
87
            [% END %]
89
88
90
            [% UNLESS news_item %] <!-- If single news item -->
89
            [% UNLESS news_item %] <!-- unless single news item -->
91
90
92
            <div id="rssnews-container">
91
            <div id="rssnews-container">
93
                <!-- Logged in users have a branch code or it could be explicitly set -->
92
                <!-- Logged in users have a branch code or it could be explicitly set -->
Lines 106-136 Link Here
106
                    [% END %]
105
                    [% END %]
107
                [% END %]
106
                [% END %]
108
            </div>
107
            </div>
109
            [% ELSE %]
108
110
                [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
109
            [% IF ( display_daily_quote && daily_quote ) %]
111
                    <div id="news" class="newscontainer">
110
                <div id="daily-quote">
112
                        <div class="newsitem">
111
                    <h3>Quote of the day</h3>
113
                            <div class="newsbody">No news to display.</div>
112
                    <div>
114
                            <div class="newsfooter"></div>
113
                        <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>
115
                        </div>
116
                    </div>
114
                    </div>
117
                [% END %]
115
                </div>
118
            [% END %]
116
            [% END %]
119
117
120
        [% IF ( display_daily_quote && daily_quote ) %]
118
            [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock | $raw %]</div>[% END %]
121
            <div id="daily-quote">
119
122
                <h3>Quote of the day</h3>
120
            [% END %] <!-- single news item -->
123
                <div>
121
        [% ELSE %] <!-- koha news -->
124
                    <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>
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>
125
                </div>
128
                </div>
126
            </div>
129
            [% END %]
127
        [% END %]
130
        [% END %]
128
129
        [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock | $raw %]</div>[% END %]
130
        </div> <!-- / .span 7/9 -->
131
        </div> <!-- / .span 7/9 -->
131
132
132
        [% END %] <!-- If single news item -->
133
134
        [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
133
        [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
135
            <div class="span3">
134
            <div class="span3">
136
                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
135
                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
137
- 

Return to bug 14272