Bugzilla – Attachment 43653 Details for
Bug 15039
Move top language menu to include and streamline logic
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15039 - Move top language menu to include and streamline logic
Bug-15039---Move-top-language-menu-to-include-and-.patch (text/plain), 10.15 KB, created by
Marc Véron
on 2015-10-20 16:00:52 UTC
(
hide
)
Description:
Bug 15039 - Move top language menu to include and streamline logic
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2015-10-20 16:00:52 UTC
Size:
10.15 KB
patch
obsolete
>From 68572c6e22c92ed460d8a96fca75613996bfd916 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Tue, 20 Oct 2015 17:03:16 +0200 >Subject: [PATCH] Bug 15039 - Move top language menu to include and streamline > logic > >The language menu in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc is used at other places as well (see Bug 14776). > >This patch moves it to a file masthead-langmenu.inc to make it re-usable. > >Additionally it streamlines the logic (not all combinations of Opac sysprefs that should display the menu did so). > >To test: >- Apply patch >- Verify, that the language menu displays / does not display with combinations of: > - opaclanguagedisplay (Allow) > - opaclanguages ( > 1 language selected) > - OpacLangSelectorMode (top or both) >- Verify that sysprefs opacuserlogin and EnableOpacSearchHistory do not interfere > with the lenguage menu (before, at least one of them had to be on to display the menu) >- Verify that language switching works as before. >--- > .../bootstrap/en/includes/masthead-langmenu.inc | 36 +++++++++++++++++ > .../opac-tmpl/bootstrap/en/includes/masthead.inc | 41 ++------------------ > 2 files changed, 40 insertions(+), 37 deletions(-) > create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc >new file mode 100644 >index 0000000..2299d28 >--- /dev/null >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc >@@ -0,0 +1,36 @@ >+ >+[% IF ( ( opaclanguagesdisplay ) && >+ ( ! one_language_enabled ) && >+ ( languages_loop ) && >+ ( OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top') ) >+%] >+<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 --> >+[% END # / IF opaclanguagedisplay %] >+ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 1ccd2be..e034009 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -68,46 +68,13 @@ > [% END # / IF virtualshelves %] > </ul> <!-- / .nav --> > [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %] >- [% IF Koha.Preference( 'opacuserlogin' ) == 1 || EnableOpacSearchHistory %] >+ [% IF Koha.Preference( 'opacuserlogin' ) == 1 || opaclanguagesdisplay || 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"> >- [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top' %] >- [% IF ( opaclanguagesdisplay ) %] >- [% IF ( languages_loop && opaclanguagesdisplay ) %] >- [% UNLESS ( one_language_enabled ) %] >- <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 --> >- [% END # / UNLESS ( one_language_enabled ) %] >- [% END # / IF ( languages_loop && opaclanguagesdisplay ) %] >- [% END # / IF opaclanguagesdisplay %] >- [% END # / IF OpacLangSelectorMode %] >+ >+ [% INCLUDE 'masthead-langmenu.inc' %] >+ > [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] > [% UNLESS ( loggedinusername ) %] > [% IF Koha.Preference('casAuthentication') %] >-- >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 15039
:
43651
|
43653
|
43742