Bugzilla – Attachment 29351 Details for
Bug 12485
Show OPAC search history when opacuserlogin is OFF
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12485 - Show OPAC search history when opacuserlogin is OFF
PASSED-QA-Bug-12485---Show-OPAC-search-history-whe.patch (text/plain), 6.56 KB, created by
Katrin Fischer
on 2014-06-28 20:21:01 UTC
(
hide
)
Description:
[PASSED QA] Bug 12485 - Show OPAC search history when opacuserlogin is OFF
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-06-28 20:21:01 UTC
Size:
6.56 KB
patch
obsolete
>From c53beb8ddfaf983ceb2ee67149cb093db6c3a4bb Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 26 Jun 2014 15:03:37 -0400 >Subject: [PATCH] [PASSED QA] Bug 12485 - Show OPAC search history when > opacuserlogin is OFF >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >In the boostrap OPAC the link to search history is missing if >opacuserlogin is turned off. OPAC search history should be available >whether or not users can log in. This patch removes this dependency. > >To test, apply the patch and test with various combinations of >opacuserlogin and EnableOpacSearchHistory: > >- opacuserlogin and EnableOpacSearchHistory both enabled >- opacuserlogin enabled and EnableOpacSearchHistory disabled >- opacuserlogin disabled and EnableOpacSearchHistory enabled > >Followed test plan. Works as expected. >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Works as described, no problems found. >Passes QA script and tests. >--- > .../opac-tmpl/bootstrap/en/includes/masthead.inc | 44 ++++++++++++---------- > 1 file changed, 24 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index d17f893..b035047 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -66,38 +66,42 @@ > [% END # / IF virtualshelves %] > </ul> <!-- / .nav --> > [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %] >- [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >+ [% IF Koha.Preference( 'opacuserlogin' ) == 1 || EnableOpacSearchHistory %] > <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a> > <div id="members"> > <ul class="nav pull-right"> >- [% UNLESS ( loggedinusername ) %] >- [% IF Koha.Preference('casAuthentication') %] >- [%# CAS authentication is too complicated for modal window %] >- <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li> >- [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li> >+ [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >+ [% UNLESS ( loggedinusername ) %] >+ [% IF Koha.Preference('casAuthentication') %] >+ [%# CAS authentication is too complicated for modal window %] >+ <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li> >+ [% ELSE %] >+ <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li> >+ [% END %] >+ [% END %] >+ [% IF ( loggedinusername ) %] >+ <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></p></li> >+ <li class="divider-vertical"></li> > [% END %] >- [% END %] >- [% IF ( loggedinusername ) %] >- <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></p></li> >- <li class="divider-vertical"></li> > [% END %] > [% IF EnableOpacSearchHistory %] > <li><p class="navbar-text"><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(MSG_DELETE_SEARCH_HISTORY);">x</a>]</p></li> > <li class="divider-vertical"></li> > [% END %] >- [% IF ( loggedinusername ) %] >- <li><p class="navbar-text"> >- [% IF persona %] >- <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'> >- [% ELSE %] >- <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1"> >- [% END %] >- Log out</a></p></li> >+ [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >+ [% IF ( loggedinusername ) %] >+ <li><p class="navbar-text"> >+ [% IF persona %] >+ <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'> >+ [% ELSE %] >+ <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1"> >+ [% END %] >+ Log out</a></p></li> >+ [% END %] > [% END %] > </ul> > </div> <!-- /members --> >- [% END %] >+ [% END # IF opacuserlogin %] > </div> <!-- /container-fluid --> > </div> <!-- /navbar-inner --> > </div> <!-- /navbar --> >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12485
:
29305
|
29343
| 29351