From 9ee41cf025a58aacfab039e89d3a1351d8e3b478 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 1 Nov 2007 20:36:02 -0500
Subject: [PATCH] Some formatting and layout chances to acquisitions pages.
 Taking out table filter-style search form on histsearch.pl and replacing it
 with standard advanced-search style form list.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              |  6 +-
 .../includes/acquisitions-history-search.inc  | 22 ++++++
 .../prog/en/includes/acquisitions-search.inc  |  2 +-
 .../prog/en/modules/acqui/histsearch.tmpl     | 68 +++++++++----------
 .../prog/en/modules/acqui/supplier.tmpl       | 61 ++++++++++-------
 5 files changed, 95 insertions(+), 64 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index c35e9df8ec..0d61ebb040 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -529,7 +529,7 @@ fieldset.rows legend {
 fieldset.rows label, fieldset.rows span.label {  
 	float: left;  
 	font-weight : bold;
-	width: 9em;  
+	width: 6em;  
 	margin-right: 1em;  
 	text-align: right;
 }
@@ -599,6 +599,10 @@ fieldset.action {
 	width : auto;
 }
 
+a.cancel {
+	padding-left : 1em;
+}
+
 fieldset.rows fieldset.action {
 	padding : 0 0 1em 1em;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
new file mode 100644
index 0000000000..03bec164c1
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
@@ -0,0 +1,22 @@
+<!-- Begin Acquisitions Resident Search Box -->
+<div id="header_search">
+<div id="supplier_search" class="residentsearch">
+	<p class="tip">Search suppliers:</p>
+        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+           <input type="text" size="25" name="supplier" id="supplier" class="focus" />
+            <input type="submit" value="Search" /></form>
+</div>
+	<div id="orders_search" class="residentsearch">
+	<p class="tip">Search orders:</p>
+	
+		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="searchsupplier">Supplier:</label> <input type="text" id="searchsupplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
+	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced</a>
+	</form>
+	</div>	
+			<ul>
+			<li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Supplier Search</a></li>
+			<li class="tabs-selected"><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li>
+			</ul>	
+</div>
+<!-- End Acquisitions Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index e2723deeed..3b24040d14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -10,7 +10,7 @@
 	<p class="tip">Search orders:</p>
 	
 		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
-		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="supplier">Supplier:</label> <input type="text" id="supplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
+		<label for="title">Title: </label><input type="text" id="title" name="title" size="15" value="<!-- TMPL_VAR name="title"-->" /> <label for="searchsupplier">Supplier:</label> <input type="text" id="searchsupplier" name="name" size="15" value="<!-- TMPL_VAR name="name" -->" />
 	<input value="Submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced</a>
 	</form>
 	</div>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index b1970bf4df..35e2e63faf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Acquisitions &rsaquo; Order search</title>
+<title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_IF NAME="suggestions_loop" -->Orders search &rsaquo; Search Results<!-- TMPL_ELSE -->Order search<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-history-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Order search</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <!-- TMPL_IF NAME="suggestions_loop" --><a href="/cgi-bin/koha/acqui/histsearch.pl">Orders search</a> &rsaquo; Search Results<!-- TMPL_ELSE -->Order search<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -16,29 +16,14 @@
 	<div id="yui-main">
 	<div class="yui-b">
 	
-
-
-	<h1>Order search</h1>
-	<div id="acqui_histsearch">
-		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
-		<table>
-			<tr>
-				<th>&nbsp;</th>
-				<th>Title</th>
-				<th>Author</th>
-				<th>Supplier</th>
-				<th>Placed on</th>
-				<th>Recieved on</th>
-				<th>Quantity ordered</th>
-				<th>Unit cost</th>
-				<th>&nbsp;</th>
-			</tr>
-			<tr>
-					<th>Filter By:</th>
-					<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
-					<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
-					<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
-					<th><label for="from">From</label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
+		<!-- TMPL_UNLESS NAME="suggestions_loop" --><form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
+<fieldset class="rows">
+	<legend>Search Orders</legend>
+					<ol>
+					<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="<!-- TMPL_VAR name="title"-->" /></li>
+					<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="<!-- TMPL_VAR name="author" -->" /></li>
+					<li><label for="name">Supplier: </label> <input type="text" name="name" id="name" value="<!-- TMPL_VAR name="name" -->" /></li>
+					<li><label for="from">From: </label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" alt="Show Calendar" />
 						<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->" />
 						<script language="JavaScript" type="text/javascript">
 							function validate1(date) {
@@ -65,8 +50,8 @@
 									dateStatusFunc : validate1
 								}
 							);
-						</script>
-						<label for="to">To</label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
+						</script></li>
+						<li><label for="to">To: </label> <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="Show Calendar" />
 						<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
 						<script type="text/javascript">
 							function validate2(date) {
@@ -94,12 +79,25 @@
 									dateStatusFunc : validate2
 								}
 							);
-						</script></th>
-					<th>&nbsp;</th>
-					<th>&nbsp;</th>
-					<th>&nbsp;</th>
-					<th><input type="submit" value="Set Filter" /></th>
+						</script></li>
+			</ol>
+			</fieldset>
+			<fieldset class="action"><input type="submit" value="Search" /></fieldset>
+		</form><!-- /TMPL_UNLESS -->
+	<!-- TMPL_IF NAME="suggestions_loop" --><h1>Search Results</h1>
+	<div id="acqui_histsearch">
+		<table>
+			<tr>
+				<th>&nbsp;</th>
+				<th>Title</th>
+				<th>Author</th>
+				<th>Supplier</th>
+				<th>Placed on</th>
+				<th>Received on</th>
+				<th>Quantity ordered</th>
+				<th>Unit cost</th>
 			</tr>
+			
 			<!-- TMPL_LOOP NAME="suggestions_loop" -->
 				<tr>
 					<td>		    <!-- TMPL_IF NAME="invoicenumber" -->
@@ -115,12 +113,10 @@
 					<td><!-- TMPL_VAR name="datereceived" --></td>
 					<td><!-- TMPL_VAR name="quantity" --></td>
 					<td><!-- TMPL_VAR name="ecost" --></td>
-					<td>&nbsp;</td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		</form>
-	</div>
+	</div><!-- TMPL_ELSE --><!-- /TMPL_IF -->
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 48ff52facf..5921041fff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -22,20 +22,19 @@ function confirm_deletion() {
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-g">
-	
-<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" --><!-- /TMPL_UNLESS -->
-	
-<!--TMPL_IF Name="enter"-->
-    <form action="updatesupplier.pl" method="post">
-    
-    <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-    
-    <!-- TMPL_IF name="id" -->
+	<!--TMPL_IF Name="enter"-->
+	    <!-- TMPL_IF name="id" -->
         <h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
     <!-- TMPL_ELSE -->
         <h1>Add supplier</h1>
     <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" --><!-- /TMPL_UNLESS -->
+<!--TMPL_IF Name="enter"-->
+    <form action="updatesupplier.pl" method="post">
+	<div class="yui-g">
+	<div class="yui-u first">
+        <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
         <fieldset class="rows">
             <legend>Company details</legend>
             <ol><li><label for="company">Company Name</label>
@@ -51,6 +50,8 @@ function confirm_deletion() {
             <li><label for="website">Website</label>
                 <input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></li></ol>
         </fieldset>
+		</div>
+		<div class="yui-u">
         <fieldset class="rows">
             <legend>Contact details</legend>
            <ol> <li><label for="company_contact_name">Contact Name</label>
@@ -68,6 +69,9 @@ function confirm_deletion() {
             <li><label for="contact_notes">Notes</label>
                 <textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></li></ol>
         </fieldset>
+		</div>
+	</div>
+		<div class="yui-g">
         <fieldset class="rows">
             <legend>Ordering information</legend>
             <ol class="radio"><li><label for="activestatus" class="radio">Supplier is:</label>
@@ -101,7 +105,7 @@ function confirm_deletion() {
 				<!-- TMPL_ELSE -->
                     <input type="radio" name="gst" id="gstyes" value="1" /><label for="gstyes">Yes</label>
                     <input type="radio" name="gst" id="gstno" value="0" checked="checked" /><label for="gstno">No</label>
-				<!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
+				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
 			
             <!-- TMPL_IF NAME="GST" --><li>Ordering prices
 				<!-- TMPL_IF name="listincgst" -->
@@ -110,7 +114,7 @@ function confirm_deletion() {
 				<!-- TMPL_ELSE -->
                     <input type="radio" id="list_gstyes" name="list_gst" value="1" /><label for="list_gstyes">include GST</label>
                     <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" /><label for="list_gstno">don't include GST</label>
-				<!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
+				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
 			
             <!-- TMPL_IF NAME="GST" --><li>Invoice prices
 				<!-- TMPL_IF name= "invoiceincgst" -->
@@ -119,19 +123,24 @@ function confirm_deletion() {
 					<!-- TMPL_ELSE -->
                     <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1"><label for="invoice_gstyes">include GST</label>
                     <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" /><label for="invoice_gstno">don't include GST</label>
-				<!-- /TMPL_IF --></li><!-- TMPL_ELSE --><input type="hidden"  name="invoice_gst" value="0" /><!-- /TMPL_IF -->
+				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
             <li><label for="discount">Discount</label>
                 <input type="text" size="3" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
             <li><label for="notes">Notes</label>
-                <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>
+                <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>			
+			<!-- TMPL_UNLESS NAME="GST" -->
+				<input type="hidden" name="gst" value="0" />
+				<input type="hidden" name="list_gst" value="0" />
+				<input type="hidden"  name="invoice_gst" value="0" />
+			<!-- /TMPL_UNLESS -->
         </fieldset>
-        <p><input type="submit" value="Save" /></p>
+        <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">Cancel</a></fieldset>
+		</div>
     </form>
 <!--TMPL_ELSE-->
-    <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
-
-        <div id="supplier-company-details">
-            <h3>Company details</h3>
+    <h1><!-- TMPL_VAR NAME="name" --></h1>
+		<div class="yui-g">
+        <div id="supplier-company-details" class="yui-u first">
             <p><strong>Company Name: </strong>
                 <!-- TMPL_VAR NAME="name" --></p>
             <p><strong>Postal Address: </strong>
@@ -145,7 +154,7 @@ function confirm_deletion() {
            <!-- TMPL_IF NAME="url" --> <p><strong>Web site: </strong>
                 <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
         </div>
-        <div id="supplier-contact-details">
+        <div id="supplier-contact-details" class="yui-u">
             <h3>Contact details</h3>
             <p><strong>Contact name: </strong>
                 <!-- TMPL_VAR NAME="contact" --></p>
@@ -159,11 +168,12 @@ function confirm_deletion() {
                 <!-- TMPL_VAR NAME="contfax" --></p>
             <!-- TMPL_IF NAME="contemail" --><p><strong>E-mail: </strong>
                 <a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p><!-- /TMPL_IF -->
-            <p><strong>Notes: </strong>
-                <!-- TMPL_VAR NAME="contnotes" --></p>
+            <!-- TMPL_IF NAME="contnotes" --><p><strong>Notes: </strong>
+                <!-- TMPL_VAR NAME="contnotes" --></p><!-- /TMPL_IF -->
         
         </div>
-        <div id="supplier-ordering-information">
+		</div>
+        <div id="supplier-ordering-information" class="yui-g">
         <h3>Ordering information</h3>
             <p><strong>Supplier is: </strong>
                     <!-- TMPL_IF name="active" -->
@@ -183,13 +193,12 @@ function confirm_deletion() {
                     <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
             <p><strong>Discount: </strong>
                 <!-- TMPL_VAR NAME="discount" --> %</p>
-            <p><strong>Notes: </strong>
-                <!-- TMPL_VAR NAME="notes" --></p>
+            <!-- TMPL_IF NAME="notes" --><p><strong>Notes: </strong>
+                <!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
         </div>
 
 <!--/TMPL_IF-->
 
-</div>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
-- 
2.39.5