From 5082f7e2804aa3dc97b8b75d04b369e608b28ca0 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 28 Dec 2007 08:53:52 -0600
Subject: [PATCH] Beginning some reformatting of advanced search interface

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/includes/resort_form.inc          |  82 +++++++--
 .../prog/en/modules/catalogue/advsearch.tmpl  | 171 +++++++++---------
 2 files changed, 159 insertions(+), 94 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
index 5b3f216530..54d718423e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
@@ -1,28 +1,86 @@
 <option value="relevance">Relevance</option>
 
 <optgroup label="Popularity">
-<option value="popularity_dsc" <!-- TMPL_IF NAME="popularity_dsc" -->selected="selected" <!-- /TMPL_IF -->>Popularity (Most to Least)</option>
-<option value="popularity_asc" <!-- TMPL_IF NAME="popularity_asc" -->selected="selected" <!-- /TMPL_IF -->>Popularity (Least to Most)</option>
+	
+	<!-- TMPL_IF NAME="popularity_dsc" -->
+<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>
+<!-- TMPL_ELSE -->
+	<option value="popularity_dsc">Popularity (Most to Least)</option>
+ <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="popularity_asc" -->
+<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>
+<!-- TMPL_ELSE -->
+	<option value="popularity_asc">Popularity (Least to Most)</option>
+ <!-- /TMPL_IF -->
+
 </optgroup>
 
 <optgroup label="Author">
-<option value="author_az" <!-- TMPL_IF NAME="author_az" -->selected="selected" <!-- /TMPL_IF -->>Author (A-Z)</option>
-<option value="author_za" <!-- TMPL_IF NAME="author_za" -->selected="selected" <!-- /TMPL_IF -->>Author (Z-A)</option>
+	
+	<!-- TMPL_IF NAME="author_az" -->
+<option value="author_az" selected="selected">Author (A-Z)</option>	
+<!-- TMPL_ELSE -->
+<option value="author_az">Author (A-Z)</option>
+ <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="author_za" -->
+<option value="author_za" selected="selected">Author (Z-A)</option>
+<!-- TMPL_ELSE -->
+<option value="author_za">Author (Z-A)</option>
+ <!-- /TMPL_IF -->
+
 </optgroup>
 
 <optgroup label="Call Number">
-<option value="call_number_asc" <!-- TMPL_IF NAME="call_number_asc" -->selected="selected" <!-- /TMPL_IF -->>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
-<option value="call_number_dsc" <!-- TMPL_IF NAME="call_number_dsc" -->selected="selected" <!-- /TMPL_IF -->>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+	
+	<!-- TMPL_IF NAME="call_number_asc" -->
+<option value="call_number_asc" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+<!-- TMPL_ELSE -->
+	<option value="call_number_asc">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="call_number_dsc" -->
+<option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+<!-- TMPL_ELSE -->
+	<option value="call_number_dsc">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+<!-- /TMPL_IF -->
+
 </optgroup>
 
 <optgroup label="Dates">
-<option value="pubdate_dsc" <!-- TMPL_IF NAME="pubdate_dsc" -->selected="selected" <!-- /TMPL_IF -->>Publication/Copyright Date: Newest to Oldest</option>
-<option value="pubdate_asc" <!-- TMPL_IF NAME="pubdate_asc" -->selected="selected" <!-- /TMPL_IF -->>Publication/Copyright Date: Oldest to Newest</option>
-<option value="acqdate_dsc" <!-- TMPL_IF NAME="acqdate_dsc" -->selected="selected" <!-- /TMPL_IF -->>Acquisition Date: Newest to Oldest</option>
-<option value="acqdate_asc" <!-- TMPL_IF NAME="acqdate_dsc" -->selected="selected" <!-- /TMPL_IF -->>Acquisition Date: Oldest to Newest</option>
+	<!-- TMPL_IF NAME="pubdate_dsc" -->
+<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
+	<!-- TMPL_ELSE -->
+<option value="pubdate_dsc">Publication/Copyright Date: Newest to Oldest</option>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="pubdate_asc" -->
+<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
+<!-- TMPL_ELSE -->
+<option value="pubdate_asc">Publication/Copyright Date: Oldest to Newest</option>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="acqdate_dsc" -->
+<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
+<!-- TMPL_ELSE -->
+<option value="acqdate_dsc">Acquisition Date: Newest to Oldest</option>
+ <!-- /TMPL_IF -->
+
+ <!-- TMPL_IF NAME="acqdate_dsc" -->
+<option value="acqdate_asc"selected="selected">Acquisition Date: Oldest to Newest</option>
+<!-- TMPL_ELSE -->
+<option value="acqdate_asc">Acquisition Date: Oldest to Newest</option>
+ <!-- /TMPL_IF -->
 </optgroup>
 
 <optgroup label="Title">
-<option value="title_az" <!-- TMPL_IF NAME="title_az" -->selected="selected" <!-- /TMPL_IF -->>Title (A-Z)</option>
-<option value="title_za" <!-- TMPL_IF NAME="title_za" -->selected="selected" <!-- /TMPL_IF -->>Title (Z-A)</option>
+	<!-- TMPL_IF NAME="title_az" -->
+<option value="title_az" selected="selected">Title (A-Z)</option>
+	<!-- TMPL_ELSE -->
+<option value="title_az">Title (A-Z)</option>
+	 <!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="title_za" -->
+<option value="title_za" selected="selected">Title (Z-A)</option>	
+	<!-- TMPL_ELSE -->
+<option value="title_za">Title (Z-A)</option>
+<!-- /TMPL_IF -->
 </optgroup>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index e17a1ad0cc..9dd5a089ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -7,7 +7,7 @@
 	 *  This function allows to display a new field to search.
 	 */
 	function add_field() {
-	    var ButtonPlus = document.getElementById('ButtonPlus');
+	    var ButtonPlus = document.getElementById("ButtonPlus");
 		var line = ButtonPlus.parentNode;
 		var dad  = line.parentNode;
 		dad.appendChild(line.cloneNode(true));
@@ -32,8 +32,7 @@
 <fieldset>
         <legend>Select local databases</legend>
                 <!-- TMPL_LOOP NAME="local_servers_loop" -->
-                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/img/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
-                <!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME="checked" --><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" checked="checked" value="<!-- TMPL_VAR NAME="value" -->" /><!-- TMPL_ELSE --><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" /><!-- /TMPL_IF --><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/img/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label><!-- /TMPL_LOOP -->
 </fieldset>
 <!-- /DATABASES -->
 <!-- /TMPL_IF -->
@@ -43,7 +42,8 @@
 <fieldset>
     <legend>Select remote databases:</legend>
                 <!-- TMPL_LOOP NAME="outer_servers_loop" -->
-                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /><!-- TMPL_VAR NAME="label" --></label>
+                <!-- TMPL_IF NAME="checked" --><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" checked="checked" value="<!-- TMPL_VAR NAME="value" -->" /><!-- TMPL_ELSE --><input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" /><!-- /TMPL_IF -->
+<label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /><!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
     </fieldset>
 <!-- /REMOTE DATABASES -->
@@ -53,7 +53,7 @@
     <fieldset>
     <legend>Search For: </legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
-        <div>
+        <!-- TMPL_IF NAME="search_boxes_label" --><div style="text-indent: 4.5em;"><!-- TMPL_ELSE --><div><!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="expanded_options" -->
             <!-- TMPL_IF NAME="boolean" -->
                 <select name="op">
@@ -64,7 +64,7 @@
             <!-- /TMPL_IF --> 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_INCLUDE NAME="search_indexes.inc" -->
-			<input id="search_box" type="text" size="30" name="q" title="Enter search terms" value="" class="focus" />
+			<input type="text" size="30" name="q" title="Enter search terms" value="" class="focus" />
             <!-- TMPL_IF NAME="expanded_options" -->
                 <!-- TMPL_IF NAME="add_field" -->
                     <a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>
@@ -88,7 +88,7 @@
         <td>
         <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
 		<input type="checkbox" id="mc-<!--TMPL_VAR Name="number" -->" name="limit" value="mc:<!--TMPL_VAR Name="code" -->" />&nbsp;
-        <!--TMPL_VAR Name="description" --></td>
+        <label for="mc-<!--TMPL_VAR Name="number" -->"><!--TMPL_VAR Name="description" --></label></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->
       </tr>
@@ -111,7 +111,12 @@
 		<select name="limit">
 		<option value="">No Limit</option>
 		<!-- TMPL_LOOP NAME="search_languages_loop" -->
-		<option value="ln:<!-- TMPL_VAR NAME="language_code" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="language_name" --> <!-- TMPL_IF NAME="language_locale_name" -->(<!-- TMPL_VAR NAME="language_locale_name" -->)<!-- /TMPL_IF --></option>
+		<!-- TMPL_IF NAME="selected" -->
+		<option value="ln:<!-- TMPL_VAR NAME="language_code" -->" selected="selected"><!-- TMPL_VAR NAME="language_name" --> <!-- TMPL_IF NAME="language_locale_name" -->(<!-- TMPL_VAR NAME="language_locale_name" -->)<!-- /TMPL_IF --></option>
+		<!-- TMPL_ELSE -->
+		<option value="ln:<!-- TMPL_VAR NAME="language_code" -->"><!-- TMPL_VAR NAME="language_name" --> <!-- TMPL_IF NAME="language_locale_name" -->(<!-- TMPL_VAR NAME="language_locale_name" -->)<!-- /TMPL_IF --></option>
+		<!-- /TMPL_IF -->
+		
 		<!-- /TMPL_LOOP -->
 		</select></p><!-- <a href="">Show all languages</a>-->
 <!-- /LANGUAGE LIMIT -->
@@ -119,6 +124,76 @@
 <!-- /BASIC LIMITS -->
 <!-- /TMPL_IF -->
 
+
+<!-- TMPL_IF NAME="UNIMARC" -->
+<!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
+<!-- TMPL_ELSE -->
+<!-- SUBTYPE LIMITS -->
+        <fieldset>
+        <legend>Subtype limits:</legend><p>
+        
+        <select name="limit" class="subtype">
+            <option value="" selected="selected" class="menuheader">Any audience</option>
+            <option value="aud:a" >Easy</option>
+            <option value="aud:c" >Juvenile</option>
+            <option value="aud:d" >Young adult</option>
+            <option value="aud:e" >Adult</option>
+        </select>
+        
+        <select name="limit" class="subtype">
+            <option value="" selected="selected" class="menuheader">Any content</option>
+            <option value="fic:1" >Fiction</option>
+            <option value="fic:0" >Non fiction</option>
+            <option value="bio:b" >Biography</option>
+            <option value="mus:j" >Musical recording</option>
+            <option value="mus:i" >Non-musical recording</option>
+        </select>
+
+        
+        <select name="limit" class="subtype">
+            <option value="" selected="selected" class="menuheader">Any format</option>
+            <option value="l-format:ta" >Regular print</option>
+            <option value="l-format:tb" >Large print</option>
+            <option value="l-format:fk" >Braille</option>
+            <option value="" >-----------</option>
+            <option value="l-format:sd" >CD audio</option>
+            <option value="l-format:ss" >Cassette recording</option>
+            <option value="l-format:vf" >VHS tape / Videocassette</option>
+            <option value="l-format:vd" >DVD video / Videodisc</option>
+            <option value="l-format:co" >CD Software</option>
+            <option value="l-format:cr" >Website</option>
+        </select>
+        
+        <select name="limit" class="subtype">
+            <option value="" >Additional content types</option>
+            <option value="ctype:a" >Abstracts/summaries</option>
+            <option value="ctype:b" >Bibliographies</option>
+            <option value="ctype:c" >Catalogs</option>
+            <option value="ctype:d" >Dictionaries</option>
+            <option value="ctype:e" >Encyclopedias </option>
+            <option value="ctype:f" >Handbooks</option>
+            <option value="ctype:g" >Legal articles</option>
+            <option value="ctype:i" >Indexes</option>
+            <option value="ctype:j" >Patent document</option>
+            <option value="ctype:k" >Discographies</option>
+            <option value="ctype:l" >Legislation</option>
+            <option value="ctype:m" >Theses</option>
+            <option value="ctype:n" >Surveys</option>
+            <option value="ctype:o" >Reviews</option>
+            <option value="ctype:p" >Programmed texts</option>
+            <option value="ctype:q" >Filmographies</option>
+            <option value="ctype:r" >Directories</option>
+            <option value="ctype:s" >Statistics</option>
+            <option value="ctype:t" >Technical reports</option>
+            <option value="ctype:v" >Legal cases and case notes</option>
+            <option value="ctype:w" >Law reports and digests</option>
+            <option value="ctype:z" >Treaties </option>
+        </select>
+       </p>
+
+</fieldset>
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="template-defined-limits" -->
 <!-- TYPE LIMITS -->
     <fieldset>
@@ -168,23 +243,23 @@
 <!-- AVAILABILITY LIMITS -->
     <fieldset><legend>Location and availability: </legend>
         <p>
-        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="available" /></p>
+        <label for="available-items">Only items currently available</label> <input type="checkbox" id="available-items" name="limit" value="available" /></p>
         <p>
-        <label>Individual Libraries </label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
+        <label for="branchloop">Individual Libraries:</label><select name="limit" id="branchloop" onchange="if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}">
         <option value="">All Libraries</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
-        <option value="homebranch:<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
+        <option value="homebranch:<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
         <!-- /TMPL_LOOP -->
         </select>
-    <!-- <input type='hidden' name='limit' value='branch: MAIN' /> -->
+    <!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
         </p>
         <!-- TMPL_IF NAME="searchdomainloop" -->
     <p>OR<p> <!-- should addjs to grey out group pulldown if a library is selected. -->
     <p>
-        <label>Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
+        <label for="categoryloop">Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
         <option value=""> -- none -- </option>
         <!-- TMPL_LOOP NAME="searchdomainloop" -->
-        <option value="<!-- TMPL_VAR NAME='categorycode' -->"><!-- TMPL_VAR NAME='categoryname' --></option>
+        <option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categoryname" --></option>
         <!-- /TMPL_LOOP -->
         </select>
         </p>
@@ -203,75 +278,7 @@
 <!-- RANK LIMITS -->
 
 </div>
-<!-- TMPL_IF NAME="UNIMARC" -->
-<!-- TMPL_INCLUDE NAME="subtypes_unimarc.inc" -->
-<!-- TMPL_ELSE -->
-<div id="sidebar">
-<!-- SUBTYPE LIMITS -->
-        <fieldset>
-        <legend>Subtype limits:</legend><p>
-        
-        <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any audience</option>
-            <option value="aud:a" >Easy</option>
-            <option value="aud:c" >Juvenile</option>
-            <option value="aud:d" >Young adult</option>
-            <option value="aud:e" >Adult</option>
-        </select>
-        
-        <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any content</option>
-            <option value="fic:1" >Fiction</option>
-            <option value="fic:0" >Non fiction</option>
-            <option value="bio:b" >Biography</option>
-            <option value="mus:j" >Musical recording</option>
-            <option value="mus:i" >Non-musical recording</option>
-        </select>
 
-        
-        <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any format</option>
-            <option value="l-format:ta" >Regular print</option>
-            <option value="l-format:tb" >Large print</option>
-            <option value="l-format:fk" >Braille</option>
-            <option value="" >-----------</option>
-            <option value="l-format:sd" >CD audio</option>
-            <option value="l-format:ss" >Cassette recording</option>
-            <option value="l-format:vf" >VHS tape / Videocassette</option>
-            <option value="l-format:vd" >DVD video / Videodisc</option>
-            <option value="l-format:co" >CD Software</option>
-            <option value="l-format:cr" >Website</option>
-        </select>
-        
-        <select name="limit" class="subtype">
-            <option value="" >Additional content types</option>
-            <option value="ctype:a" >Abstracts/summaries</option>
-            <option value="ctype:b" >Bibliographies</option>
-            <option value="ctype:c" >Catalogs</option>
-            <option value="ctype:d" >Dictionaries</option>
-            <option value="ctype:e" >Encyclopedias </option>
-            <option value="ctype:f" >Handbooks</option>
-            <option value="ctype:g" >Legal articles</option>
-            <option value="ctype:i" >Indexes</option>
-            <option value="ctype:j" >Patent document</option>
-            <option value="ctype:k" >Discographies</option>
-            <option value="ctype:l" >Legislation</option>
-            <option value="ctype:m" >Theses</option>
-            <option value="ctype:n" >Surveys</option>
-            <option value="ctype:o" >Reviews</option>
-            <option value="ctype:p" >Programmed texts</option>
-            <option value="ctype:q" >Filmographies</option>
-            <option value="ctype:r" >Directories</option>
-            <option value="ctype:s" >Statistics</option>
-            <option value="ctype:t" >Technical reports</option>
-            <option value="ctype:v" >Legal cases and case notes</option>
-            <option value="ctype:w" >Law reports and digests</option>
-            <option value="ctype:z" >Treaties </option>
-        </select>
-       </p>
-
-</fieldset>
-<!-- /TMPL_IF -->
 
 <!-- SEARCH BUTTONS -->
             <p><input class="submit" type="submit" accesskey="s" value="Search" />
-- 
2.20.1