[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en acqui/b... [rel_2_2]
From: |
paul poulain |
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en acqui/b... [rel_2_2] |
Date: |
Fri, 13 Oct 2006 09:58:16 +0000 |
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_2_2
Changes by: paul poulain <tipaul> 06/10/13 09:58:16
Modified files:
koha-tmpl/intranet-tmpl/default/en/acqui: basket.tmpl
koha-tmpl/intranet-tmpl/default/en/includes: common-print.css
Log message:
fix to have library informations correctly printed
CVSWeb URLs:
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.15&r2=1.15.2.16
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.3&r2=1.1.2.4
Patches:
Index: acqui/basket.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.15
retrieving revision 1.15.2.16
diff -u -b -r1.15.2.15 -r1.15.2.16
--- acqui/basket.tmpl 22 Sep 2006 15:50:01 -0000 1.15.2.15
+++ acqui/basket.tmpl 13 Oct 2006 09:58:16 -0000 1.15.2.16
@@ -5,14 +5,14 @@
<!-- 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&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&basket=<!-- TMPL_VAR
NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->"
class="button acquisition">Close basket</a></p>
<!-- /TMPL_IF -->
</div>
<!-- /TMPL_IF -->
@@ -30,6 +30,7 @@
<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> </p>
<p> </p><!-- /TMPL_IF -->
<p> </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" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"
class="button acquisition">
from a suggestion
</a>
Index: includes/common-print.css
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/Attic/common-print.css,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- includes/common-print.css 2 Aug 2006 08:33:20 -0000 1.1.2.3
+++ includes/common-print.css 13 Oct 2006 09:58:16 -0000 1.1.2.4
@@ -1,6 +1,6 @@
div,
.user,
-h2,h1,
+h1,h2,
.doNotPrint
{
/* Hides all the elements irrelevant for printing */
@@ -42,12 +42,12 @@
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;
}
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en acqui/b... [rel_2_2],
paul poulain <=