Bugzilla – Attachment 42423 Details for
Bug 14776
SCO/shelfcheck 'log out' option redirects to OPAC, not back to SCO
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14776 - Remove 'selfcheck' patron related links from and add language selector to SCO header
Bug-14776---Remove-selfcheck-patron-related-links-.patch (text/plain), 7.36 KB, created by
Marc Véron
on 2015-09-06 17:09:03 UTC
(
hide
)
Description:
Bug 14776 - Remove 'selfcheck' patron related links from and add language selector to SCO header
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-09-06 17:09:03 UTC
Size:
7.36 KB
patch
obsolete
>From b5fb150d62c02269c4a56ca0dca0c10525c4f873 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Sun, 6 Sep 2015 18:52:51 +0200 >Subject: [PATCH] Bug 14776 - Remove 'selfcheck' patron related links from and > add language selector to SCO header > >The SCO screen displays patron related menu items in it's header (Link to the account and "Logout"). >This makes no sense since the patron that is logged in is the 'selfcheck' user as defined in syspref AutoSelfCheckId. >Additionally, the language menue is missing when the syspref OpacLangSelectorMode is set to 'top' or to 'both'. > >To test: >- Set AutoSelfCheck sysprefs as appropriate >- Set OpacLangSelectorMode to 'top' or 'both' >- Go to SCO page >- Verify that the language menue does not display in the header >- Enter a card number to check out (this logs in the SCO user) >- Verify that you get text similar to "Welcome, checkout" with a link to the sco user's account in the OPAC and a 'Logout' link >- Apply patch >- Verify that the language menu appears and the SCO user's information disappears. >--- > .../bootstrap/en/includes/masthead-sco.inc | 51 ++++++++++++++++---- > 1 file changed, 42 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >index e7f8059..76c8ef0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >@@ -1,3 +1,5 @@ >+[% USE Koha %] >+[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] > <div id="wrap"> > <div class="navbar navbar-inverse navbar-static-top"> > <div class="navbar-inner"> >@@ -9,15 +11,46 @@ > </ul> > </div> > >- [% IF ( validuser ) %] >- <div id="members"> >- <ul class="nav pull-right"> >- <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> >- <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> >- </ul> >- </div> <!-- /members --> >- [% END # / IF validuser %] >+ [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top' %] >+ [% IF ( opaclanguagesdisplay ) %] >+ [% IF ( languages_loop && opaclanguagesdisplay ) %] >+ [% UNLESS ( one_language_enabled ) %] >+ <div id="checkoutlanguage"> >+ <ul class="nav pull-right"> >+ <li class="dropdown"> >+ <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a> >+ <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu"> >+ [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %] >+ [% IF ( languages_loo.group_enabled ) %] >+ [% IF ( languages_loo.plural ) %] >+ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >+ [% IF ( sublanguages_loo.enabled ) %] >+ [% IF ( sublanguages_loo.sublanguage_current ) %] >+ <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] <i class="icon-ok"></i></a></li> >+ [% ELSE %] >+ <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]" tabindex="-1" role="menuitem" class="listmenulink"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li> >+ [% END %] >+ [% END # / IF sublanguages_loo.enabled %] >+ [% END # / FOREACH sublanguages_loo %] >+ [% ELSE %] >+ [% IF ( languages_loo.group_enabled ) %] >+ [% IF ( languages_loo.current ) %] >+ <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <i class="icon-ok"></i></a></li> >+ [% ELSE %] >+ <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]" tabindex="-1" role="menuitem" class="listmenulink">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li> >+ [% END %] >+ [% END # / IF languages_loo.current %] >+ [% END # / IF ( languages_loo.plural ) %] >+ [% END # / IF ( languages_loo.group_enabled ) %] >+ [% END # / FOREACH languages_loo IN languages_loop %] >+ </ul> <!-- /# .dropdown-menu --> >+ </li> <!-- / .dropdown --> >+ </div> <!-- / checkoutlanguage > >+ [% END # / UNLESS ( one_language_enabled ) %] >+ </ul> >+ [% END # / IF ( languages_loop && opaclanguagesdisplay ) %] >+ [% END # / IF opaclanguagesdisplay %] >+ [% END # / IF OpacLangSelectorMode %] > > </div> <!-- /container-fluid --> > </div> <!-- /navbar-inner --> >-- >1.7.10.4
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 14776
:
42311
|
42423
|
43659
|
43804