remove duplicate edit_newsletter smarty, use include instead. add 'sending' smarty var to prevent floaticon bars in sent HTML email

3 files changed, 8 insertions, 65 deletions

diff --git a/templates/edit_newsletter.tpl b/templates/edit_newsletter.tpl
index affdf5e..2eb4116 100644
--- a/templates/edit_newsletter.tpl
+++ b/templates/edit_newsletter.tpl
@@ -53,7 +53,7 @@
 						{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="Validate e-mail Addresses" for="validate_addr"}
 					{forminput}
@@ -61,7 +61,7 @@
 						{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 submit">
 					<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
 					<input type="submit" name="save" value="{tr}Save{/tr}" />
diff --git a/templates/list_newsletters.tpl b/templates/list_newsletters.tpl
index 1287751..be4b750 100644
--- a/templates/list_newsletters.tpl
+++ b/templates/list_newsletters.tpl
@@ -1,3 +1,6 @@
+{if !$newsletters || $gContent->isValid() || $smarty.request.new}
+	{include file="bitpackage:newsletters/edit_newsletter.tpl"}
+{else}
 {strip}
 <div class="floaticon">{bithelp}</div>
 
@@ -7,68 +10,6 @@
 	</div>
 
 	<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->mNewsletterId}" />
-
-				<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="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="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="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="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="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 submit">
-					<input type="submit" name="cancel" value="{tr}Cancel{/tr}" />
-					<input type="submit" name="save" value="{tr}Save{/tr}" />
-				</div>
-			{/form}
-
-		{else}
 
 			{minifind}
 
@@ -109,7 +50,7 @@
 			{/if}
 
 			{pagination}
-		{/if}
 	</div><!-- end .body -->
 </div><!-- end .___ -->
 {/strip}
+{/if}
diff --git a/templates/view_edition.tpl b/templates/view_edition.tpl
index f134159..c9b4aaf 100644
--- a/templates/view_edition.tpl
+++ b/templates/view_edition.tpl
@@ -1,4 +1,5 @@
 <div class="display newsletters">
+	{if !$sending}
 	<div class="floaticon">
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
@@ -10,6 +11,7 @@
 			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$gContent->mEditionId}">{biticon ipackage=liberty iname="mail_send" iexplain="email this post"}</a>
 		{/if}
 	</div>
+	{/if}
 
 	<div class="header">
 		<h1>{$gContent->getTitle()}</h1>