Attachment 30199 Details for Bug 11425 – Bug 11425: QA fixes

[patch] Bug 11425: QA fixes

Bug-11425-QA-fixes.patch (text/plain), 3.53 KB, created by Bernardo Gonzalez Kriegel on 2014-07-28 12:26:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernardo Gonzalez Kriegel

Created: 2014-07-28 12:26:41 UTC

Size: 3.53 KB

patch

obsolete

>From 1520793db288b5fc72c8f19ebfba06f785fac603 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Tue, 6 May 2014 16:34:38 +0200
>Subject: [PATCH] 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>
>---
> .../prog/en/includes/catalogue/itemsearch_item.inc |    2 +-
> .../en/includes/catalogue/itemsearch_item.json.inc |    2 +-
> .../prog/en/modules/catalogue/itemsearch.tt        |    6 ++++--
> 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">
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 11425: 23674 | 23675 | 26334 | 26335 | 26555 | 26556 | 26557 | 27111 | 27112 | 27113 | 27162 | 27975 | 27976 | 27977 | 27978 | 27979 | 29965 | 30195 | 30196 | 30197 | 30198 | 30199 | 30200 | 32304 | 32305 | 32306 | 32307 | 32308 | 32309 | 32669 | 32670 | 32671 | 32672 | 32673 | 32674 | 32675 | 32918 | 32926 | 32947 | 32948