Bugzilla – Attachment 39863 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) addresses the QA Manager comments
Bug-14252-followup-addresses-the-QA-Manager-commen.patch (text/plain), 6.95 KB, created by
Jonathan Druart
on 2015-06-04 14:07:18 UTC
(
hide
)
Description:
Bug 14252: (followup) addresses the QA Manager comments
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-06-04 14:07:18 UTC
Size:
6.95 KB
patch
obsolete
>From 6b3759d92f4a127f317eb69009fef7969ee3eae6 Mon Sep 17 00:00:00 2001 >From: Indranil Das Gupta <indradg@gmail.com> >Date: Mon, 1 Jun 2015 19:22:29 +0530 >Subject: [PATCH] Bug 14252: (followup) addresses the QA Manager comments > >Addresses Katrin's comments in comment# 56 > >TEST PLAN >--------- > 1) Back up your DB > 2) Ensure you have multiple languages, including > some that have sub-languages (e.g. de-DE, de-CH) > -- cd misc/translator > -- perl translate install {language code} > 3) Ensure that you have all the languages enabled > -- Staff client -> Home -> Global system preferences > --> I18N/L10N > Check all the languages in opaclanguages. > Ensure that opaclanguagesdisplay is 'Allow' > 4) Open OPAC > -- should only have languages in footer. > Annoyingly below the fold. > 5) Drop your koha database, and create a blank one. > 6) Apply all patches > 7) Reinstall all the known languages, so the templates > are appropriately updated. > 8) Go to staff client and do an install of koha, with > all the dummy data. > 9) Ensure you have all the languages enabled (see (3)) >10) Refresh your OPAC page > -- language selector position should be in both > the footer and at the top as expected. > -- this confirms the sysprefs.sql change. >11) Restore your DB >12) run the updatedatabase.pl script >13) Ensure you have all the languages enabled (see (3)) >14) Refresh the OPAC page > -- should still only have languages in the footer. > -- this confirms that upgrade won't change anything. > -- this confirms the atomic update. >15) git diff origin/master > -- the opac-bottom.inc difference should only > have changes around a SET, IF, and END. > This confirms the noprint was fixed. >16) In the staff client, change the OPAC system preference, > OpacLangSelectorMode, to all three values. > For each value, refresh the OPAC page, and confirm the > position of the language selector. > -- should work as expected. >17) run koha qa test tools > >NOTE: Tested as a single batch together. > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> >--- > .../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 | 6 +++--- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql b/installer/data/mysql/atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql >index db4d8ac..cdafcd9 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','foot','both|mast|foot','Select the location to display the language selector','Choice'); >+INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('OpacLangSelectorMode','footer','top|both|footer','Select the location to display the language selector','Choice'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 0300930..313f635 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','foot','both|mast|foot','Select the location to display the language selector','Choice'), >+('OpacLangSelectorMode','both','top|both|footer','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 249c4fb..7fad8d8 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 >@@ -321,9 +321,9 @@ OPAC: > - "Display language selector on " > - pref: OpacLangSelectorMode > choices: >- both: "both masthead and footer" >- mast: "only masthead" >- foot: "only footer" >+ both: "both top and footer" >+ top: "top" >+ footer: "only footer" > Features: > - > - pref: opacuserlogin >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 95eae9d..1ccd2be 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -72,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 OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'mast' %] >+ [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top' %] > [% 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 ec06d94..238ef97 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -30,7 +30,7 @@ > [% END # / OpacKohaUrl %] > > </div> <!-- / #wrap in masthead.inc --> >-[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'foot' %] >+[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %] > [% 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