first crack at cleaning up some tw code

3 files changed, 128 insertions, 41 deletions

diff --git a/templates/admin_newsletter_subscriptions.tpl b/templates/admin_newsletter_subscriptions.tpl
index 6f5158c..19c3602 100644
--- a/templates/admin_newsletter_subscriptions.tpl
+++ b/templates/admin_newsletter_subscriptions.tpl
@@ -1,23 +1,43 @@
-<a class="pagetitle" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl_id}">{tr}Admin newsletter subscriptions{/tr}</a>
-<br /><br />
+<div class="floaticon">{bithelp}</div>
+
+<div class="admin newsletters">
+	<div class="header">
+		<h1>{tr}Admin newsletter subscriptions{/tr}</h1>
+	</div>
+
+	<div class="body">
+		{form}
+			<input type="hidden" name="nl_id" value="{$nl_id|escape}" />
+
+			<div class="row">
+				{formlabel label="" for=""}
+				{forminput}
+					{formhelp note=""}
+				{/forminput}
+			</div>
+
+			<div class="row submit">
+			</div>
+		{/form}
+
+		{minifind}
+	</div><!-- end .body -->
+</div><!-- end .newsletters -->
 
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}list newsletters{/tr}</a>
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}admin newsletters{/tr}</a>
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}send.php?nl_id={$nl_id}">{tr}send newsletters{/tr}</a>
-<br /><br />
 
 <table class="panel">
-<caption>Newsletters</caption>
-<tr>
-  <td>{tr}Name{/tr}:</td>
-  <td>{$nl_info.name}</td>
-</tr>
-<tr>
-  <td>{tr}Description{/tr}:</td>
-  <td>{$nl_info.description}</td>
-</tr>
+	<caption>Newsletters</caption>
+	<tr>
+		<td>{tr}Name{/tr}:</td>
+		<td>{$nl_info.name}</td>
+	</tr>
+	<tr>
+		<td>{tr}Description{/tr}:</td>
+		<td>{$nl_info.description}</td>
+	</tr>
 </table>
 
+{* original code
 <h2>{tr}Add a subscription newsletters{/tr}</h2>
 <form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php" method="post">
 <input type="hidden" name="nl_id" value="{$nl_id|escape}" />
@@ -82,3 +102,4 @@
 {/section}
 {/if}
 </div>
+*}
diff --git a/templates/menu_newsletters.tpl b/templates/menu_newsletters.tpl
index 0407177..dbcca5d 100644
--- a/templates/menu_newsletters.tpl
+++ b/templates/menu_newsletters.tpl
@@ -1,9 +1,9 @@
 {strip}
 <ul>
-<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}List newsletters{/tr}</a></li>
-{if $gBitUser->hasPermission( 'tiki_p_admin_newsletters' )}
-	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send newsletters{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a></li>
-{/if}
+	<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">{tr}List newsletters{/tr}</a></li>
+	{if $gBitUser->hasPermission( 'tiki_p_admin_newsletters' )}
+		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php">{tr}Send newsletters{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php">{tr}Admin newsletters{/tr}</a></li>
+	{/if}
 </ul>
 {/strip}
diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index bf4051d..4498390 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -1,26 +1,91 @@
-<a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php" class="pagetitle">{tr}Newsletters{/tr}</a><br /><br />
-{if $subscribed eq 'y'}
-{tr}Thanks for your subscription. You will receive an email soon to confirm your subscription. No newsletters will be sent to you until the subscription is confirmed.{/tr}<br /><br />
-{/if}
-{if $unsub eq 'y'}
-{tr}Your email address was removed from the list of subscriptors.{/tr}<br /><br />
-{/if}
+{strip}
+<div class="display newsletters">
+	<div class="header">
+		<h1>{tr}Newsletters{/tr}</h1>
+	</div>
+
+	<div class="body">
+		{formfeedback hash=$feedback}
+
+		{if $confirm eq 'y'}
+			{legend legend="Subscription Confirmed!"}
+				<div class="row">
+					{formlabel label="Name" for=""}
+					{forminput}
+						{$nl_info.name}
+					{/forminput}
+				</div>
+
+				<div class="row">
+					{formlabel label="Description" for=""}
+					{forminput}
+						{$nl_info.description}
+					{/forminput}
+				</div>
+			{/legend}
+		{/if}
+
+		{if $subscribe eq 'y'}
+			{form}
+				<div class="row">
+					{formlabel label="Name" for=""}
+					{forminput}
+						{$nl_info.name}
+					{/forminput}
+				</div>
+
+				<div class="row">
+					{formlabel label="Description" for=""}
+					{forminput}
+						{$nl_info.description}
+					{/forminput}
+				</div>
+
+				{if ($nl_info.allow_user_sub eq 'y') or ($bitweaver.orgi_p_admin_newsletters eq 'y')}
+					{if $bitweaver.orgi_p_subscribe_email eq 'y'}
+						<div class="row">
+							{formlabel label="Email" for=""}
+							{forminput}
+								{$email|escape}
+							{/forminput}
+						</div>
+					{else}
+						<input type="hidden" name="email" value="{$email|escape}" />
+					{/if}
+				{/if}
+			{/form}
+		{/if}
+
+		{minifind}
+
+		<table class="data">
+			<caption>{tr}Newsletters{/tr}</caption>
+			<tr>
+				<th>{smartlink ititle="Name" isort=name offset=$offset idefault=1}</th>
+				<th>{smartlink ititle="Descritpion" isort=descritpion offset=$offset}</th>
+			</tr>
+			{section name=user loop=$channels}
+				{if $channels.individual ne 'y' or $channels.individual_bitweaver.orgi_p_subscribe_newsletters eq 'y'}
+					<tr class="{cycle values='odd,even'}">
+						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$channels[user].nl_id}&amp;info=1">{$channels[user].name}</a></td>
+						<td>{$channels[user].description}</td>
+					</tr>
+				{/if}
+			{sectionelse}
+				<tr class="norecords">
+					<td colspan="2">{tr}No Records Found{/tr}</td>
+				</tr>
+			{/section}
+		</table>
+
+		{* haven't dealt with pagination yet *}
+		{pagination}
+	</div><!-- end .body -->
+</div><!-- end .newsletters -->
+{/strip}
 
-{if $confirm eq 'y'}
-<table class="panel">
-<caption>{tr}Subscription confirmed!{/tr}</caption>
-</tr>
-<tr>
-  <td>{tr}Name{/tr}:</td>
-  <td>{$nl_info.name}</td>
-</tr>
-<tr>
-  <td>{tr}Description{/tr}:</td>
-  <td>{$nl_info.description}</td>
-</tr>
-</table>
-{/if}
 
+{* original code
 {if $subscribe eq 'y'}
 <form method="post" action="{$smarty.const.NEWSLETTERS_PKG_URL}index.php">
 <input type="hidden" name="nl_id" value="{$nl_id|escape}" />
@@ -96,3 +161,4 @@
 {/section}
 {/if}
 </div>
+*}