From 30e56e430e6dc017707a8f7898607c2038f85916 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 3 Feb 2010 11:51:03 -0500
Subject: [PATCH] Fix for Bug 4086, categorycode on patron search confusing

- Changed 'categorycode' to 'category'
- Formatted additional options to be more compact
- Returning patron search page to wide layout following
  removal of patron filter from the sidebar
- Corrected some other markup that was causing validation errors

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 .../prog/en/includes/patron-search.inc        | 26 +++++++++----------
 .../prog/en/includes/patron-toolbar.inc       |  8 +++---
 .../prog/en/modules/members/member.tmpl       | 21 +++++++--------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 47063a262e..4a9aa47cde 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -32,7 +32,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
         this.oACDS.maxCacheEntries = 60;
         this.oACDS.queryMatchSubset = true;
-    
+
         // Instantiate first AutoComplete
         var myInput = document.getElementById('findborrower');
         var myContainer = document.getElementById('yborrowercontainer');
@@ -41,7 +41,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         //this.oAutoComp.queryDelay = 1;
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
-});    
+});
 //]]>
 </script><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <div id="header_search">
@@ -50,29 +50,29 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
     <input id="searchmember" size="25" class="focus" name="member" type="text" value="<!--TMPL_VAR Name="member"-->"/>
 	<!--TMPL_IF Name="branchloop"-->
-	<span class="filteraction" id="filteraction_off"> <a href="#" onClick="$('#filters').toggle();$('.filteraction').toggle();">[-]</a></span>
-	<span class="filteraction" id="filteraction_on"> <a href="#" onClick="$('#filters').toggle();$('.filteraction').toggle();">[+]</a></span>
+	<span class="filteraction" id="filteraction_off"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').toggle();">[-]</a></span>
+	<span class="filteraction" id="filteraction_on"> <a href="#" onclick="$('#filters').toggle();$('.filteraction').toggle();">[+]</a></span>
 	<!--/TMPL_IF -->
     order by:
     <select name="orderby" id="searchorderby">
     <option value="surname,1">Surname</option>
-    <option value="cardnumber,1">Cardnumber</option>
+    <option value="cardnumber,1">Card number</option>
     </select>
     <input value="Search" class="submit" type="submit" />
 	<!--TMPL_IF Name="branchloop"-->
-	<div id="filters"> <label for="branchcode"> Library :</label><select name="branchcode" id="branchcode">
+	<p id="filters"> <label for="branchcode">Library: </label><select name="branchcode" id="branchcode">
         <option value="">Any</option><!-- TMPL_LOOP name="branchloop" -->
         <!-- TMPL_IF NAME="selected" -->
         <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="branchname" --></option><!-- TMPL_ELSE -->
         <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option><!-- /TMPL_IF -->
-      <!-- /TMPL_LOOP --></select><br />
-                 <label for="categorycode"> categorycode :</label><select name="categorycode" id="categorycode">
+      <!-- /TMPL_LOOP --></select>
+                 <label for="categorycode">Category: </label><select name="categorycode" id="categorycode">
         <option value="">Any</option><!-- TMPL_LOOP name="categoryloop" -->
         <!-- TMPL_IF NAME="selected" -->
         <option value="<!-- TMPL_VAR name="categorycode" -->" selected="selected"><!-- TMPL_VAR name="description" --></option><!-- TMPL_ELSE -->
         <option value="<!-- TMPL_VAR name="categorycode" -->"><!-- TMPL_VAR name="description" --></option><!-- /TMPL_IF -->
       <!-- /TMPL_LOOP --></select>
-	</div>
+	</p>
 	<!--/TMPL_IF -->
 </form>
 	</div>
@@ -110,13 +110,13 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 			<li><a href="/cgi-bin/koha/members/members-home.pl#patron_search">Search Patrons</a></li>
 			<!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li><!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li><!-- /TMPL_IF -->
-			</ul>	
+			</ul>
 </div>
 <script type="text/javascript">//<![CDATA[
 $(document).ready(function() {
-	$("#filters").toggle(); 
-	$("#filteraction_off").toggle(); 
-}); 
+	$("#filters").toggle();
+	$("#filteraction_off").toggle();
+});
 //]]>
 </script>
 <!-- End Patrons Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
index e1b46a5b04..d7c87c4822 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
@@ -34,8 +34,8 @@
 			{ text: _("Staff"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=S" },
 			{ text: _("Statistical"),  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=X" },
 <!--/TMPL_IF-->
-		] 
-	
+		]
+
 	    new YAHOO.widget.Button({
 	        type: "menu",
 	        label: _("New"),
@@ -43,7 +43,7 @@
 	        menu: newmenu,
 	        container: "newmenuc"
 	    });
-	
+
 	}
 
 	//]]>
@@ -52,7 +52,7 @@
 	<li id="newmenuc">
 		<form action="/cgi-bin/koha/members/memberentry.pl" method="get">
 			<input type="hidden" name="op" value="add" />
-			<label for="categorycode">New Patron: </label><select name="categorycode" id="categorycode">
+			<label for="newcategorycode">New Patron: </label><select name="categorycode" id="newcategorycode">
 			<!--TMPL_IF Name="AddPatronLists_categorycode"-->
 				<!--TMPL_LOOP Name="categories"--><option value="<!--TMPL_VAR Name="categorycode"-->"><!--TMPL_VAR Name="description"--></option><!--/TMPL_LOOP-->
 			<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 44cedfe186..0cf952a4c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -8,19 +8,19 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <!-- TMPL_IF NAME="searching" --><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Search Results<!-- TMPL_ELSE -->Patrons<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
-   
+<div id="doc2" class="yui-t7">
+
    <div id="bd">
 		<div id="yui-main">
 		    <div class="yui-b">
-				<div role="main" class="yui-g"> 
-	
+				<div class="yui-g">
+
 				<!-- TMPL_INCLUDE NAME="patron-toolbar.inc" -->
 
 						<div class="browse">
 							Browse by last name:
 							<!-- TMPL_LOOP name="letters" -->
-								<a href="/cgi-bin/koha/members/member.pl?quicksearch=1&surname=<!-- TMPL_VAR NAME="letter" -->"><!-- TMPL_VAR NAME="letter" --></a>
+								<a href="/cgi-bin/koha/members/member.pl?quicksearch=1&amp;surname=<!-- TMPL_VAR NAME="letter" -->"><!-- TMPL_VAR NAME="letter" --></a>
 							<!-- /TMPL_LOOP -->
 						</div>
 
@@ -88,10 +88,9 @@
 
 				<div class="yui-g">
 				<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
-				</div>
-			</div> 
-		     
-    </div> 
+			</div>
+
+    </div>
 </div>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">//<![CDATA[
@@ -99,8 +98,8 @@ $(document).ready(function() {
 	$("#memberresultst").tablesorter({
 		sortList: [[1,0]],
 		widgets:	['zebra']
-	}); 
-}); 
+	});
+});
 //]]>
 </script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
2.39.5