[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en acqui/bask... [rel_3_0]
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en acqui/bask... [rel_3_0] |
|
Date: |
Wed, 24 Jan 2007 13:54:02 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/24 13:54:02
Modified files:
koha-tmpl/intranet-tmpl/prog/en/acqui: basket.tmpl
neworderbiblio.tmpl
neworderempty.tmpl
supplier.tmpl
Added files:
koha-tmpl/intranet-tmpl/prog/en/includes: intranet-print.css
Log message:
ACQUISITION bugfixes + printer improvement
bugfixing templates to have acquisitions working...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.4&r2=1.7.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
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.6&r2=1.2.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-print.css?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1
Patches:
Index: acqui/basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -b -r1.7.2.4 -r1.7.2.5
--- acqui/basket.tmpl 20 Dec 2006 17:15:45 -0000 1.7.2.4
+++ acqui/basket.tmpl 24 Jan 2007 13:54:02 -0000 1.7.2.5
@@ -35,14 +35,15 @@
<th>Est.</th>
<th>Qty.</th>
<th>Total</th>
- <th>
+ <th class="DoNotPrint">
<a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno"
-->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">
Fund
</a>
</th>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
- <th>Remove</th>
+ <th>Modify</th>
+ <th>Delete</th>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
@@ -61,28 +62,25 @@
<!-- TMPL_ELSE -->
<td>
<p>
- <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR
NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid"
-->&basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title"
--></a><br/>
- <!-- TMPL_VAR NAME="author" -->
+ <!-- TMPL_VAR NAME="title" --></p>
+ <p><!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR
name="isbn" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes"
--></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
</p>
</td>
<!-- /TMPL_IF -->
- <td><!-- TMPL_VAR NAME="rrp" --></td>
- <td><!-- TMPL_VAR NAME="ecost" --></td>
- <td><!-- TMPL_VAR NAME="quantity" --></td>
- <td><!-- TMPL_VAR NAME="line_total" --></td>
- <td><!-- TMPL_VAR NAME="bookfundname" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+ <td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
+ <td class="DoNotPrint"><!-- TMPL_VAR NAME="bookfundname"
--></td>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
<td>
- <form action="addorder.pl" method="get">
- <input type="hidden" name="ordnum" value="<!--
TMPL_VAR NAME="ordernumber" -->" />
- <input type="hidden" name="basketno"
value="<!-- TMPL_VAR NAME="basketno" -->" />
- <input type="hidden" name="quantity" value="0"
/>
- <input type="hidden" name="biblio" value="<!--
TMPL_VAR NAME="biblionumber" -->" />
- <input type="submit" class="delete"
value="Delete" />
- </form>
+ <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR
NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid"
-->&basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
+ </td>
+ <td>
+ <a href="addorder.pl?ordnum=<!-- TMPL_VAR
NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno"
-->&quantity=0&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
</td>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
Index: acqui/neworderbiblio.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/Attic/neworderbiblio.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- acqui/neworderbiblio.tmpl 20 Dec 2006 17:15:45 -0000 1.2.2.3
+++ acqui/neworderbiblio.tmpl 24 Jan 2007 13:54:02 -0000 1.2.2.4
@@ -28,28 +28,25 @@
<div class="searchresults">
<table>
<tr>
- <th>Title</th>
- <th>Author</th>
- <th>publisher</th>
- <th>Publication year</th>
+ <th>Summary</th>
</tr>
<!-- TMPL_LOOP NAME="resultsloop" -->
<tr>
<td>
- <a
href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR
NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblio=<!--
TMPL_VAR NAME="biblionumber" -->" title="order this one !">
- <!-- TMPL_VAR NAME="title" -->
- </a>
- <br />
- <small><!-- TMPL_VAR NAME="subtitle" --></small>
- </td>
- <td>
- <!-- TMPL_VAR NAME="author" -->
+ <p><!-- TMPL_VAR NAME="title" --></p>
+ <p><!-- TMPL_IF name="author" --><!-- TMPL_VAR NAME="author"
-->,<!-- /TMPL_IF -->
+ <!-- TMPL_IF name="copyrightdate" --> - <!-- TMPL_VAR
NAME="copyrightdate" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="publishercode" --> - <!-- TMPL_VAR
name="publishercode" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place"
--><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages"
--><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes"
--><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size"
--><!-- /TMPL_IF -->
+ </p>
</td>
<td>
- <!-- TMPL_VAR NAME="publishercode" -->
- </td>
- <td>
- <!-- TMPL_VAR NAME="publicationyear" -->
+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!--
TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno"
-->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="order this one
!">
+ Order
+ </a>
</td>
</tr>
<!-- /TMPL_LOOP -->
Index: acqui/neworderempty.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- acqui/neworderempty.tmpl 8 Jan 2007 16:05:15 -0000 1.1.2.2
+++ acqui/neworderempty.tmpl 24 Jan 2007 13:54:02 -0000 1.1.2.3
@@ -36,8 +36,10 @@
f.rrp.value=rrp;
f.ecost.value=ecost;
-f.GST.value=GST;
f.total.value=total;
+<!-- TMPL_IF NAME="GST"-->
+f.GST.value=GST;
+<!-- /TMPL_IF -->
return true;
}
@@ -78,7 +80,14 @@
<fieldset>
<legend>Basket Details</legend>
- <p><label>Basket Number</label><!-- TMPL_VAR NAME="basketno" --> </p>
+ <p>
+ <!-- TMPL_IF name="basketno" -->
+ <label>Basket Number</label><!-- TMPL_VAR NAME="basketno" -->
+ <!-- TMPL_ELSE -->
+ New basket
+ <!-- /TMPL_IF -->
+
+ </p>
<p><label>Managed By</label><!-- TMPL_VAR NAME="authorisedbyname"
--> </p>
<p><label>Open On</label><!-- TMPL_VAR NAME="creationdate" --> </p>
<p><label>For</label>Supplier Id <!-- TMPL_VAR NAME="booksellerid"
--> </p>
@@ -95,8 +104,8 @@
<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum"
-->" />
<input type="hidden" name="basketno" value="<!-- TMPL_VAR
NAME="basketno" -->" />
<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR
NAME="booksellerid" -->" />
- <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblio"
-->" />
- <input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR
NAME="biblioitemnumber" -->" />
+ <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->" />
+ <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR
NAME="biblioitemnumber" -->" />
<input type="hidden" name="oldtype" value="<!-- TMPL_VAR
NAME="itemtype" -->" />
<input type="hidden" name="discount" value="<!-- TMPL_VAR
NAME="discount" -->" />
<input type="hidden" name="listinc" value="<!-- TMPL_VAR
NAME="listincgst" -->" />
@@ -213,7 +222,7 @@
<!-- /TMPL_IF -->
<p>
<label><b>Total</b></label>
- <input type="text" size="20" name="total" value="" <!--
TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+ <input type="text" size="20" name="total" value="<!-- TMPL_VAR
name="total" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
</p>
<p>
<label>Actual Cost</label>
Index: acqui/supplier.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -b -r1.2.2.6 -r1.2.2.7
--- acqui/supplier.tmpl 22 Dec 2006 17:17:39 -0000 1.2.2.6
+++ acqui/supplier.tmpl 24 Jan 2007 13:54:02 -0000 1.2.2.7
@@ -5,7 +5,7 @@
<!--TMPL_IF Name="enter"-->
<form action=updatesupplier.pl method="post">
- <input type="hidden" name="id" value=<!-- TMPL_VAR NAME="id" -->>
+ <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
<!-- TMPL_IF name="id" -->
<h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
Index: includes/intranet-print.css
===================================================================
RCS file: includes/intranet-print.css
diff -N includes/intranet-print.css
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ includes/intranet-print.css 24 Jan 2007 13:54:02 -0000 1.1.2.1
@@ -0,0 +1,235 @@
+body {
+ font-family : Verdana, Geneva, Arial, sans-serif;
+ font-size : .9em;
+}
+
+table {
+ border-collapse : inherit;
+ border : 1px solid #CCCCCC;
+ margin : 1em 0;
+}
+
+caption {
+ font-size : 140%;
+ text-align : left;
+ font-weight : bold;
+}
+
+td,th {
+ /*border-left : 1px solid #CCCCCC;
+ border-bottom : 1px solid #CCCCCC;*/
+ border : 1px solid #CCCCCC;
+ padding : 5px;
+}
+
+th {
+ background-color : #CCCCCC;
+ border-left : 1px solid #999999;
+ border-bottom : 1px solid #999999;
+}
+
+th[scope=row] {
+ background-color : #EEEEEE;
+ text-align : right;
+}
+
+input {
+ font-size:0.9em;
+}
+
+select {
+ font-size:0.9em;
+}
+
+input[type=submit], input[type=button], input[type=reset] {
+ background-color : #6699CC;
+ color : #FFFFFF;
+ font-size : 1em;
+ font-weight : bold;
+}
+
+.searchresults table tr:hover{
+ background-color: #CCFFFF;
+}
+
+tr.highlight td, tr.highlight th {
+ background-color : #EEEEEE;
+}
+
+.here {
+ color: black;
+ text-decoration:none;
+}
+
+#problem {
+ color: red;
+ background-color:white;
+ font-weight : bold;
+}
+
+#admin_stopwords_select UL {
+ width: 600px;
+}
+
+#admin_stopwords_select UL LI {
+ white-space: nowrap;
+}
+
+legend {
+ font-size:120%;
+ font-weight:bold;
+}
+
+.problem {
+ color: white;
+ background-color:red;
+ font-weight : bold;
+}
+
+/* css styles for reserves color alerts */
+.onloan {
+ background-color: #FFED3D;
+}
+
+.reserved {
+ background-color: #8EBAFF;
+}
+
+.transfered {
+ background-color: #F9FF9A;
+}
+
+.inwait {
+ background-color: #33CC99;
+}
+
+.other {
+ background-color: #FF0000;
+}
+
+.available {
+ background-color: white;
+}
+
+.unavailable {
+ background-color: #FFED3D;
+}
+
+.hasexpirated {
+ text-decoration: line-through;
+}
+
+/* style for search terms in catalogsearch */
+.term {
+ background-color:yellow;
+}
+
+/* end of css styles for reserves color alerts */
+
+/* MAIN MENU STYLES */
+#mainmenu {
+display:none;
+}
+
+/* submenus styles */
+#submenu {
+ display:none;
+}
+/*Action button*/
+#action {
+ display:none;
+}
+
+/* Main body style */
+#main {
+ margin-left:0%;
+}
+
+/* facets bloc */
+#facets {
+ display:none;
+}
+
+/* the USER information block */
+#librarian_information {
+ display:none;
+}
+
+/* css style for reregistration alert */
+
+.reregistrinfo {
+ color: #6699cc;
+ font-weight : bold;
+ background-color : #eeeeee;
+}
+/* MARC editor */
+
+/* styles for the 11 buttons that the user can click on */
+/* the design of the active tab button (only 1 at a given time)*/
+.tab_active {
+ color: #6699CC;
+ background-color : #CCCCCC;
+ font-size : 1em;
+ border: 2px inset;
+ font-weight : bold;
+ text-decoration:none;
+ display: inline;
+ text-decoration:none;
+ margin-left:10px;
+}
+
+#onlinehelp {
+ display:none;
+}
+
+/* the design of the INactives tab buttons (all other tabs) */
+.tab_inactive {
+ background-color : #6699CC;
+ color : #FFFFFF;
+ font-size : 1em;
+ font-weight : bold;
+ display:inline;
+ border: 2px outset;
+ text-decoration:none;
+ margin-left:10px;
+}
+
+/* the button of INactive tabs : we need this one to have white color on
links, otherwise, default a look will be choosen */
+#tabs a {
+ color:white;
+ text-decoration:none;
+ padding-right:10px;
+ padding-left:10px;
+}
+
+/* specify that we to do when the mouse is on 1 button */
+#tabs a:hover {
+ border: 2px inset;
+}
+
+#tabs {
+ margin-top:45px;
+ margin-bottom:5px;
+}
+
+/* styles for the 11 content blocks */
+/* the property for hidden tabs */
+.content_hidden {
+ height:0px; /* you propably don't need to change this one */
+ visibility:hidden; /* you propably don't need to change this one */
+ display:none;
+}
+
+/* the property for the displayed tab */
+.content_visible {
+ height:0px; /* you propably don't need to change this one */
+ visibility:visible; /* you propably don't need to change this one */
+ display:block;
+}
+
+.lineSelected {
+ background-color:yellow;
+}
+.DoNotPrint {
+ display:none;
+}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en acqui/bask... [rel_3_0],
paul poulain <=