break out edition editing

5 files changed, 39 insertions, 36 deletions

diff --git a/templates/admin_newsletters.tpl b/templates/admin_newsletters.tpl
index 49cfbcb..0c7e1db 100644
--- a/templates/admin_newsletters.tpl
+++ b/templates/admin_newsletters.tpl
@@ -11,6 +11,7 @@
 			<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}
 		{form legend="Create / Edit Newsletters"}
+			<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"}
@@ -88,7 +89,7 @@
 					<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;">{$nl.editions|default:0}</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={$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;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>
diff --git a/templates/confirm_newsletter_subscription.tpl b/templates/confirm_newsletter_subscription.tpl
index 9c3b462..7144158 100644
--- a/templates/confirm_newsletter_subscription.tpl
+++ b/templates/confirm_newsletter_subscription.tpl
@@ -1,5 +1,6 @@
 {tr}Somebody or you tried to subscribe this email address at our site:{/tr} {$server_name}
-{tr}To the newsletter:{/tr} {$info.name}
+
+{tr}To the newsletter:{/tr} {$info.title}
 
 {tr}Description:{/tr}
 {$info.description}
diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
new file mode 100644
index 0000000..221cae7
--- /dev/null
+++ b/templates/edit_edition.tpl
@@ -0,0 +1,34 @@
+{if $preview eq 'y'}
+<br />
+<div class="wikibody">{$info.subject}</div>
+<div class="wikibody">{$parsed}</div>
+{/if}
+
+<h2>{tr}Prepare a newsletter to be sent{/tr}</h2>
+<form action="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php" method="post" id='editpageform'>
+<table class="panel">
+<tr><td>{tr}Subject{/tr}:</td><td><input type="text" maxlength="250" size="40" name="title" value="{$info.subject|escape}" /></td></tr>
+<tr><td>{tr}Newsletter{/tr}:</td><td>
+<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>
+</td></tr>
+{if $tiki_p_use_content_templates eq 'y'}
+<tr><td>{tr}Apply template{/tr}</td><td>
+<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>
+</td></tr>
+{/if}
+<tr><td>{tr}Data{/tr}:</td><td><textarea name="edit" rows="25" cols="60">{$info.data|escape}</textarea></td></tr>
+<tr class="panelsubmitrow"><td colspan="2">
+<input type="submit" name="preview" value="{tr}Preview{/tr}" />&nbsp;<input type="submit" name="save" value="{tr}Save Edition{/tr}" />
+</td></tr>
+</table>
+</form>
+
diff --git a/templates/newsletters.tpl b/templates/newsletters.tpl
index 992a391..d5f8368 100644
--- a/templates/newsletters.tpl
+++ b/templates/newsletters.tpl
@@ -27,6 +27,7 @@
 
 				{if ($gContent->mInfo.allow_user_sub eq 'y') or $gBitUser->hasPermission( 'bit_p_subscribe_newsletters' )}
 					{form}
+						<input type="hidden" name="nl_id" value="{$gContent->mNlId}" />
 						<div class="row">
 							{formlabel label="Email" for=""}
 							{forminput}
diff --git a/templates/send_newsletters.tpl b/templates/send_newsletters.tpl
index 22c3449..33c010a 100644
--- a/templates/send_newsletters.tpl
+++ b/templates/send_newsletters.tpl
@@ -18,40 +18,6 @@
 <input type="submit" name="preview" value="{tr}cancel{/tr}" />
 </form>
 {else}
-{if $preview eq 'y'}
-<br />
-<div class="wikibody">{$info.subject}</div>
-<div class="wikibody">{$parsed}</div>
-{/if}
-
-<h2>{tr}Prepare a newsletter to be sent{/tr}</h2>
-<form action="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php" method="post" id='editpageform'>
-<table class="panel">
-<tr><td>{tr}Subject{/tr}:</td><td><input type="text" maxlength="250" size="40" name="title" value="{$info.subject|escape}" /></td></tr>
-<tr><td>{tr}Newsletter{/tr}:</td><td>
-<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>
-</td></tr>
-{if $tiki_p_use_content_templates eq 'y'}
-<tr><td>{tr}Apply template{/tr}</td><td>
-<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>
-</td></tr>
-{/if}
-<tr><td>{tr}Data{/tr}:</td><td><textarea name="edit" rows="25" cols="60">{$info.data|escape}</textarea></td></tr>
-<tr class="panelsubmitrow"><td colspan="2">
-<input type="submit" name="preview" value="{tr}Preview{/tr}" />&nbsp;<input type="submit" name="save" value="{tr}Send Newsletters{/tr}" />
-</td></tr>
-</table>
-</form>
-{/if}
 
 <h2>{tr}Sent editions{/tr}</h2>
 <table class="find">