[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmp
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.16,1.17 histsearch.tmpl,1.1,1.2 newbiblio.tmpl,1.15,1.16 supplier.tmpl,1.12,1.13 |
|
Date: |
Tue, 01 Mar 2005 05:42:02 -0800 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
basket.tmpl histsearch.tmpl newbiblio.tmpl supplier.tmpl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits
done here
Index: basket.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** basket.tmpl 24 Feb 2005 15:11:58 -0000 1.16
--- basket.tmpl 1 Mar 2005 13:40:51 -0000 1.17
***************
*** 37,40 ****
--- 37,41 ----
<th class="acquisition">Remove</th>
<!-- /TMPL_IF -->
+
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 56,63 ****
<!-- TMPL_IF name="closedate" -->
<!-- TMPL_ELSE -->
! <td><a
href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR
NAME="biblionumber" -->">
! <img
src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket"
title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
! </a>
! </a></td>
<!-- /TMPL_IF -->
</tr>
--- 57,65 ----
<!-- TMPL_IF name="closedate" -->
<!-- TMPL_ELSE -->
! <td>
! <a
href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!--
TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR
NAME="biblionumber" -->">
! <img
src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket"
title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
! </a>
! </td>
<!-- /TMPL_IF -->
</tr>
Index: histsearch.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.tmpl 19 Oct 2004 12:24:57 -0000 1.1
--- histsearch.tmpl 1 Mar 2005 13:40:51 -0000 1.2
***************
*** 11,14 ****
--- 11,16 ----
<th class="acquisition">Recieved on</th>
<th class="acquisition">Quantity ordered</th>
+ <th class="acquisition">Unit cost</th>
+ <th class="acquisition"> </th>
</tr>
<tr>
***************
*** 36,39 ****
--- 38,44 ----
</th>
<th class="acquisition">
+
+ </th>
+ <th class="acquisition">
<input type="submit" class="button
acquisition" value="Set Filter">
</th>
***************
*** 63,66 ****
--- 68,74 ----
<!-- TMPL_VAR name="quantity" -->
</td>
+ <td>
+ <!-- TMPL_VAR name="ecost" -->
+ </td>
</tr>
<!-- /TMPL_LOOP -->
Index: newbiblio.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** newbiblio.tmpl 2 Dec 2004 16:40:12 -0000 1.15
--- newbiblio.tmpl 1 Mar 2005 13:40:51 -0000 1.16
***************
*** 6,9 ****
--- 6,12 ----
//collect values
quantity=f.quantity.value
+ if (quantity ==0) {
+ alert("Quantity must be >0");
+ }
discount=f.discount.value
listinc=parseInt(f.listinc.value)
***************
*** 33,37 ****
f.GST.value=GST;
f.total.value=total;
!
}
--- 36,40 ----
f.GST.value=GST;
f.total.value=total;
! return true;
}
***************
*** 39,50 ****
function messenger(X,Y,etc){
! win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
! win.focus();
! win.document.close();
! win.document.write("<body link='#333333' bgcolor='#ffffff'
text='#000000'><font size='2'><p><br>");
! win.document.write(etc);
! win.document.write("<center><form><input type=button onclick='self.close()'
value='Close'></form></center>");
! win.document.write("</font></body></html>");
}
//-->
--- 42,67 ----
function messenger(X,Y,etc){
!
win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
! win.focus();
! win.document.close();
! win.document.write("<body link='#333333' bgcolor='#ffffff'
text='#000000'><font size='2'><p><br>");
! win.document.write(etc);
! win.document.write("<center><form><input type=button
onclick='self.close()' value='Close'></form></center>");
! win.document.write("</font></body></html>");
}
+
+ function check(f) {
+ quantity=f.quantity.value
+ if (title == "") {
+ alert("Title can't be empty");
+ return false;
+ }
+ if (quantity ==0) {
+ alert("Quantity must be >0");
+ return false;
+ }
+ document.frusin.submit();
+ }
+
//-->
***************
*** 188,192 ****
</p>
<p>
! <input type="submit" value="OK" class="button
acquisition">
</p>
</form>
--- 205,209 ----
</p>
<p>
! <input type="button" value="OK" class="button
acquisition" onClick="check(this.form)">
</p>
</form>
Index: supplier.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** supplier.tmpl 19 Jul 2004 19:21:15 -0000 1.12
--- supplier.tmpl 1 Mar 2005 13:40:51 -0000 1.13
***************
*** 15,27 ****
<p>
<label>Company Name</label>
! <input type="text" size="20" name="company" value="<!--
TMPL_VAR NAME="name" -->">
</p>
<p>
<label>Postal Address</label>
! <textarea name="company_postal" cols="20"
rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
</p>
<p>
<label>Physical Address</label>
! <textarea name="physical" cols="20" rows="4"><!--
TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR
NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
</p>
<p>
--- 15,27 ----
<p>
<label>Company Name</label>
! <input type="text" size="40" name="company" value="<!--
TMPL_VAR NAME="name" -->">
</p>
<p>
<label>Postal Address</label>
! <textarea name="company_postal" cols="40"
rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
</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>
</p>
<p>
***************
*** 35,48 ****
<p>
<label>Website</label>
! <input type="text" size="20" name="website" value="<!--
TMPL_VAR NAME="url" -->">
</p>
<h2 class="acquisition">CONTACT DETAILS</h2>
<p>
<label>Contact Name</label>
! <input type="text" size="20"
name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
</p>
<p>
<label>Position</label>
! <input type="text" size="20"
name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
</p>
<p>
--- 35,48 ----
<p>
<label>Website</label>
! <input type="text" size="40" name="website" value="<!--
TMPL_VAR NAME="url" -->">
</p>
<h2 class="acquisition">CONTACT DETAILS</h2>
<p>
<label>Contact Name</label>
! <input type="text" size="40"
name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
</p>
<p>
<label>Position</label>
! <input type="text" size="40"
name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
</p>
<p>
***************
*** 60,68 ****
<p>
<label>E-mail</label>
! <input type="text" size="20" name="company_email"
value="<!-- TMPL_VAR NAME="contemail" -->">
</p>
<p>
<label>Notes</label>
! <textarea name="notes" cols="20" rows="4"><!-- TMPL_VAR
NAME="contnotes" --></textarea>
</p>
</div>
--- 60,68 ----
<p>
<label>E-mail</label>
! <input type="text" size="40" name="company_email"
value="<!-- TMPL_VAR NAME="contemail" -->">
</p>
<p>
<label>Notes</label>
! <textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR
NAME="contnotes" --></textarea>
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.16,1.17 histsearch.tmpl,1.1,1.2 newbiblio.tmpl,1.15,1.16 supplier.tmpl,1.12,1.13,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,1.1,1.2 buildEDITORS.pl,1.1,1.2 check_marc_definition.pl,1.1,1.2
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.31,1.32 detail.tmpl,1.17,1.18
- Previous by thread:
[Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,1.1,1.2 buildEDITORS.pl,1.1,1.2 check_marc_definition.pl,1.1,1.2
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.31,1.32 detail.tmpl,1.17,1.18
- Index(es):