[Koha-cvs] koha acqui/basket.pl koha-tmpl/intranet-tmpl/de... [rel_2_2]

paul poulain paul at koha-fr.org
Wed Aug 2 10:33:20 CEST 2006 

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	paul poulain <tipaul>	06/08/02 08:33:20

Modified files:
	acqui          : basket.pl 
	koha-tmpl/intranet-tmpl/default/en/acqui: basket.tmpl 
	koha-tmpl/intranet-tmpl/default/en/includes: common-print.css 
	                                             hierarchy.css 

Log message:
	(some changes that kados could find interesting...)
	
	Some (minor) changes in basket behaviour
	- the address is now correctly shown on basket page (change address1 to postal)
	- the print stylesheet has been modified for a perfect printer invoice
	- the basket header don't appear anymore until there is at least 1 line in the basket

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/basket.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.24.2.10&r2=1.24.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.12&r2=1.15.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/includes/hierarchy.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: acqui/basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.10
retrieving revision 1.24.2.11
diff -u -b -r1.24.2.10 -r1.24.2.11
--- acqui/basket.pl	31 Jul 2006 13:55:32 -0000	1.24.2.10
+++ acqui/basket.pl	2 Aug 2006 08:33:20 -0000	1.24.2.11
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: basket.pl,v 1.24.2.10 2006/07/31 13:55:32 tipaul Exp $
+# $Id: basket.pl,v 1.24.2.11 2006/08/02 08:33:20 tipaul Exp $
 
 #script to show display basket of orders
 #written by chris at katipo.co.nz 24/2/2000
@@ -54,6 +54,7 @@
 # warn "=>".$basket->{booksellerid};
 $booksellerid = $basket->{booksellerid} unless $booksellerid;
 my ($count2, at booksellers)=bookseller($booksellerid);
+$booksellers[0]->{'postal'} =~ s/\n/<br\/>/g;
 
 # get librarian branch...
 if (C4::Context->preference("IndependantBranches")) {
@@ -129,10 +130,7 @@
 				active => $booksellers[0]->{'active'},
 				booksellerid=> $booksellers[0]->{'id'},
 				name => $booksellers[0]->{'name'},
-				address1 => $booksellers[0]->{'address1'},
-				address2 => $booksellers[0]->{'address2'},
-				address3 => $booksellers[0]->{'address3'},
-				address4 => $booksellers[0]->{'address4'},
+				postal => $booksellers[0]->{'postal'},
 				entrydate => format_date($results[0]->{'entrydate'}),
 				books_loop => \@books_loop,
 				count =>$count,

Index: koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.12
retrieving revision 1.15.2.13
diff -u -b -r1.15.2.12 -r1.15.2.13
--- koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl	31 Jul 2006 13:55:32 -0000	1.15.2.12
+++ koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl	2 Aug 2006 08:33:20 -0000	1.15.2.13
@@ -3,23 +3,23 @@
 <div id="mainbloc">
 	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
 	<!-- TMPL_UNLESS name="closedate" -->
+	<!-- TMPL_IF name="basketno" -->
 		<div id="bloc25">
 			<h2 class="acquisition">Basket info</h2>
-			<p><label class="label100">Basket number<label> <!-- TMPL_VAR NAME="basketno" --></p>
 			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
+			<p><label class="label100">Basket number<label> <!-- TMPL_VAR NAME="basketno" --></p>
 			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
-			<p><label class="label100">for<label> <!-- TMPL_VAR NAME="name" --></p>
-			<p><label class="label100">Invoice number </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
 			<!-- TMPL_IF name="closedate" -->
 				Closed on <!-- TMPL_VAR name="closedate" -->
 			<!-- TMPL_ELSE -->
-				<a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Close</a>
+			<p><a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Close basket</a></p>
 			<!-- /TMPL_IF -->
 		</div>
+    <!-- /TMPL_IF -->
 	<!-- /TMPL_UNLESS -->
-	<div id="bloc25" style="align:right">
+	<div id="bloc25">
 		<p><!-- TMPL_VAR name="name" --></p>
-		<p><!-- TMPL_VAR name="address1" --></p>
+		<p><!-- TMPL_VAR name="postal" --></p>
 		<p><!-- TMPL_VAR name="address2" --></p>
 		<p><!-- TMPL_VAR name="address3" --></p>
 		<p><!-- TMPL_VAR name="address4" --></p>
@@ -30,7 +30,7 @@
 		<table>
 			<tr valign="top" bgcolor="#ffdf61">
 				<th class="acquisition doNotPrint">Order</th>
-				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
+				<th class="acquisition">Publisher<span class="doNotPrint"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></span></th>
 				<th class="acquisition">Title</th>
 				<th class="acquisition doNotPrint">rrp</th>
 				<th class="acquisition">est</th>
@@ -87,7 +87,10 @@
 			<input type="hidden" name="number" value=<!-- TMPL_VAR NAME="count" -->>
 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
 			<tr>
-				<td colspan="2" class="acquisition">
+				<td class="acquisition doNotPrint">
+					&nbsp;
+				</td>
+				<td class="acquisition">
 					&nbsp;
 				</td>
 				<td class="acquisition number">
@@ -100,7 +103,7 @@
 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
 				</td>
-				<td class="acquisition">
+				<td class="acquisition doNotPrint">
 					<p>&nbsp;</p>
 					<p>&nbsp;</p>
 					<p>&nbsp;</p>

Index: koha-tmpl/intranet-tmpl/default/en/includes/common-print.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/default/en/includes/common-print.css	5 Dec 2005 10:46:24 -0000	1.1.2.2
+++ koha-tmpl/intranet-tmpl/default/en/includes/common-print.css	2 Aug 2006 08:33:20 -0000	1.1.2.3
@@ -1,5 +1,6 @@
 div,
 .user,
+h2,h1,
 .doNotPrint
 {
     /* Hides all the elements irrelevant for printing */
@@ -28,11 +29,25 @@
 	border:1px solid #000000;
 }
 
+/* cells that are numbers => aligned right */
+td.number {
+	border-left:0px;
+	text-align:right;
+}
+
+
+div#bloc100,
+div#mainbloc
+{
+	display: block;
+}
 
-div#mainbloc, 
-div#bloc100
+div#bloc25
 {
 	display: block;
+/*	border:1px solid #000000;*/
+	margin-bottom:10px;
+	padding-bottom:0px;
 }
 
 

Index: koha-tmpl/intranet-tmpl/default/en/includes/hierarchy.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/Attic/hierarchy.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/intranet-tmpl/default/en/includes/hierarchy.css	31 Jul 2006 10:15:42 -0000	1.1.2.1
+++ koha-tmpl/intranet-tmpl/default/en/includes/hierarchy.css	2 Aug 2006 08:33:20 -0000	1.1.2.2
@@ -1,24 +1,21 @@
-#hierarchies {
-	background-color:#FFF;
+.hierarchies {
+	background-color:#fff;
 	color:#000000;
-	border:2px solid #000000;
 	padding:5px;
-	width:90%;
+	margin-left:50px;
 	-moz-border-radius:6px;
-	position:relative;
 	display:block;
+	font-size:10px;
 }
-#hierarchy {
-	border:1px solid #000000;
+.hierarchy {
 	padding:5px;
 	width:90%;
 	-moz-border-radius:6px;
-	position:relative;
 	display:block;
 }
 .child {
 	display:none;
-    margin-left : 50%;
+    margin-left : 50px;
     width:150%;
 }
 .child a:hover{
@@ -26,70 +23,70 @@
 }
 .parent {
 	display:none;
-    margin-left : -50%;
+    margin-left : -50px;
 }
 .parent a:hover{
   background-color:#BFCFFF;
 }
 .child0{
-  width : 10%;
+  width : 20%;
   text-align : left;
 }
 .child0 a:hover{
   background-color:#BFCFFF;
 }
 .child1{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 11%;
+  margin-left : 50px;
 }
 .child1 a:hover{
   background-color:#BFCFFF;
 }
 .child2{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 22%;
+  margin-left : 100px;
 }
 .child2 a:hover{
   background-color:#BFCFFF;
 }
 .child3{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 33%;
+  margin-left : 150px;
 }
 .child3 a:hover{
   background-color:#BFCFFF;
 }
 .child4{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 44%;
+  margin-left : 200px;
 }
 .child4 a:hover{
   background-color:#BFCFFF;
 }
 .child5{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 55%;
+  margin-left : 250px;
 }
 .child5 a:hover{
   background-color:#BFCFFF;
 }
 .child6{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 66%;
+  margin-left : 300px;
 }
 .child6 a:hover{
   background-color:#BFCFFF;
 }
 .child7{
-  width : 10%;
+  width : 20%;
   text-align : left;
-  margin-left : 77%;
+  margin-left : 350px;
 }
 .child7 a:hover{
   background-color:#BFCFFF;
@@ -97,7 +94,7 @@
 .child8{
   width : 10%;
   text-align : left;
-  margin-left : 88%;
+  margin-left : 400px;
 }
 .child8 a:hover{
   background-color:#BFCFFF;

More information about the Koha-cvs mailing list