From 5c976e0f6488cd1cdd13d06abe4c99bf5bc40f99 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Mon, 12 Dec 2005 13:38:13 +0000
Subject: template housekeeping

---
 templates/edit_edition.tpl    | 49 +++++++++----------------------------------
 templates/view_newsletter.tpl |  3 ++-
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/templates/edit_edition.tpl b/templates/edit_edition.tpl
index 73ac4ca..50759c8 100644
--- a/templates/edit_edition.tpl
+++ b/templates/edit_edition.tpl
@@ -22,14 +22,6 @@
 			{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="This will appear in the <strong>subject</strong> line of the email."}
-							{/forminput}
-						</div>
-
 						<div class="row">
 							{formlabel label="Newsletter" for="nl_id"}
 							{forminput}
@@ -62,15 +54,23 @@
 						<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}" />
+								<input type="checkbox" name="is_draft" id="draft" value="y" {if $gContent->getField('is_draft')}checked="checked"{/if} />
 								{formhelp note=""}
 							{/forminput}
 						</div>
 
+						<div class="row">
+							{formlabel label="Subject" for="subject"}
+							{forminput}
+								<input type="text" maxlength="250" size="40" name="title" id="subject" 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="Body" for="body"}
 							{forminput}
-								<textarea name="edit" rows="25" cols="50">{$gContent->getField('data')|escape}</textarea>
+								<textarea name="edit" id="body" rows="25" cols="50">{$gContent->getField('data')|escape}</textarea>
 								{formhelp note=""}
 							{/forminput}
 						</div>
@@ -97,32 +97,3 @@
 		{/form}
 	</div><!-- end .body -->
 </div><!-- end .newsletters -->
-
-{* original code
-<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/view_newsletter.tpl b/templates/view_newsletter.tpl
index cd17436..a138924 100644
--- a/templates/view_newsletter.tpl
+++ b/templates/view_newsletter.tpl
@@ -1,4 +1,4 @@
-<div class="display blogs">
+<div class="display newsletters">
 	<div class="floaticon">
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
@@ -31,3 +31,4 @@
 
 		</div> <!-- end .content -->
 	</div> <!-- end .body -->
+</div> <!-- end .newsletters -->
-- 
cgit v1.3