[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/catalogue ...
Henri-Damien LAURENT
laurenthdl at alinto.com
Fri Jul 20 18:10:51 CEST 2007
CVSROOT: /cvsroot/koha
Module name: koha
Changes by: Henri-Damien LAURENT <hdl> 07/07/20 16:10:51
Modified files:
koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl
results.tmpl
Log message:
Bug Fixing search order now relies on Template and not on internal lists.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl?cvsroot=koha&r1=1.13&r2=1.14
Patches:
Index: advsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- advsearch.tmpl 10 Jul 2007 15:21:51 -0000 1.9
+++ advsearch.tmpl 20 Jul 2007 16:10:51 -0000 1.10
@@ -60,29 +60,29 @@
</select>
<!-- /TMPL_IF -->
<select name="idx">
- <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
- <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
+ <option value="kw,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
+ <option value="au,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
<option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Author Phrase</option>
- <option value="cpn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Corporate Name</option>
- <option value="cfn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Conference Name</option>
+ <option value="cpn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Corporate Name</option>
+ <option value="cfn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Conference Name</option>
<option value="cpn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Corporate Name Phrase</option>
<option value="cfn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Conference Name Phrase</option>
- <option value="pn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Personal Name</option>
+ <option value="pn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Personal Name</option>
<option value="pn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Personal Name Phrase</option>
<option value="ln" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Language</option>
- <option value="nt" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
- <option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
- <option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
+ <option value="nt,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
+ <option value="pb,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
+ <option value="pl,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
<option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
<option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
<option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> ISBN</option>
<option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> ISSN</option>
<option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Call Number</option>
- <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
+ <option value="su,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
<option value="su,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Subject Phrase</option>
- <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
+ <option value="ti,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
<option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Title Phrase</option>
- <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Series Title</option>
+ <option value="se,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> Series Title</option>
<option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
</select>
@@ -430,17 +430,77 @@
<!-- /AVAILABILITY LIMITS -->
<!-- RANK LIMITS -->
-<!-- TMPL_IF NAME="sort_by_loop" -->
<fieldset><legend>Sort by: </legend>
<p><select id="sort_by" name="sort_by">
<option value="">Field-weighted, Relevance Ranked</option>
- <!-- TMPL_LOOP NAME="sort_by_loop" -->
- <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
- <!-- /TMPL_LOOP -->
+ <!--TMPL_IF Name="9523a"-->
+ <option value="1=9523 >i" selected>Popularity (Most to Least)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=9523 >i">Popularity (Most to Least)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="9523d"-->
+ <option value="1=9523 <i" selected>Popularity (Least to Most)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=9523 <i">Popularity (Least to Most)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="1003d"-->
+ <option value="1=1003 <i" selected>Author (A-Z)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=1003 <i">Author (A-Z)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="1003a"-->
+ <option value="1=1003 >i" selected>Author (Z-A)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=1003 >i">Author (Z-A)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="20d"-->
+ <option value="1=20 <i" selected>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=20 <i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="20a"-->
+ <option value="1=20 >i" selected>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=20 >i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="31a"-->
+ <option value="1=31 >i" selected>Dates</option>
+ <!--TMPL_ELSE -->
+ <option value="1=31 >i">Dates</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="31a"-->
+ <option value="1=31 >i" selected> Publication/Copyright Date: Newest to Oldest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=31 >i"> Publication/Copyright Date: Newest to Oldest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="31d"-->
+ <option value="1=31 <i"> Publication/Copyright Date: Oldest to Newest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=31 <i"> Publication/Copyright Date: Oldest to Newest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="32a"-->
+ <option value="1=32 >i" selected> Acquisition Date: Newest to Oldest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=32 >i"> Acquisition Date: Newest to Oldest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="32d"-->
+ <option value="1=32 <i" selected> Acquisition Date: Oldest to Newest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=32 <i"> Acquisition Date: Oldest to Newest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="4d"-->
+ <option value="1=4 <i" selected>Title (A-Z)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=4 <i">Title (A-Z)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="4a"-->
+ <option value="1=4 >i" selected>Title (Z-A)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=4 >i">Title (Z-A)</option>
+ <!--/TMPL_IF-->
</select>
</p>
</fieldset>
-<!-- /TMPL_IF -->
<!-- RANK LIMITS -->
<p></p>
<!-- SEARCH BUTTONS -->
Index: results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- results.tmpl 19 Jul 2007 13:20:53 -0000 1.13
+++ results.tmpl 20 Jul 2007 16:10:51 -0000 1.14
@@ -176,17 +176,77 @@
<input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" escape="html" -->" />
<!-- /TMPL_IF -->
<!-- RE-SORT START -->
- <!-- TMPL_IF NAME="sort_by_loop" -->
<p>
Re-sort results
<select id="sort_by" name="sort_by" onChange="document.myform.submit();">
<option value="">Field-weighted, Relevance Ranked</option>
- <!-- TMPL_LOOP NAME="sort_by_loop" -->
- <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
- <!-- /TMPL_LOOP -->
+ <!--TMPL_IF Name="9523a"-->
+ <option value="1=9523 >i" selected>Popularity (Most to Least)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=9523 >i">Popularity (Most to Least)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="9523d"-->
+ <option value="1=9523 <i" selected>Popularity (Least to Most)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=9523 <i">Popularity (Least to Most)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="1003d"-->
+ <option value="1=1003 <i" selected>Author (A-Z)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=1003 <i">Author (A-Z)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="1003a"-->
+ <option value="1=1003 >i" selected>Author (Z-A)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=1003 >i">Author (Z-A)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="20d"-->
+ <option value="1=20 <i" selected>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=20 <i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="20a"-->
+ <option value="1=20 >i" selected>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=20 >i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="31a"-->
+ <option value="1=31 >i" selected>Dates</option>
+ <!--TMPL_ELSE -->
+ <option value="1=31 >i">Dates</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="31a"-->
+ <option value="1=31 >i" selected> Publication/Copyright Date: Newest to Oldest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=31 >i"> Publication/Copyright Date: Newest to Oldest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="31d"-->
+ <option value="1=31 <i"> Publication/Copyright Date: Oldest to Newest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=31 <i"> Publication/Copyright Date: Oldest to Newest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="32a"-->
+ <option value="1=32 >i" selected> Acquisition Date: Newest to Oldest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=32 >i"> Acquisition Date: Newest to Oldest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="32d"-->
+ <option value="1=32 <i" selected> Acquisition Date: Oldest to Newest</option>
+ <!--TMPL_ELSE -->
+ <option value="1=32 <i"> Acquisition Date: Oldest to Newest</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="4d"-->
+ <option value="1=4 <i" selected>Title (A-Z)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=4 <i">Title (A-Z)</option>
+ <!--/TMPL_IF-->
+ <!--TMPL_IF Name="4a"-->
+ <option value="1=4 >i" selected>Title (Z-A)</option>
+ <!--TMPL_ELSE -->
+ <option value="1=4 >i">Title (Z-A)</option>
+ <!--/TMPL_IF-->
</select>
</p>
- <!-- /TMPL_IF -->
<!-- RESORT END -->
</form>
<!-- TABLE RESULTS START -->
@@ -260,7 +320,7 @@
<!-- TMPL_IF NAME="items_loop" -->
<span class="available">
<!-- TMPL_LOOP NAME="items_loop" -->
- <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchname" -->
+ <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchcode" -->
<i>
<!-- TMPL_IF name="location" --><!-- TMPL_VAR name="location" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><!-- /TMPL_IF -->
More information about the Koha-cvs
mailing list