Bugzilla – Attachment 39728 Details for
Bug 14252
Make the OPAC language switcher available in the masthead navbar, footer, or both.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14252 - Move OPAC lang switcher to masthead navbar
Bug-14252---Move-OPAC-lang-switcher-to-masthead-na.patch (text/plain), 11.25 KB, created by
Mark Tompsett
on 2015-06-01 03:46:26 UTC
(
hide
)
Description:
Bug 14252 - Move OPAC lang switcher to masthead navbar
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2015-06-01 03:46:26 UTC
Size:
11.25 KB
patch
obsolete
>From 50d7b294c321d5276be2ed0006a047909657eb1a Mon Sep 17 00:00:00 2001 >From: Indranil Das Gupta <indradg@gmail.com> >Date: Sat, 23 May 2015 03:11:48 +0530 >Subject: [PATCH] Bug 14252 - Move OPAC lang switcher to masthead navbar > >The OPAC language switcher takes up a lot of space at the bottom of the >browser. It also has issues of being not always visible. >This patch adds the switcher to the masthead navbar and removes from the >opac-bottom.inc navbar. > >Test plan >========= > >1/ Apply patch >2/ Set opaclanguagesdisplay syspref to 'show'. >3/ Add a few languages i.e. es-ES, fr-FR and de-DE > $ cd misc/translator > $ perl translate <langcode> >4/ Enable installed languages for OPAC use by checking on 'opaclanguages' > under I18N/L10N sysprefs >5/ Go to the OPAC, you should have a "Languages" dropdown on the masthead > navbar, the opac-bottom.inc navbar should no longer be there. > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Works, no koha-qa errors. >Followup fix language chooser for sublanguages > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >--- > .../opac-tmpl/bootstrap/en/includes/masthead.inc | 39 ++++++++++++++++++++ > .../bootstrap/en/includes/opac-bottom.inc | 41 ---------------------- > 2 files changed, 39 insertions(+), 41 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index aeca007..39b156c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -71,6 +71,45 @@ > <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 ( 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 %] >+ [% IF ( languages_loo.group_enabled ) %] >+ [% IF ( languages_loo.plural ) %] >+ <li class="dropdown"> >+ <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <b class="caret"></b></a> >+ <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu"> >+ [% 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 %] ([% sublanguages_loo.rfc4646_subtag %]) <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 %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >+ [% END %] >+ [% END # / IF sublanguages_loo.enabled %] >+ [% END # / FOREACH sublanguages_loo %] >+ </ul> <!-- languages_loo.rfc4646_subtag --> >+ </li> <!-- / .more --> >+ [% 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 %] > [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] > [% UNLESS ( loggedinusername ) %] > [% IF Koha.Preference('casAuthentication') %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index 91eb8cf..b79c78b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -30,47 +30,6 @@ > > </div> <!-- / #wrap in masthead.inc --> > >- [% IF ( opaclanguagesdisplay ) %] >- [% IF ( languages_loop && opaclanguagesdisplay ) %] >- [% UNLESS ( one_language_enabled ) %] >- <div id="changelanguage" class="navbar navbar-fixed-bottom navbar-static-bottom noprint"> >- <div class="navbar-inner"> >- <ul id="i18nMenu" class="nav"> >- <li><p class="lang navbar-text"><strong>Languages: </strong></p></li> >- [% FOREACH languages_loo IN languages_loop %] >- [% IF ( languages_loo.group_enabled ) %] >- [% IF ( languages_loo.plural ) %] >- <li class="dropdown"> >- <a data-toggle="dropdown" class="dropdown-toggle sublangs" id="show[% languages_loo.rfc4646_subtag %]" href="#">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %] <b class="caret"></b></a> >- <ul id="sub[% languages_loo.rfc4646_subtag %]" class="dropdown-menu"> >- [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] >- [% IF ( sublanguages_loo.enabled ) %] >- [% IF ( sublanguages_loo.sublanguage_current ) %] >- <li> <p>[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</p></li> >- [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %] ([% sublanguages_loo.rfc4646_subtag %])</a></li> >- [% END %] >- [% END # / IF sublanguages_loo.enabled %] >- [% END # / FOREACH sublanguages_loo %] >- </ul> >- </li> <!-- / .more --> >- [% ELSE %] >- [% IF ( languages_loo.group_enabled ) %] >- [% IF ( languages_loo.current ) %] >- <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li> >- [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% 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> <!-- / #i18menu --> >- </div> <!-- / .navbar-inner --> >- </div> <!-- / #changelanguage --> >- [% END # / UNLESS ( one_language_enabled ) %] >- [% END # / IF ( languages_loop && opaclanguagesdisplay ) %] >- [% END # / IF opaclanguagesdisplay %] > [% END # / UNLESS is_popup %] > > >-- >2.1.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 14252
:
39369
|
39433
|
39434
|
39436
|
39443
|
39444
|
39445
|
39446
|
39447
|
39448
|
39449
|
39622
|
39650
|
39706
|
39707
|
39724
|
39725
|
39726
|
39727
|
39728
|
39729
|
39730
|
39731
|
39732
|
39733
|
39734
|
39746
|
39749
|
39857
|
39858
|
39859
|
39860
|
39861
|
39862
|
39863
|
39864