From ede0e491647632eba709d1fa87acc119f4ecce27 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 29 Oct 2014 09:48:39 -0400 Subject: [PATCH] Bug 11425 [Template follow-up] Search form for items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This template followup makes several changes to markup and text: - Replace "Bibliographic reference" with "Title" - Replace "Callnumber" with "Call number" - Replace "Home branch" with "Home library" - Replace "Holding branch" with "Current location" - Replace "Location" with "Shelving location" - Replace "Issues" with "Checkouts" - Replace "Indifferent" with "Ignore" - Replace "&" with "&" where necessary - Correct page title and breadcrumbs - Remove label "for" attribute from labels which do not directly target a form field - Correct label "for" attribute on labels which should target a form field - Correct date format hint This patch also makes one change to the way the page display works: The search results section is now in a separate div which uses a different grid rule, allowing it to take up the full width of the screen. To keep the page headers from looking weird I've changed the markup so that each section has its own header. To test, perform a variety of searches and confirm that the output in both Screen and CSV views looks correct. Confirm that search results which are output to the screen are formatted nicely and that the "edit search" links work correctly to show the search form. Submitting a new search after editing a search should hide the form and redisplay the search results table. Followed test plan, works as expected. Signed-off-by: Marc VĂ©ron --- .../prog/en/includes/catalogue/itemsearch_item.inc | 2 +- .../en/includes/catalogue/itemsearch_items.inc | 12 ++-- .../prog/en/modules/catalogue/itemsearch.csv.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 74 +++++++++++----------- 4 files changed, 46 insertions(+), 44 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 c02cfbf..5b08b91 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 @@ [% item.stocknumber %] [% item.status %] [% item.issues || 0 %] - Edit + Edit diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc index 33b4c36..1f078a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc @@ -26,18 +26,18 @@ - [% INCLUDE itemsearch_header name='title' label='title' text='Bibliographic reference' %] + [% INCLUDE itemsearch_header name='title' label='title' text='Title' %] [% INCLUDE itemsearch_header name='publicationyear' label='publication date' text='Publication date' %] [% INCLUDE itemsearch_header name='publishercode' label='publisher' text='Publisher' %] [% INCLUDE itemsearch_header name='collectiontitle' label='collection' text='Collection' %] [% INCLUDE itemsearch_header name='barcode' label='barcode' text='Barcode' %] - [% INCLUDE itemsearch_header name='itemcallnumber' label='callnumber' text='Callnumber' %] - [% INCLUDE itemsearch_header name='homebranch' label='home branch' text='Home branch' %] - [% INCLUDE itemsearch_header name='holdingbranch' label='holding branch' text='Holding branch' %] - [% INCLUDE itemsearch_header name='location' label='location' text='Location' %] + [% INCLUDE itemsearch_header name='itemcallnumber' label='callnumber' text='Call number' %] + [% INCLUDE itemsearch_header name='homebranch' label='home branch' text='Home library' %] + [% INCLUDE itemsearch_header name='holdingbranch' label='holding branch' text='Current location' %] + [% INCLUDE itemsearch_header name='location' label='location' text='Shelving location' %] [% INCLUDE itemsearch_header name='stocknumber' label='stock number' text='Stock number' %] [% INCLUDE itemsearch_header name='notforloan' label='status' text='Status' %] - [% INCLUDE itemsearch_header name='issues' label='issues' text='Issues' %] + [% INCLUDE itemsearch_header name='issues' label='issues' text='Checkouts' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt index b69f610..5b2bbea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt @@ -1,4 +1,4 @@ -Bibliographic reference, Publication Date, Publisher, Collection, Barcode, Callnumber, Home branch, Holding branch, Location, Stock number, Status, Issues +Title, Publication Date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Stock number, Status, Checkouts [% FOREACH item IN results -%] [%- INCLUDE 'catalogue/itemsearch_item.csv.inc' item = item -%] [%- END -%] 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 5ee86d5..57d605e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -59,7 +59,7 @@ [% END %] - + @@ -130,11 +130,11 @@ [%# Page starts here %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Catalog › Advanced search + Koha › Catalog › Item search [% INCLUDE 'doc-head-close.inc' %] + [% INCLUDE 'datatables.inc' %] -