From 79bfa1fcfcf9da0efdfd7e740305aadcb606bad0 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 21 Apr 2020 01:51:16 +0000 Subject: [PATCH] Bug 14242: Styling of buttons, get copyright date, fixing plugin comment And other code-y bits. Addressing comments in Comment 59. Sponsored-by: Catalyst IT Signed-off-by: Lisette Scheer --- .../mysql/atomicupdate/bug_14242-autofill_syspref.perl | 6 ++++++ .../mysql/atomicupdate/bug_14242-autofill_syspref.sql | 1 - installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 4 ---- .../opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 15 +++++++++++---- koha-tmpl/opac-tmpl/bootstrap/js/autofill.js | 18 ++++++++---------- 7 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.perl delete mode 100644 installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.sql diff --git a/installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.perl b/installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.perl new file mode 100644 index 0000000000..c56eae70ef --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.perl @@ -0,0 +1,6 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('OPACSuggestionAutoFill', '0', NULL, 'Automatically fill OPAC suggestion form with data from Google Books API','YesNo') }); + + NewVersion( $DBversion, 14242, "Add OPACSuggestionAutoFill system preference"); +} diff --git a/installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.sql b/installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.sql deleted file mode 100644 index 1abb6abb17..0000000000 --- a/installer/data/mysql/atomicupdate/bug_14242-autofill_syspref.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES ('OPACSuggestionAutoFill', '0', NULL, 'Automaticly fill forms with data from Google Books API','YesNo'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index ee331e3367..a4ed8388b4 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -360,7 +360,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OAI-PMH:DeletedRecord','persistent','Koha\'s deletedbiblio table will never be deleted (persistent), might be deleted (transient), or will never have any data in it (no)','transient|persistent|no','Choice'), ('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'), ('OPACAcquisitionDetails','0','','Show the acquisition details at the OPAC','YesNo'), -('OPACSuggestionAutoFill','0',NULL,'Automaticly fill forms with data from Google Books API','YesNo'), +('OPACSuggestionAutoFill','0',NULL,'Automatically fill OPAC suggestion form with data from Google Books API','YesNo'), ('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'), ('OpacAdvSearchMoreOptions','pubdate,itemtype,language,subtype,sorting,location','Show search options for the expanded view (More options)','pubdate|itemtype|language|subtype|sorting|location','multiple'), ('OpacAdvSearchOptions','pubdate,itemtype,language,sorting,location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'), 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 a334b8b07a..8d63cc5e40 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 @@ -531,7 +531,7 @@ OPAC: choices: yes: Enable no: Disable - - automatic form filling with data from Google Books API. + - OPAC suggestions form automatically filling with data from Google Books API. - - "Use the following as the OPAC ISBD template:" - pref: OPACISBD 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 37b3747526..d9bc539446 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -244,10 +244,6 @@ $.widget.bridge('uitooltip', $.ui.tooltip); [% END %] -[% IF ( Koha.Preference('OPACSuggestionAutoFill') ) %] - -[% END %] - [% IF ( BakerTaylorEnabled ) %] [% Asset.js("js/bakertaylorimages.js") | $raw %]