cleanup

2 files changed, 144 insertions, 145 deletions

diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index b9cd035..e2db21f 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -8,104 +8,104 @@
 
 	<div class="body">
 		{if !$newsletters || $gContent->isValid() || $smarty.request.new}
-		{form legend="Create / Edit Newsletters"}
-			{if $individual eq 'y'}
-				<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$gContent->mInfo.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$gContent->mInfo.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
-			{/if}
-			<input type="hidden" name="nl_id" value="{$gContent->mNlId}" />
-			maybe we could have an option to autosubscribe users to a list when they register with the site.
-			<div class="row">
-				{formlabel label="Title" for="title"}
-				{forminput}
-					<input type="text" name="title" id="title" value="{$gContent->mInfo.title|escape}" />
-					{formhelp note="Title of the newsletter."}
-				{/forminput}
-			</div>
+			{form legend="Create / Edit Newsletters"}
+				{if $individual eq 'y'}
+					<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$gContent->mInfo.name}&amp;object_type=newsletter&amp;permType=newsletters&amp;object_id={$gContent->mInfo.nl_id}">{tr}There are individual permissions set for this newsletter{/tr}</a><br /><br />
+				{/if}
+				<input type="hidden" name="nl_id" value="{$gContent->mNlId}" />
 
-			<div class="row">
-				{formlabel label="Description" for="description"}
-				{forminput}
-					<textarea name="edit" rows="4" cols="40" id="description">{$gContent->mInfo.data|escape}</textarea>
-					{formhelp note="Description of the newsletter, that users know what they are getting themselves into."}
-				{/forminput}
-			</div>
+				<div class="row">
+					{formlabel label="Title" for="title"}
+					{forminput}
+						<input type="text" name="title" id="title" value="{$gContent->mInfo.title|escape}" />
+						{formhelp note="Title of the newsletter."}
+					{/forminput}
+				</div>
 
-			<div class="row">
-				{formlabel label="Users can Subscribe" for="allow_user_sub"}
-				{forminput}
-					<input type="checkbox" name="allow_user_sub" id="allow_user_sub" {if $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} />
-					{formhelp note="Users can subscribe to this list. Disabling this options means that you have to manually add users to the list."}
-				{/forminput}
-			</div>
+				<div class="row">
+					{formlabel label="Description" for="description"}
+					{forminput}
+						<textarea name="edit" rows="4" cols="40" id="description">{$gContent->mInfo.data|escape}</textarea>
+						{formhelp note="Description of the newsletter, that users know what they are getting themselves into."}
+					{/forminput}
+				</div>
 
-			<div class="row">
-				{formlabel label="Any e-mail Address" for="allow_any_sub"}
-				{forminput}
-					<input type="checkbox" name="allow_any_sub" id="allow_any_sub" {if $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} />
-					{formhelp note="Users may subscribe using any email address."}
-				{/forminput}
-			</div>
+				<div class="row">
+					{formlabel label="Users can Subscribe" for="allow_user_sub"}
+					{forminput}
+						<input type="checkbox" name="allow_user_sub" id="allow_user_sub" {if $gContent->mInfo.allow_user_sub eq 'y'}checked="checked"{/if} />
+						{formhelp note="Users can subscribe to this list. Disabling this options means that you have to manually add users to the list."}
+					{/forminput}
+				</div>
 
-			<div class="row">
-				{formlabel label="Append Un/Subscribe Instructions" for="unsub_msg"}
-				{forminput}
-					<input type="checkbox" name="unsub_msg" id="unsub_msg" {if $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} />
-					{formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."}
-				{/forminput}
-			</div>
+				<div class="row">
+					{formlabel label="Any e-mail Address" for="allow_any_sub"}
+					{forminput}
+						<input type="checkbox" name="allow_any_sub" id="allow_any_sub" {if $gContent->mInfo.allow_any_sub eq 'y'}checked="checked"{/if} />
+						{formhelp note="Users may subscribe using any email address."}
+					{/forminput}
+				</div>
 
-			<div class="row">
-				{formlabel label="Validate e-mail Addresses" for="validate_addr"}
-				{forminput}
-					<input type="checkbox" name="validate_addr" id="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} />
-					{formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."}
-				{/forminput}
-			</div>
+				<div class="row">
+					{formlabel label="Append Un/Subscribe Instructions" for="unsub_msg"}
+					{forminput}
+						<input type="checkbox" name="unsub_msg" id="unsub_msg" {if $gContent->mInfo.unsub_msg eq 'y'}checked="checked"{/if} />
+						{formhelp note="Append instructions on how to subscribe / unsubscribe to ever outgoing newsletter. This is only useful when users can un / subscribe to the list themselves."}
+					{/forminput}
+				</div>
 
-			<div class="row submit">
-				<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
-				<input type="submit" name="save" value="{tr}Save{/tr}" />
-			</div>
-		{/form}
+				<div class="row">
+					{formlabel label="Validate e-mail Addresses" for="validate_addr"}
+					{forminput}
+						<input type="checkbox" name="validate_addr" id="validate_addr" {if $gContent->mInfo.validate_addr eq 'y'}checked="checked"{/if} />
+						{formhelp note="Validate all email addresses before they are added to the list. This might result in members not being added despite working email addresses."}
+					{/forminput}
+				</div>
 
-		{else}
+				<div class="row submit">
+					<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
+					<input type="submit" name="save" value="{tr}Save{/tr}" />
+				</div>
+			{/form}
 
-		{minifind}
+		{else}
 
-		<table class="data">
-			<caption>{tr}Newsletters{/tr}</caption>
-			<tr>
-				<th>{smartlink ititle="Name" isort=name offset=$offset}</th>
-				<th>{smartlink ititle="Description" isort=description offset=$offset}</th>
-				<th>{smartlink ititle="Created" isort=last_sent offset=$offset}</th>
-				<th>{smartlink ititle="Last Sent" isort=created offset=$offset}</th>
-				<th>{smartlink ititle="Users Unsubscribed" isort=users offset=$offset}</th>
-				<th>{tr}Action{/tr}</th>
-			</tr>
+			{minifind}
 
-			{foreach key=nlId from=$newsletters item=nl}
-				<tr class="{cycle values='odd,even'}">
-					<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nlId}">{$nl.title}</a></td>
-					<td>{$nl.data}</td>
-					<td>{$nl.created|bit_short_date}</td>
-					<td>{$nl.last_sent|bit_short_date}</td>
-					<td style="text-align:right;"><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}">{$nl.users|default:0} [ {$channels[user].confirmed|default:0} ]</a></td>
-					<td style="text-align:right;">
-						<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove=1&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=delete iexplain=Remove}</a>
-						<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=edit iexplain=Edit}</a>
-						{if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$nl.title}&amp;object_type={$smarty.const.BITNEWSLETTER_CONTENT_TYPE_GUID}&amp;permType=newsletters&amp;object_id={$nlId}">{biticon ipackage=liberty iname=permissions iexplain=Permissions}</a>{if $nl.individual eq 'y'}){/if}
-					</td>
+			<table class="data">
+				<caption>{tr}Newsletters{/tr}</caption>
+				<tr>
+					<th>{smartlink ititle="Name" isort=name offset=$offset}</th>
+					<th>{smartlink ititle="Description" isort=description offset=$offset}</th>
+					<th>{smartlink ititle="Created" isort=last_sent offset=$offset}</th>
+					<th>{smartlink ititle="Last Sent" isort=created offset=$offset}</th>
+					<th>{smartlink ititle="Users Unsubscribed" isort=users offset=$offset}</th>
+					<th>{tr}Action{/tr}</th>
 				</tr>
-			{foreachelse}
-				<tr class="norecords">
-					<td colspan="7">{tr}No Records Found{/tr}</td>
-				</tr>
-			{/foreach}
-		</table>
 
-		<a href="{$smarty.server.php_self}?new=1">Create new newsletter</a>
+				{foreach key=nlId from=$newsletters item=nl}
+					<tr class="{cycle values='odd,even'}">
+						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}index.php?nl_id={$nlId}">{$nl.title}</a></td>
+						<td>{$nl.data}</td>
+						<td>{$nl.created|bit_short_date}</td>
+						<td>{$nl.last_sent|bit_short_date}</td>
+						<td style="text-align:right;"><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nlId}">{$nl.users|default:0} [ {$channels[user].confirmed|default:0} ]</a></td>
+						<td style="text-align:right;">
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove=1&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=delete iexplain=Remove}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/index.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;nl_id={$nlId}">{biticon ipackage=liberty iname=edit iexplain=Edit}</a>
+							{if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$nl.title}&amp;object_type={$smarty.const.BITNEWSLETTER_CONTENT_TYPE_GUID}&amp;permType=newsletters&amp;object_id={$nlId}">{biticon ipackage=liberty iname=permissions iexplain=Permissions}</a>{if $nl.individual eq 'y'}){/if}
+						</td>
+					</tr>
+				{foreachelse}
+					<tr class="norecords">
+						<td colspan="7">{tr}No Records Found{/tr}</td>
+					</tr>
+				{/foreach}
+			</table>
+
+			<a href="{$smarty.server.php_self}?new=1">Create new newsletter</a>
 
-		{pagination}
+			{pagination}
 		{/if}
 	</div><!-- end .body -->
 </div><!-- end .___ -->
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index 7b2b151..73ac4ca 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -6,7 +6,7 @@
 	</div>
 
 	{if $preview eq 'y'}
-		<div id="preview">
+		<div class="preview">
 			<div class="header">
 				<h1>{$info.subject}</h1>
 			</div>
@@ -22,73 +22,72 @@
 			{jstabs}
 				{jstab title="Edition Body"}
 					{legend legend="Edition Body"}
-				<div class="row">
-					{formlabel label="Subject" for="subject"}
-					{forminput}
-						<input type="text" maxlength="250" size="40" name="title" value="{$gContent->getTitle()|escape}" />
-						{formhelp note=""}
-					{/forminput}
-				</div>
+						<div class="row">
+							{formlabel label="Subject" for="subject"}
+							{forminput}
+								<input type="text" maxlength="250" size="40" name="title" value="{$gContent->getTitle()|escape}" />
+								{formhelp note="This will appear in the <strong>subject</strong> line of the email."}
+							{/forminput}
+						</div>
 
-				<div class="row">
-					{formlabel label="" for=""}
-					{forminput}
-						<select name="nl_id">
-							{foreach from=$newsletters item=nl key=nlId}
-								<option value="{$nlId|escape}" {if $nlId eq $nl_id}selected="selected"{/if}>{$nl.title}</option>
-							{/foreach}
-						</select>
-						{formhelp note=""}
-					{/forminput}
-				</div>
+						<div class="row">
+							{formlabel label="Newsletter" for="nl_id"}
+							{forminput}
+								<select name="nl_id" id="nl_id">
+									{foreach from=$newsletters item=nl key=nlId}
+										<option value="{$nlId}" {if $nlId eq $nl_id}selected="selected"{/if}>{$nl.title}</option>
+									{/foreach}
+								</select>
+								{formhelp note="Pick the newsletter you want to post to."}
+							{/forminput}
+						</div>
 
-				{if $gBitUser->hasPermission( 'bit_p_use_content_templates' ) && $templates}
-					<div class="row">
-						{formlabel label="Template" for=""}
-						{forminput}
-							<select name="template_id" onchange="javascript:document.getElementById('editpageform').submit();">
-								<option value="0">{tr}none{/tr}</option>
-								{section name=ix loop=$templates}
-									<option value="{$templates[ix].template_id|escape}">{$templates[ix].name}</option>
-								{/section}
-							</select>
-							{formhelp note=""}
-						{/forminput}
-					</div>
-				{/if}
-
-				{include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_mini_tpl}
-
-				<div class="row">
-					{formlabel label="Draft" for="draft"}
-					{forminput}
-						<input type="checkbox" name="is_draft" value="y" {if $gContent->getField('is_draft')}checked="checked"{/if}" />
-						{formhelp note=""}
-					{/forminput}
-				</div>
-
-				<div class="row">
-					{formlabel label="Body" for="body"}
-					{forminput}
-						<textarea name="edit" rows="25" cols="60">{$gContent->getField('data')|escape}</textarea>
-						{formhelp note=""}
-					{/forminput}
-				</div>
+						{if $gBitUser->hasPermission( 'bit_p_use_content_templates' ) && $templates}
+							<div class="row">
+								{formlabel label="Template" for=""}
+								{forminput}
+									<select name="template_id" onchange="javascript:document.getElementById('editpageform').submit();">
+										<option value="0">{tr}none{/tr}</option>
+										{section name=ix loop=$templates}
+											<option value="{$templates[ix].template_id|escape}">{$templates[ix].name}</option>
+										{/section}
+									</select>
+									{formhelp note=""}
+								{/forminput}
+							</div>
+						{/if}
 
-				{/legend}
-			{/jstab}
+						{include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_mini_tpl}
 
-			{include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_tab_tpl}
+						<div class="row">
+							{formlabel label="Draft" for="draft"}
+							{forminput}
+								<input type="checkbox" name="is_draft" value="y" {if $gContent->getField('is_draft')}checked="checked"{/if}" />
+								{formhelp note=""}
+							{/forminput}
+						</div>
 
-			{if $gBitUser->hasPermission('bit_p_content_attachments')}
-				{jstab title="Attachments"}
-					{legend legend="Attachments"}
-						{include file="bitpackage:liberty/edit_storage.tpl"}
+						<div class="row">
+							{formlabel label="Body" for="body"}
+							{forminput}
+								<textarea name="edit" rows="25" cols="50">{$gContent->getField('data')|escape}</textarea>
+								{formhelp note=""}
+							{/forminput}
+						</div>
 					{/legend}
 				{/jstab}
-			{/if}
 
-		{/jstabs}
+				{include file="bitpackage:liberty/edit_services_inc.tpl serviceFile=content_edit_tab_tpl}
+
+				{if $gBitUser->hasPermission('bit_p_content_attachments')}
+					{jstab title="Attachments"}
+						{legend legend="Attachments"}
+							{include file="bitpackage:liberty/edit_storage.tpl"}
+						{/legend}
+					{/jstab}
+				{/if}
+
+			{/jstabs}
 
 			<div class="row submit">
 				<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />