[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/acqui acqu... [rel_3_0]

paul poulain paul at koha-fr.org
Wed Nov 1 22:21:31 CET 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/11/01 21:21:31

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/acqui: acqui-home.tmpl 
	                                       booksellers.tmpl 
	                                       supplier.tmpl 

Log message:
	fixing links & some html improvements

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.1&r2=1.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2

Patches:
Index: acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- acqui-home.tmpl	31 Aug 2006 16:46:59 -0000	1.5.2.1
+++ acqui-home.tmpl	1 Nov 2006 21:21:31 -0000	1.5.2.2
@@ -9,7 +9,7 @@
 	<!-- TMPL_ELSE -->
 		<form action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
 			<h2>Start, recieve, or modify any order</h2>
-			<p><label for="supplier">Supplier ID or name</label><input type="text" size="25" name="supplier" id="supplier" />
+			<p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
 			<input type="submit" value="Search" />
 			</p>
 		</form>

Index: booksellers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- booksellers.tmpl	1 Aug 2006 15:28:55 -0000	1.1
+++ booksellers.tmpl	1 Nov 2006 21:21:31 -0000	1.1.2.1
@@ -63,10 +63,7 @@
 		<!-- /TMPL_LOOP -->
 		</table>
 </div>
-<div id="acqui_order_add_supplier">
-	<form action="supplier.pl">
-		<input type="hidden" name="supplierid" value="0" />
-		<input type="submit" value="Add supplier" />
-	</form>
+<div id="action">
+    <a href="supplier.pl?op=enter">Add supplier</a>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- supplier.tmpl	30 Oct 2006 09:54:21 -0000	1.2.2.1
+++ supplier.tmpl	1 Nov 2006 21:21:31 -0000	1.2.2.2
@@ -24,7 +24,7 @@
             </p>
             <p>
                 <label>Physical Address</label>
-                <textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+                <textarea name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
             </p>
             <p>
                 <label>Phone</label>
@@ -40,7 +40,7 @@
             </p>
         </fieldset>
         <fieldset>
-            <legend>CONTACT DETAILS</legend>
+            <legend>Contact details</legend>
             <p>
                 <label>Contact Name</label>
                 <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
@@ -83,8 +83,8 @@
                     <!-- /TMPL_IF -->
             </p>
             <p>
-                <label>Publishers and Imprints</label>
-                <textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
+                <label>Preferred publishers</label>
+                <textarea name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea>
             </p>
             <p>
                 <label>List Prices are</label>
@@ -108,14 +108,14 @@
                     <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
             </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="GST" --><p>
-                <label>List Item Price Includes GST</label>
-                    <input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Yes
-                    <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>No
+                <label>Ordering prices</label>
+                    <input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>include GST
+                    <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
             </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="GST" --><p>
-                <label>Invoice Item Price Includes GST</label>
-                    <input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Yes
-                    <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>No
+                <label>Invoice prices</label>
+                    <input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>include GST
+                    <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
             </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
             <p>
                 <label>Discount</label>
@@ -126,7 +126,7 @@
                 <textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
             </p>
         </fieldset>
-        <input type="submit" value="Save" />
+        <p><input type="submit" value="Save" /></p>
     </form>
 <!--TMPL_ELSE-->
     <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>





More information about the Koha-cvs mailing list