[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.4.2.4,1.4.2.5 subscription-detail.tmpl,1.6.2.5,1.6.2.6

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4551/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl subscription-detail.tmpl 
Log Message:
* removing the limit to delete a subscription
* adding serial note column to the subscription-detail

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** statecollection.tmpl	24 Aug 2005 09:02:25 -0000	1.4.2.4
--- statecollection.tmpl	9 Sep 2005 10:11:38 -0000	1.4.2.5
***************
*** 72,76 ****
  			</td>
  			<td>
! 				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=10 maxlength=15>
  			</td>
  		</tr>
--- 72,76 ----
  			</td>
  			<td>
! 				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
  			</td>
  		</tr>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** subscription-detail.tmpl	2 Aug 2005 15:00:37 -0000	1.6.2.5
--- subscription-detail.tmpl	9 Sep 2005 10:11:38 -0000	1.6.2.6
***************
*** 8,16 ****
  <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
  <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Back to biblio</a>
! <!-- TMPL_UNLESS name="totalissues" -->
! 		<a href="javascript:confirm_deletion()" class="button bull">
! 			delete
! 		</a>
! <!-- /TMPL_UNLESS -->
  <form method="post" name="f">
  <div id="bloc25">
--- 8,14 ----
  <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
  <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Back to biblio</a>
! <a href="javascript:confirm_deletion()" class="button bull">
! 	delete
! </a>
  <form method="post" name="f">
  <div id="bloc25">
***************
*** 152,155 ****
--- 150,154 ----
  		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;</th>
  		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;</th>
+ 		<th class="bull">&nbsp;&nbsp;&nbsp;&nbsp;Note&nbsp;&nbsp;&nbsp;&nbsp;</th>
  	</tr>
  	<!-- TMPL_LOOP name="serialslist" -->
***************
*** 176,179 ****
--- 175,181 ----
  				</select>
  			</td>
+ 			<td>
+ 				<!-- TMPL_VAR name="notes" -->
+ 			</td>
  		</tr>
  	<!-- /TMPL_LOOP -->
***************
*** 184,188 ****
  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";
--- 186,194 ----
  function _(s) { return s } // dummy function for gettext
  function confirm_deletion() {
! 	<!-- TMPL_IF name="totalissues" -->
! 		var is_confirmed = confirm(_('You already made <!-- TMPL_VAR name="totalissues"--> receipts. Do you confirm deletion?'));
! 	<!-- TMPL_ELSE -->
! 		var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
! 	<!-- /TMPL_IF -->	
  	if (is_confirmed) {
  		window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";