From 40d492f8d4ac308351952c6dab7d3a078ab4c577 Mon Sep 17 00:00:00 2001
From: Christian Fowler <spider@viovio.com>
Date: Sat, 7 Oct 2006 20:01:03 +0000
Subject: more unsub cleanup, still more to go

---
 templates/newsletters.tpl     | 16 +++++++++++-----
 templates/unsubscribe_inc.tpl |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index 9b2af1b..66e82a0 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -51,7 +51,9 @@
 			{/if}
 		{else}
 
-		{minifind}
+		{if count($newsletters) > $gBitSystem->getConfig('max_records',10)}
+			{minifind}
+		{/if}
 
 		<ul class="data">
 {*
@@ -63,15 +65,19 @@
 				<th>{tr}Editions{/tr}</th>
 			</tr>
 *}
+
 			{foreach from=$newsletters item=nl key=nlId}
 				{if $newsletters.individual ne 'y' or $newsletters.individual_bit_p_subscribe_newsletters eq 'y'}
 					<li class="item {cycle values='odd,even'}">
 						<div class="floaticon">
-						{if $subs.$nlId}
-							<strong>{biticon ipackage="icons" iname="dialog-ok" iexplain="Success"}{tr}Subscribed{/tr}: {$subs.$nlId.subscribed_date|bit_short_date}</strong><br/>
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}&amp;info=1">{tr}Unsubscribe{/tr}</a>
+						{if $subs.$nlId.unsubscribe_all || $subs.$nlId.unsubscribe_date}
+							<strong>{biticon ipackage="icons" iname="dialog-cancel" iexplain="Success" iforce="icon"}{tr}Unsubscribed{/tr}: {$subs.$nlId.unsubscribe_date|bit_short_date}</strong><br/>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}&amp;sub=1">{tr}Subscribe{/tr}</a>
+						{elseif $subs.$nlId}
+							<strong>{biticon ipackage="icons" iname="dialog-ok" iexplain="Success" iforce="icon"}{tr}Subscribed{/tr}: {$subs.$nlId.subscribed_date|bit_short_date}</strong><br/>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}&amp;unsub=1">{tr}Unsubscribe{/tr}</a>
 						{else}
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}&amp;info=1">{tr}Subscribe{/tr}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nl.nl_id}&amp;sub=1">{tr}Subscribe{/tr}</a>
 						{/if}
 						</div>
 						<h1>{$nl.title|escape}</h1>
diff --git a/templates/unsubscribe_inc.tpl b/templates/unsubscribe_inc.tpl
index cc9d174..01d18e4 100644
--- a/templates/unsubscribe_inc.tpl
+++ b/templates/unsubscribe_inc.tpl
@@ -1,2 +1,2 @@
 <small>{tr}You have received this message because you are registered at{/tr} <a href="{$smarty.const.BIT_BASE_URI}">{$gBitSystem->getConfig('siteTitle', $smarty.const.BIT_BASE_URI)}</a>.<br />
-{tr}You can always cancel your subscription using:{/tr} <a href="{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$url_code}">{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$url_code}</a></small>
+{tr}You can always cancel your subscription using:{/tr} <a href="{$smarty.const.NEWSLETTERS_PKG_URI}sub.php?c={$url_code}">{$smarty.const.NEWSLETTERS_PKG_URI}sub.php?c={$url_code}</a></small>
-- 
cgit v1.3