[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-detail.tmpl,1.2.2.2,1.2.2.3 subscription-bib-search.tmpl,1.1.2.1,NONE

[Owen Leonard]

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

Modified Files:
      Tag: rel_2_2
	subscription-detail.tmpl 
Removed Files:
      Tag: rel_2_2
	subscription-bib-search.tmpl 
Log Message:
- Synching subscription-detail.tmpl with default template
- Removing unused subscription-bib-search.tmpl

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** subscription-detail.tmpl	19 Sep 2005 20:46:14 -0000	1.2.2.2
--- subscription-detail.tmpl	19 Sep 2005 21:03:26 -0000	1.2.2.3
***************
*** 14,18 ****
  <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
! <!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">
--- 14,18 ----
  <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
! <form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" onclick="confirm_deletion(); return false;" value="Delete subscription" /></form>
  
  <div class="data">
***************
*** 155,158 ****
--- 155,159 ----
  		<th>Planned date</th>
  		<th>Status</th>
+ 		<th>Note</th>
  	</tr>
  	<!-- TMPL_LOOP name="serialslist" -->
***************
*** 178,181 ****
--- 179,185 ----
  					<!-- /TMPL_IF -->
  			</td>
+ 			<td>
+ 				<!-- TMPL_VAR name="notes" -->
+ 			</td>
  		</tr>
  	<!-- /TMPL_LOOP -->
***************
*** 183,186 ****
  </div>
  </div>
! 
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 187,202 ----
  </div>
  </div>
! <script>
! 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";
! 	}
! }
! </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

--- subscription-bib-search.tmpl DELETED ---