[Tikiwiki-cvs] tiki/templates tiki-send_newsletters.tpl,1.10.2.8,1.10.2.9

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9273/templates

Modified Files:
      Tag: BRANCH-1-9
	tiki-send_newsletters.tpl 
Log Message:
introduce quicktags for newsletters not to have people thinking they can send every wiki format in a newsletter(hoping theme doesn't change too much things)

Index: tiki-send_newsletters.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-send_newsletters.tpl,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -d -r1.10.2.8 -r1.10.2.9
--- tiki-send_newsletters.tpl	10 Feb 2005 16:27:49 -0000	1.10.2.8
+++ tiki-send_newsletters.tpl	11 Feb 2005 12:13:22 -0000	1.10.2.9
@@ -3,13 +3,20 @@
 {assign var=area_name value="editnl"}
 {if $emited eq 'y'}
 {tr}The newsletter was sent to {$sent} email addresses{/tr}<br /><br />
-{if $errorMsg}<span class="attention">{tr}Errors detected{/tr}<br />{$errorMsg}</span><br /><br />{/if}
+{if $errors}
+<span class="attention">{tr}Errors detected{/tr}<br /></span>
+<table class="normal">
+<tr><td class="heading">{tr}User{/tr}</td><td class="heading">{tr}Email{/tr}</td></tr>
+{cycle values="odd,even" print=false}
+{section loop=$errors name=ix}
+<tr><td class="{cycle advance=false}">{$errors[ix].user}</td><td class="{cycle}">{$errors[ix].email}</td></tr>
+{/section}
+</table><br /><br />
+{/if}
 {/if}
 {if $presend eq 'y'}
-<h2>{tr}Preview{/tr}</h2>
-<div class="wikitext">{$subject}</div>
-<div class="wikitext">{$dataparsed}</div>
-{tr}This newsletter will be sent to {$subscribers} email addresses.{/tr}
+<br />
+<b>{tr}This newsletter will be sent to {$subscribers} email addresses.{/tr}</b>
 <form method="post" action="tiki-send_newsletters.php">
 <input type="hidden" name="nlId" value="{$nlId|escape}" />
 <input type="hidden" name="subject" value="{$subject|escape}" />
@@ -17,6 +24,9 @@
 <input type="submit" name="send" value="{tr}send{/tr}" />
 <input type="submit" name="preview" value="{tr}cancel{/tr}" />
 </form>
+<h2>{tr}Preview{/tr}</h2>
+<div class="wikitext">{$subject}</div>
+<div class="wikitext">{$dataparsed}</div>
 {else}
 {if $preview eq 'y'}
 <h2>{tr}Preview{/tr}</h2>
@@ -57,6 +67,6 @@
 </form>
 {/if}
 
-{if $nlId}
+{if $presend ne 'y'}
 {include file=sent_newsletters.tpl }
 {/if}