summaryrefslogtreecommitdiff
authorJulian Maurice <julian.maurice@biblibre.com>2014-05-06 14:34:38 (GMT)
committer Tomas Cohen Arazi <tomascohen@gmail.com>2014-11-04 22:10:28 (GMT)
commit2f2ff6729ddc7fe630382a376165955503033220 (patch) (side-by-side diff)
tree8ca1107cf2b502a47c1db773a0143399abecaa43
parent3e3717a86112b17e2b2e5bb7a0215e46b388a632 (diff)
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc2
-rw-r--r--koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc2
-rw-r--r--koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt6
3 files changed, 6 insertions, 4 deletions
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
--- 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
--- 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
--- 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">