From 703b815874de151b2ef97dac6ad3114602cff0ca Mon Sep 17 00:00:00 2001
From: Christian Fowler <spider@viovio.com>
Date: Wed, 25 Apr 2007 21:45:25 +0000
Subject: clean up .tpl's and mailing, add new body to allow customization of
 bitweaver.tpl

---
 templates/mail_edition_body.tpl | 42 +++++++++++++++++++++++++++++++++++++++++
 templates/unsubscribe_inc.tpl   |  4 +++-
 templates/view_edition.tpl      |  1 +
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 templates/mail_edition_body.tpl

(limited to 'templates')

diff --git a/templates/mail_edition_body.tpl b/templates/mail_edition_body.tpl
new file mode 100644
index 0000000..2ffa79a
--- /dev/null
+++ b/templates/mail_edition_body.tpl
@@ -0,0 +1,42 @@
+{include file="bitpackage:kernel/header.tpl"}
+{strip}
+{if $print_page ne "y"}
+	{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}<div dir="rtl">{/if}
+
+	<div id="container" class="blocks{
+		if $gBitSystem->isFeatureActive( 'site_left_column' ) && $l_modules && !$gHideModules and $gBitSystem->isFeatureActive( 'site_right_column' ) && $r_modules && !$gHideModules
+			}3{
+		elseif $gBitSystem->isFeatureActive( 'site_left_column' ) && $l_modules && !$gHideModules
+			}2n{
+		elseif $gBitSystem->isFeatureActive( 'site_right_column' ) && $r_modules && !$gHideModules
+			}2e{
+		else
+			}1{
+		/if
+	}">
+
+		<div id="header">
+			{include file="bitpackage:kernel/top.tpl"}
+			{if $gBitSystem->isFeatureActive( 'site_top_bar' )}
+				{include file="bitpackage:kernel/top_bar.tpl"}
+			{/if}
+		</div>
+
+		<div id="wrapper">
+			<div id="content">
+				{include file=$mid}
+			</div>
+		</div>
+
+		{if $gBitSystem->isFeatureActive( 'site_bot_bar' )}
+			<div id="footer">
+				{include file="bitpackage:kernel/bot_bar.tpl"}
+			</div>
+		{/if}
+
+	</div>
+
+	{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}</div>{/if}
+{/if}
+{/strip}
+{include file="bitpackage:kernel/footer.tpl"}
diff --git a/templates/unsubscribe_inc.tpl b/templates/unsubscribe_inc.tpl
index 01d18e4..1454c8f 100644
--- a/templates/unsubscribe_inc.tpl
+++ b/templates/unsubscribe_inc.tpl
@@ -1,2 +1,4 @@
-<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 />
+
+<a href="{$smarty.const.NEWSLETTERS_PKG_URI}?unsubscribe={$code}">{$smarty.const.NEWSLETTERS_PKG_URI}?sub={$url_code}</a></p>
+<small>{tr}You have received this message because you are registered at{/tr} <a href="{$smarty.const.BIT_BASE_URI}">{$gBitSystem->getConfig('site_title', $smarty.server.HTTP_HOST)}</a>.<br />
 {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>
diff --git a/templates/view_edition.tpl b/templates/view_edition.tpl
index 9af45e6..8e271e6 100644
--- a/templates/view_edition.tpl
+++ b/templates/view_edition.tpl
@@ -33,6 +33,7 @@
 	{if $sending}
 		<div class="subscriptioninfo">
 		{include file="bitpackage:newsletters/unsubscribe_inc.tpl"}
+tcode {$trackCode}
 		{if $trackCode}
 			<img src="{$smarty.const.NEWSLETTERS_PKG_URI}track.php?sub={$trackCode}" alt="" />
 		{/if}
-- 
cgit v1.3