Bug 11425: QA fixes

- Reword 'joker' to 'wildcard'
- Explain what wildcards do
- Reword 'Modify' to 'Edit'

Also fix jQuery plugin columnFilter path

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc
index bb5bd41..c02cfbf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc
@@ -19,5 +19,5 @@
   <td>[% item.stocknumber %]</td>
   <td>[% item.status %]</td>
   <td>[% item.issues || 0 %]</td>
-  <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]">Modify</a></td>
+  <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]">Edit</a></td>
 </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
index 9115ead..3e5d9a7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
@@ -14,5 +14,5 @@
   "[% item.stocknumber |html %]",
   "[% item.status |html %]",
   "[% (item.issues || 0) |html %]",
-  "<a href='/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]'>Modify</a>"
+  "<a href='/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber %]&itemnumber=[% item.itemnumber %]'>Edit</a>"
 ]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 877673a..5ee86d5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -133,7 +133,7 @@
   <title>Koha &rsaquo; Catalog &rsaquo; Advanced search</title>
   [% INCLUDE 'doc-head-close.inc' %]
   [% INCLUDE 'datatables.inc' %]
-  <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
+  <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
   <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
   <link rel="stylesheet" type="text/css" href="[% themelang %]/css/itemsearchform.css" />
   <script type="text/javascript">
@@ -355,7 +355,9 @@
           </fieldset>
           <fieldset>
             [% INCLUDE form_field_select_text_block %]
-            <p class="hint">You can use the following joker characters: % _</p>
+            <p class="hint">You can use the following wildcard characters: % _</p>
+            <p class="hint">% matches any number of characters</p>
+            <p class="hint">_ matches only a single charcter</p>
           </fieldset>
           <fieldset>
             <div class="form-field">