From 852f55248a46ee9fa3abeeada04c71def5f5203e Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 13 Oct 2006 09:58:16 +0000
Subject: [PATCH] fix to have library informations correctly printed

---
 .../default/en/acqui/basket.tmpl              | 41 ++++++++++---------
 .../default/en/includes/common-print.css      | 16 ++++----
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index debcd398e6..3544291ec0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -5,31 +5,32 @@
 	<!-- TMPL_UNLESS name="closedate" -->
 	<!-- TMPL_IF name="basketno" -->
 		<div id="bloc25">
-			<h2 class="acquisition">Basket info</h2>
-			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
+			<h2 class="acquisition doNotPrint">Basket info</h2>
+			<p class="doNotPrint"><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>
 			<!-- TMPL_IF name="closedate" -->
 				Closed on <!-- TMPL_VAR name="closedate" -->
 			<!-- TMPL_ELSE -->
-			<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>
+			<p class="doNotPrint"><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">
-		<p><!-- TMPL_VAR name="name" --></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>
-	</div>
-	<div id="bloc25" style="float:right">
-	   <p><!-- TMPL_VAR name="branchname" --></p>
-	   <p><!-- TMPL_VAR name="branchaddress1" --></p>
-	   <p><!-- TMPL_VAR name="branchaddress2" --></p>
-	   <p><!-- TMPL_VAR name="branchaddress3" --></p>
-    </div>
+		<div id="bloc25">
+			<p><!-- TMPL_VAR name="name" --></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>
+		</div>
+		<div id="bloc25" style="float:right">
+		   <p><!-- TMPL_VAR name="branchname" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress1" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress2" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress3" --></p>
+	     </div>
+	
 	<div id="bloc100">
 	<h2 class="acquisition">Order</h2>
 	<!-- TMPL_IF name="books_loop" -->
@@ -113,7 +114,7 @@
 					<p><!-- TMPL_VAR NAME="gist_est" --></p><!-- /TMPL_IF -->
 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
 				</td>
-				<td class="acquisition doNotPrint">
+				<td class="doNotPrint acquisition">
 					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
 					<p>&nbsp;</p><!-- /TMPL_IF -->
 					<p>&nbsp;</p>
@@ -142,12 +143,12 @@
 	<!-- TMPL_IF name="active" -->
 		<!-- TMPL_UNLESS name="closedate" -->
 		<div id="bloc25">
-			<h2 class="acquisition">Add order line</h2>
+			<h2 class="acquisition doNotPrint">Add order line</h2>
 			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
 				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
 				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
-				<p>from an existing biblio: </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Search"></p>
-				<p>or
+				<p class="doNotPrint" >from an existing biblio: </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Search"></p>
+				<p class="doNotPrint">or
 					<a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
 						from a suggestion
 					</a>
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css
index 85d88e7e2a..29089a8ee1 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css
@@ -1,6 +1,6 @@
 div,
 .user,
-h2,h1,
+h1,h2,
 .doNotPrint
 {
     /* Hides all the elements irrelevant for printing */
@@ -42,12 +42,12 @@ div#mainbloc
 	display: block;
 }
 
-div#bloc25
+div#bloc25,div#bloc100
 {
-	display: block;
-/*	border:1px solid #000000;*/
-	margin-bottom:10px;
-	padding-bottom:0px;
-}
-
+	display:block;
+	float:left;
+	/*order:1px solid #000000;*/
+	margin:10px;
+	padding:10px;
+}	
 
-- 
2.39.5