567c99442f
If a user is not logged in but requests a specific branch,
the RSS feed message fails to mention the branch.
TEST PLAN
---------
1) Apply first patch
2) go to OPAC's opac-main.pl?branch={some branch with specific news}
-- notice bad RSS message
3) Apply this patch
4) Repeat step 2
-- notice branch is properly shown.
5) koha qa test tools
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
119 lines
5.9 KiB
Text
119 lines
5.9 KiB
Text
[% USE Koha %]
|
|
[% USE Branches %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-main' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<div class="main">
|
|
<ul class="breadcrumb">
|
|
<li><a href="#">Home</a></li>
|
|
</ul>
|
|
|
|
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
|
|
[% IF ( loggedinusername ) %]
|
|
<div id="loggedin" class="container-fluid">
|
|
[% ELSE %]
|
|
<div id="notloggedin" class="container-fluid">
|
|
[% END %]
|
|
[% ELSE %]
|
|
<div id="notloggedin" class="container-fluid">
|
|
[% END %]
|
|
|
|
<div class="row-fluid">
|
|
[% IF ( OpacNav || OpacNavBottom ) %]
|
|
<div class="span2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' %]
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( OpacNav || OpacNavBottom ) %]
|
|
<div class="span7">
|
|
[% ELSE %]
|
|
<div class="span9">
|
|
[% END %]
|
|
|
|
[% IF ( koha_news_count ) %]
|
|
<div id="news" class="newscontainer">
|
|
[% SET newsdisp = ( Koha.Preference('NewsAuthorDisplay') ) %]
|
|
[% 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="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 %]
|
|
</div>
|
|
<div id="rssnews-container">
|
|
<!-- Logged in users have a branch code or it could be explicitly set -->
|
|
<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode %]"><img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png"></a>
|
|
RSS feed for [% IF ( branchcode ) %][% Branches.GetName( branchcode ) %] <i>and</i> [% END %] system-wide library news.
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( display_daily_quote && daily_quote ) %]
|
|
<div id="daily-quote">
|
|
<h3>Quote of the Day</h3>
|
|
<div>
|
|
<span id="daily-quote-text">[% daily_quote.text %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source %]</span>
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock %]</div>[% END %]
|
|
</div> <!-- / .span 7/9 -->
|
|
|
|
[% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
|
|
<div class="span3">
|
|
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
|
|
[% UNLESS ( loggedinusername ) %]
|
|
[% UNLESS ( casAuthentication || shibbolethAuthentication ) %]
|
|
<div id="login">
|
|
<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
|
|
<input type="hidden" name="koha_login_context" value="opac" />
|
|
<fieldset class="brief">
|
|
<legend>Log in to your account:</legend>
|
|
<label for="userid">Login:</label><input type="text" id="userid" name="userid" />
|
|
<label for="password">Password:</label><input type="password" id="password" name="password" />
|
|
<fieldset class="action">
|
|
<input type="submit" value="Log in" class="btn" />
|
|
</fieldset>
|
|
[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="patronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
|
|
</fieldset>
|
|
[% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
|
|
<div id="forgotpassword">
|
|
<a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
|
|
</div>
|
|
[% END %]
|
|
[% IF Koha.Preference( 'NoLoginInstructions' ) %]
|
|
<div id="nologininstructions-main">
|
|
[% Koha.Preference( 'NoLoginInstructions' ) %]
|
|
</div>
|
|
[% END %]
|
|
</form>
|
|
</div> <!-- /#login -->
|
|
[% END # /casAuthentication %]
|
|
[% IF persona %]
|
|
<a href="#" class="persona-button" id="browserid" ><span>Sign in with your email</span></a>
|
|
[% END # /persona %]
|
|
[% END # / loggedinusername %]
|
|
[% END # /opacuserlogin %]
|
|
[% IF ( OpacNavRight ) %]
|
|
<div id="opacnavright">
|
|
[% OpacNavRight %]
|
|
</div>
|
|
[% END # /OpacNavRight %]
|
|
</div> <!-- / .span3 -->
|
|
[% END # /opacuserlogin || OpacNavRight %]
|
|
|
|
</div> <!-- /.container-fluid -->
|
|
</div> <!-- /.row-fluid -->
|
|
</div> <!-- /.main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %][% END %]
|