From 6392d344ffae987cf38bd6321e11239977694bf4 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Mon, 19 Sep 2005 21:03:26 +0000
Subject: [PATCH] - Synching subscription-detail.tmpl with default template -
 Removing unused subscription-bib-search.tmpl

---
 .../npl/en/bull/subscription-bib-search.tmpl  | 33 -------------------
 .../npl/en/bull/subscription-detail.tmpl      | 20 +++++++++--
 2 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl

diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl
deleted file mode 100644
index 6b3eab9efe..0000000000
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div>
-
-<h1 class="authority">Bib search</h1>
-
-<form name="f" method="post">
-	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="intranet">
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<div>
-		<h2 class="authority">Search on</h2>
-		<p>
-			<label>Name or ISSN</label>
-			<!-- TMPL_VAR name="category" -->
-		</p>
-		<p>
-			<label>Search value</label>
-			<input type="text" name="value" value="<!-- TMPL_VAR name="value" -->">
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
-			<input type="hidden" name="marclist" value="">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<input type="hidden" name="operator" value="contains">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->"
-		</p>
-		<p>
-			<input type="submit" value="Start search" class="button authority">
-		</p>
-	</div>
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
index 7c29bd0a6c..52a8a1a1f6 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
@@ -13,7 +13,7 @@
 
 <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 -->
+<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">
 <table>
@@ -154,6 +154,7 @@
 		<th>Issue number</th>
 		<th>Planned date</th>
 		<th>Status</th>
+		<th>Note</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
@@ -177,10 +178,25 @@
 						Missing
 					<!-- /TMPL_IF -->
 			</td>
+			<td>
+				<!-- TMPL_VAR name="notes" -->
+			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
 </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
-- 
2.39.5