Bug 10862: (follow-up) fix a couple of issues

This followup fixes a couple of issues:
- disable the feature by default.
- use the datatables include file.
- fix the syspref description.
- replace "History search" with "Search history".
- replace biblio with catalog

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 8264c0e..ddc58c9 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -8397,9 +8397,9 @@ if ( CheckVersion($DBversion) ) {
 $DBversion = "3.13.00.XXX";
 if ( CheckVersion($DBversion) ) {
     $dbh->do(q|
-        INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableSearchHistory','1','','Enable or disable search history','YesNo')
+        INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableSearchHistory','0','','Enable or disable search history','YesNo')
     |);
-    print "Upgrade to $DBversion done (MT12541: Add EnableSearchHistory syspref)\n";
+    print "Upgrade to $DBversion done (Bug 10862: Add EnableSearchHistory syspref)\n";
     SetVersion($DBversion);
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index 3f24edb..eee5cc9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -77,7 +77,7 @@ Searching:
               choices:
                   yes: Keep
                   no: "Don't keep"
-            - patron search history in the OPAC.
+            - patron search history in the staff client.
     Search Form:
         -
             - Show tabs in OPAC and staff-side advanced search for limiting searches on the

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
index 23bda80..ae48c1b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
@@ -1,12 +1,10 @@
 [% USE Koha %]
 [% USE KohaDates %]
-<title>Koha &rsaquo; Catalog &rsaquo; History search</title>
+<title>Koha &rsaquo; Catalog &rsaquo; Search history</title>
 [% INCLUDE 'doc-head-close.inc' %]
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
-[% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?");
@@ -34,7 +32,7 @@ $(document).ready(function() {
 [% INCLUDE 'cat-search.inc' %]
 
 <div id="breadcrumbs">
-  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; History search
+  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Search history
 </div>
 
 <div id="doc3" class="yui-t2">
@@ -45,7 +43,7 @@ $(document).ready(function() {
       <h1>Search history</h1>
       <div id="tabs" class="toptabs">
         <ul>
-          <li><a href="#biblio_tab">Biblio</a></li>
+          <li><a href="#biblio_tab">Catalog</a></li>
           <li><a href="#authority_tab">Authority</a></li>
         </ul>
         <div id="biblio_tab">
@@ -55,7 +53,7 @@ $(document).ready(function() {
               <input type="hidden" name="action" value="delete" />
               <input type="hidden" name="previous" value="0" />
               <input type="hidden" name="type" value="biblio" />
-              <input type="submit" class="deleteshelf" value="Delete your current biblio history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
+              <input type="submit" class="deleteshelf" value="Delete your current catalog history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
             </form>
             <table class="historyt">
               <thead>
@@ -83,7 +81,7 @@ $(document).ready(function() {
               <input type="hidden" name="action" value="delete" />
               <input type="hidden" name="previous" value="1" />
               <input type="hidden" name="type" value="biblio" />
-              <input type="submit" class="deleteshelf" value="Delete your previous biblio search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
+              <input type="submit" class="deleteshelf" value="Delete your previous catalog search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" />
             </form>
             <table class="historyt">
               <thead>
@@ -106,7 +104,7 @@ $(document).ready(function() {
           [% END %]
 
           [% IF !current_biblio_searches && !previous_biblio_searches %]
-            <p>Your biblio search history is empty.</p>
+            <p>Your catalog search history is empty.</p>
           [% END %]
         </div>