From 3a179e7a2bbf09b887518e90a4d1e324bfc2e6b3 Mon Sep 17 00:00:00 2001 From: Indranil Das Gupta 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 Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../atomicupdate/bug_14252-OpacLangSelectorMode_syspref.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../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 db4d8ac2e9..cdafcd9e65 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 557a0f7319..84ba3631b2 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -269,7 +269,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 1b48977b9d..ad0f26fd90 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 95eae9d471..1ccd2be1f3 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 @@
    - [% 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 ec06d94cee..238ef97573 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 %]
-[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'foot' %] +[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %] [% IF ( opaclanguagesdisplay ) %] [% IF ( languages_loop && opaclanguagesdisplay ) %] [% UNLESS ( one_language_enabled ) %] -- 2.39.5