From 0273acc87e49f52ced73be2fc396b7e07b5e98c3 Mon Sep 17 00:00:00 2001 From: Indranil Das Gupta Date: Sun, 12 Jul 2015 01:20:14 +0530 Subject: [PATCH] Bug 13291 - remove prog as fallback theme The 'prog' theme for OPAC was removed from Koha. The OPACFallback syspref was added in 3.18.0 with prog|bootstrap options. This patch proposes to remove the prog option, but still maintain the syspref for reasons outlined in Bug 13291 comment #1. Test plan : run updatedatabase.pl and check the value of OpacFallback under OPAC sysprefs. --- .../atomicupdate/bug_13291-remove-prog-as-listed-fallback-theme.sql | 1 + installer/data/mysql/sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_13291-remove-prog-as-listed-fallback-theme.sql diff --git a/installer/data/mysql/atomicupdate/bug_13291-remove-prog-as-listed-fallback-theme.sql b/installer/data/mysql/atomicupdate/bug_13291-remove-prog-as-listed-fallback-theme.sql new file mode 100644 index 0000000..21b7bb3 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_13291-remove-prog-as-listed-fallback-theme.sql @@ -0,0 +1 @@ +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACFallback', 'bootstrap', 'Define the fallback theme for the OPAC interface.', 'bootstrap', 'Themes') ON DUPLICATE KEY UPDATE value='bootstrap', options='bootstrap'; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index a343571..3d91235 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -258,7 +258,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OPACdidyoumean',NULL,NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'), ('OPACDisplay856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding OPACXSLT option must be on','Choice'), ('OpacExportOptions','bibtex,dc,marcxml,marc8,utf8,marcstd,mods,ris,isbd','','Define export options available on OPAC detail page.','multiple'), -('OPACFallback', 'prog', 'bootstrap|prog', 'Define the fallback theme for the OPAC interface.', 'Themes'), +('OPACFallback', 'bootstrap', 'bootstrap', 'Define the fallback theme for the OPAC interface.', 'Themes'), ('OpacFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','free'), ('OPACFineNoRenewals','100','','Fine limit above which user cannot renew books via OPAC','Integer'), ('OPACFinesTab','1','','If OFF the patron fines tab in the OPAC is disabled.','YesNo'), 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 ad0f26f..84b646d 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 @@ -10,7 +10,6 @@ OPAC: - pref: OPACFallback choices: bootstrap: bootstrap - prog: prog - theme as the fallback theme on the OPAC. - - "The OPAC is located at " -- 1.9.1