[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/bull statecollec
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.4,1.5 subscription-add.tmpl,1.8,1.9 subscription-detail.tmpl,1.7,1.8 |
|
Date: |
Wed, 04 May 2005 01:53:26 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17782/koha-tmpl/intranet-tmpl/default/en/bull
Modified Files:
statecollection.tmpl subscription-add.tmpl
subscription-detail.tmpl
Log Message:
synch'ing 2.2 and head
Index: statecollection.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** statecollection.tmpl 2 Dec 2004 16:42:15 -0000 1.4
--- statecollection.tmpl 4 May 2005 08:52:51 -0000 1.5
***************
*** 58,61 ****
--- 58,79 ----
</tr>
<!-- /TMPL_LOOP -->
+ <!-- TMPL_UNLESS name="hassubscriptionexpired" -->
+ <tr>
+ <td>
+ Manual issue <input type="text"
name="serialseq" size=30 maxlength=100>
+ </td>
+ <td>
+ <input type="text" name="planneddate" size=10
maxlength=15>
+ </td>
+ <td>
+ <input type="hidden" name="serialid" value="0">
+ <select name="status" size="1">
+ <option
value="2">Arrived</option>
+ <option value="3"
selected>Late</option>
+ <option
value="4">Missing</option>
+ </select>
+ </td>
+ </tr>
+ <!-- /TMPL_UNLESS -->
</table>
<input type="submit" value="Save changes" accesskey="w" class="button
bull">
Index: subscription-add.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** subscription-add.tmpl 2 Nov 2004 21:31:17 -0000 1.8
--- subscription-add.tmpl 4 May 2005 08:52:52 -0000 1.9
***************
*** 42,48 ****
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity3" -->
! <option value="3" selected>1/2
weeks</option>
<!-- TMPL_ELSE -->
! <option value="3">1/2 weeks</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity4" -->
--- 42,48 ----
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity3" -->
! <option value="3" selected>1/2 weeks
(2/month)</option>
<!-- TMPL_ELSE -->
! <option value="3">1/2 weeks
(2/months)</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity4" -->
***************
*** 57,78 ****
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity6" -->
! <option value="6" selected>1/2
months</option>
<!-- TMPL_ELSE -->
! <option value="6">1/2 months</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity7" -->
! <option value="7" selected>1/3
months</option>
<!-- TMPL_ELSE -->
! <option value="7">1/3 months</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="periodicity8" -->
! <option value="8"
selected>1/quarter</option>
! <!-- TMPL_ELSE -->
! <option value="8">1/quarter</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity9" -->
! <option value="9" selected>1/2
quarters</option>
<!-- TMPL_ELSE -->
! <option value="9">1/2 quarters</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity10" -->
--- 57,74 ----
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity6" -->
! <option value="6" selected>1/2 months
(6/year)</option>
<!-- TMPL_ELSE -->
! <option value="6">1/2 months
(6/year)</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity7" -->
! <option value="7" selected>1/3 months
(1/quarter)</option>
<!-- TMPL_ELSE -->
! <option value="7">1/3 months
(1/quarter)</option>
<!-- /TMPL_IF -->
+ <!-- periodicity8 is 1/quarter, exactly like
periodicity7 -->
<!-- TMPL_IF name="periodicity9" -->
! <option value="9"
selected>2/years</option>
<!-- TMPL_ELSE -->
! <option value="9">2/years</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="periodicity10" -->
Index: subscription-detail.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** subscription-detail.tmpl 1 Mar 2005 13:40:52 -0000 1.7
--- subscription-detail.tmpl 4 May 2005 08:52:52 -0000 1.8
***************
*** 7,11 ****
<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber"
-->" class="button bull">Biblio</a>
<!-- TMPL_UNLESS name="totalissues" -->
! <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR
name="subscriptionid" -->&op=del" class="button bull">Delete subscription</a>
<!-- /TMPL_UNLESS -->
<form method="post" name="f">
--- 7,13 ----
<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber"
-->" class="button bull">Biblio</a>
<!-- TMPL_UNLESS name="totalissues" -->
! <a href="javascript:confirm_deletion()" class="button bull">
! delete
! </a>
<!-- /TMPL_UNLESS -->
<form method="post" name="f">
***************
*** 16,21 ****
<p><label>Cost</label><!-- TMPL_VAR name="cost" --></p>
<p><label>Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
! <p><label class="label100">Biblio</label><!-- TMPL_VAR
name="bibliotitle" --></p>
! <p><label class="label100">Notes:</label><!-- TMPL_VAR
name="notes" --></p>
</div>
<div id="bloc25">
--- 18,23 ----
<p><label>Cost</label><!-- TMPL_VAR name="cost" --></p>
<p><label>Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
! <p><label>Biblio</label><i>(<!-- TMPL_VAR name="biblionumber"
-->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
! <p><label>Notes:</label><!-- TMPL_VAR name="notes" --></p>
</div>
<div id="bloc25">
***************
*** 39,46 ****
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity6" -->
! 1/2 Monthes
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity7" -->
! 1/3 Monthes
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity8" -->
--- 41,48 ----
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity6" -->
! 1/2 Months (6/year)
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity7" -->
! 1/quarter
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity8" -->
***************
*** 48,52 ****
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity9" -->
! 1/2 quarters
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity10" -->
--- 50,54 ----
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity9" -->
! 2/year
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity10" -->
***************
*** 177,180 ****
</div>
</div>
!
<!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->
\ No newline at end of file
--- 179,190 ----
</div>
</div>
! <script>
! function _(s) { return s } // dummy function for gettext
! function confirm_deletion() {
! var is_confirmed = confirm(_('Are you sure you want to delete this
subscription?'));
! if (is_confirmed) {
! window.location="subscription-detail.pl?subscriptionid=<!--
TMPL_VAR name="subscriptionid" -->&op=del";
! }
! }
! </script>
<!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.4,1.5 subscription-add.tmpl,1.8,1.9 subscription-detail.tmpl,1.7,1.8,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue ISBDdetail.tmpl,1.4,1.5 MARCdetail.tmpl,1.33,1.34 detail.tmpl,1.18,1.19
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.36,1.37 addbooks.tmpl,1.21,1.22 additem.tmpl,1.21,1.22 isbnsearch.tmpl,1.19,1.20
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue ISBDdetail.tmpl,1.4,1.5 MARCdetail.tmpl,1.33,1.34 detail.tmpl,1.18,1.19
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.36,1.37 addbooks.tmpl,1.21,1.22 additem.tmpl,1.21,1.22 isbnsearch.tmpl,1.19,1.20
- Index(es):