Bugzilla – Attachment 15795 Details for
Bug 6813
Search for duplicates across orders, suggestions and catalog
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6813: Followup: Fix HTML4 coding, new wording, warning on empty search terms
Bug-6813-Followup-Fix-HTML4-coding-new-wording-war.patch (text/plain), 6.88 KB, created by
Marcel de Rooy
on 2013-03-01 10:28:02 UTC
(
hide
)
Description:
Bug 6813: Followup: Fix HTML4 coding, new wording, warning on empty search terms
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2013-03-01 10:28:02 UTC
Size:
6.88 KB
patch
obsolete
>From 9854b193d9de6162889a04143982dae29fc282f1 Mon Sep 17 00:00:00 2001 >From: Marc Veron <veron@veron.ch> >Date: Sun, 23 Sep 2012 16:32:39 +0200 >Subject: [PATCH] Bug 6813: Followup: Fix HTML4 coding, new wording, warning > on empty search terms >Content-Type: text/plain; charset="utf-8" > >The aim of this followup is to fix issues from Comment #17: > >- HTML4 encoding UCfirst fixed >- Warning regardig large databases >- Added javascript with warning if search terms are empty >- Removed not used fields from search form >- Changed wording from "Duplicate search" (Google: 15'000) to "Find duplicates" (Google: 576'000) > >To Test: >Create a an suggestion, order and catalog record for a certain title. Use the duplicate search tool available in the acquisitions menu (left navigation bar) to search and find the suggestion, order and catalog record matching the search term. > >Enter one or more of title, author and ISBN in the search criteria. > >Marc > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../prog/en/includes/acquisitions-menu.inc | 2 +- > .../prog/en/modules/acqui/duplicatesearch.tt | 43 ++++++++++++-------- > 2 files changed, 27 insertions(+), 18 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >index 6ecb148..9be34c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >@@ -5,7 +5,7 @@ > [% IF ( CAN_user_acquisition_budget_manage ) %] > <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li> > <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li> >- <li><a href="/cgi-bin/koha/acqui/duplicatesearch.pl">Duplicate Search</a></li> >+ <li><a href="/cgi-bin/koha/acqui/duplicatesearch.pl">Duplicate finder</a></li> > [% END %] > [% IF ( CAN_user_parameters ) %] > <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt >index 393d8f6..fcf71cf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicatesearch.tt >@@ -1,6 +1,6 @@ > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisitions › Duplicate Search</title> >+<title>Koha › Acquisitions › Duplicate finder</title> > [% INCLUDE 'doc-head-close.inc' %] > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script> >@@ -21,14 +21,29 @@ $(function(){ > <body id="acq_duplicatesearch" class="acq"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] >- >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="duplicatesearch.pl">Duplicate Search</a></div> >+<script type="text/javascript"> >+// <![CDATA[ >+ /** >+ * checkDuplicateFinderForm(myForm) >+ * This function checks the form to be correctly filled (search terms not empty). >+ */ >+ function checkDuplicateFinderForm(myForm) { >+ if( (myForm.title.value.trim() + myForm.author.value.trim() + myForm.isbn.value.trim()).length == 0 ){ >+ alert(_("Please enter a search term for Title, Author and/or ISBN.")); >+ return false; >+ } >+ return true; >+ } >+ // ]]> >+</script> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="duplicatesearch.pl">Duplicate finder</a></div> > <div id="doc3" class="yui-t2"> > <div id="bd"> > <div id="yui-main"> > <div class="yui-b"> > >- <h1>Duplicate Search</h1> >+ <h1>Duplicate finder</h1> >+ <p>Please note that search can be slow on a large database.</p> > <div id="acq_duplicatesearch"> > [% IF ( result ) %] > <div id="alerttabs" class="toptabs"> >@@ -46,8 +61,8 @@ $(function(){ > [% END %] > <thead> > <tr> >- <th>Basket Name</th> >- <th>Order Number</th> >+ <th>Basket name</th> >+ <th>Order number</th> > <th>Summary</th> > <th>Vendor</th> > </tr> >@@ -63,7 +78,7 @@ $(function(){ > </table> > </div> > <div id="pagersuggestiontable"> >- <h1>Suggestion Search Results</h1> >+ <h1>Suggestion search results</h1> > [% IF (numresults_sugg) %] > [% INCLUDE 'table-pager.inc' perpage='10' %] > <table id="suggestiontable" class="sorted"> >@@ -89,7 +104,7 @@ $(function(){ > </table> > </div> > <div id="pagercatalogtable"> >- <h1>Catalog Search Results</h1> >+ <h1>Catalog search results</h1> > [% IF (numresults_bib) %] > [% INCLUDE 'table-pager.inc' perpage='10' %] > <table id="catalogtable" class="sorted"> >@@ -114,27 +129,21 @@ $(function(){ > </div> > </div> > [% ELSE %] >- <p>No Result</p> >+ <p>Please enter search terms.</p> > [% END %] > > </div> > </div> > </div> > <div class="yui-b"> >-<form name="form" action="/cgi-bin/koha/acqui/duplicatesearch.pl" method="post"> >+<form name="duplicateFinderForm" onsubmit="return checkDuplicateFinderForm(this);" action="/cgi-bin/koha/acqui/duplicatesearch.pl" method="post"> > <input type="hidden" name="op" value="result" /> > <fieldset class="brief"> >- <h4>Filter Results:</h4> >+ <h4>Find duplicates:</h4> > <ol> > <li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" size="20" /></li> > <li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" size="20" /></li> > <li><label for="isbn">ISBN: </label> <input type="text" name="isbn" id="isbn" value="[% isbn %]" size="20" /></li> >- <li><label for="title"></label><input type="hidden" name="idx" id="title" value="ti" /></li> >- <li><input type="hidden" name="q" id="title1" value="[% title %]" /></li> >- <li><label for="author"></label><input type="hidden" name="idx" id="author" value="au" /></li> >- <li><input type="hidden" name="q" id="author1" value="[% author %]" /></li> >- <li><label for="isbn"></label><input type="hidden" name="idx" id="isbn" value="nb" /></li> >- <input type="hidden" name="q" id="isbn1" value="[% isbn %]" /> > </ol> > <input type="submit" value="Search" /> <a href="/cgi-bin/koha/acqui/duplicatesearch.pl">Clear All</a> > </fieldset> >-- >1.7.7.6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6813
:
9982
|
11527
|
11531
|
11532
|
11533
|
11534
|
11537
|
11538
|
11539
|
11541
|
11542
|
12456
|
12714
|
12715
|
12716
|
13286
|
13806
|
14009
|
15793
|
15794
| 15795 |
15796