Bugzilla – Attachment 39860 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: (Followup) Fixed issues pointed to in comment #40
Bug-14252-Followup-Fixed-issues-pointed-to-in-comm.patch (text/plain), 5.93 KB, created by
Jonathan Druart
on 2015-06-04 14:07:04 UTC
(
hide
)
Description:
Bug 14252: (Followup) Fixed issues pointed to in comment #40
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-06-04 14:07:04 UTC
Size:
5.93 KB
patch
obsolete
>From 1e9fa0943765a9899a7eef575cfee6a83b11e9ce Mon Sep 17 00:00:00 2001 >From: Indranil Das Gupta <indradg@gmail.com> >Date: Mon, 1 Jun 2015 05:26:31 +0530 >Subject: [PATCH] Bug 14252: (Followup) Fixed issues pointed to in comment #40 > >Based on Mark's inputs in comment #40 - > >[1] selected 'mast' (short of 'masthead') and updated : > (a) bug_14252-OpacLangSelectorMode_syspref.sql > (b) sysprefs.sql > (c) opac.pref >[2] Reduced the calls to Koha.Preference() from : > (a) masthead.inc > (b) opac-bottom.inc > >After applying this patch, update the database once for it to pick >up the new option values -'both|mast|foot'. > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> >--- > .../data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql | 2 +- > installer/data/mysql/sysprefs.sql | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 3 ++- > koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 3 ++- > 5 files changed, 7 insertions(+), 5 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql b/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql >index edaed6c..229a7a5 100644 >--- a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql >+++ b/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql >@@ -1,4 +1,4 @@ > -- > -- Adds OpacLangSelectorMode syspref for bug 14252 > -- >-INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','both','both|head|foot','Select the location to display the language selector','Choice'); >+INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','both','both|mast|foot','Select the location to display the language selector','Choice'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 5f1de08..cfa9616 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -270,7 +270,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'), > ('OPACItemsResultsDisplay','0','','If OFF : show only the status of items in result list.If ON : show full location of items (branch+location+callnumber) as in staff interface','YesNo'), > ('OpacKohaUrl','1',NULL,'Show \'Powered by Koha\' text on OPAC footer.',NULL), >-('OpacLangSelectorMode','both','both|head|foot','Select the location to display the language selector','Choice'), >+('OpacLangSelectorMode','both','both|mast|foot','Select the location to display the language selector','Choice'), > ('opaclanguages','en',NULL,'Set the default language in the OPAC.','Languages'), > ('opaclanguagesdisplay','0','','If ON, enables display of Change Language feature on OPAC','YesNo'), > ('opaclayoutstylesheet','opac.css','','Enter the name of the layout CSS stylesheet to use in the OPAC','free'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index 42abbe0..249c4fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -322,7 +322,7 @@ OPAC: > - pref: OpacLangSelectorMode > choices: > both: "both masthead and footer" >- head: "only header" >+ mast: "only masthead" > foot: "only footer" > Features: > - >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index c8dff49..4e08ed8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] > <div id="wrap"> > <div id="header-region" class="noprint"> > <div class="navbar navbar-inverse navbar-static-top"> >@@ -71,7 +72,7 @@ > <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 ( Koha.Preference( 'OpacLangSelectorMode' ) == 'both' ) || ( Koha.Preference( 'OpacLangSelectorMode' ) == 'head' ) %] >+ [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'mast' %] > [% IF ( opaclanguagesdisplay ) %] > [% IF ( languages_loop && opaclanguagesdisplay ) %] > [% UNLESS ( one_language_enabled ) %] >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 0497621..7f54e6f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -1,4 +1,5 @@ > [% UNLESS ( is_popup ) %] >+ [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] > [% IF ( opaccredits ) %] > <div class="container-fluid"> > <div class="row-fluid"> >@@ -29,7 +30,7 @@ > [% END # / OpacKohaUrl %] > > </div> <!-- / #wrap in masthead.inc --> >-[% IF ( Koha.Preference( 'OpacLangSelectorMode' ) == 'both' ) || ( Koha.Preference( 'OpacLangSelectorMode' ) == 'foot' ) %] >+[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'foot' %] > [% IF ( opaclanguagesdisplay ) %] > [% IF ( languages_loop && opaclanguagesdisplay ) %] > [% UNLESS ( one_language_enabled ) %] >-- >2.1.0
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