From d42baa48c6a4f1b88cc4c92e5f1e28711197ac49 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 24 Jul 2011 21:09:35 +0000
Subject: [PATCH] fix bunches of tiny typos; do_template?template=sieve_list
 produces similar results to the non templated system.

---
 webcit/static/t/sieve/display.html            | 17 ++--
 webcit/static/t/sieve/display_one.html        | 77 +++++++++----------
 webcit/static/t/sieve/display_one_script.html |  2 +-
 webcit/static/t/sieve/list.html               | 22 ++++--
 webcit/static/t/sieve/list_select_one.html    |  2 +-
 webcit/static/t/sieve/roomlist.html           |  2 +-
 6 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/webcit/static/t/sieve/display.html b/webcit/static/t/sieve/display.html
index d34a0edff..0bba5c0ff 100644
--- a/webcit/static/t/sieve/display.html
+++ b/webcit/static/t/sieve/display.html
@@ -13,7 +13,7 @@ function UpdateRules() {
  * Show only the active rows... /// TODO 255-> we need no limit anymore.
  */
   highest_active_rule = (-1);
-  for (i=0; i< 255; ++i) {
+  for (i=0; i< 50; ++i) {
    if ($('active'+i).checked) {
      $('rule' + i).style.display = 'block';
      highest_active_rule = i;
@@ -36,17 +36,17 @@ function UpdateRules() {
     }
     d = ($('hfield'+i).options[$('hfield'+i).selectedIndex].value);
     if (d == 'all') {
-      $('div_size'+i).style.display = 'none';	 
+      $('div_size'+i).style.display = 'none';
       $('div_compare'+i).style.display = 'none';
       $('div_nocompare'+i).style.display = 'block';
     }
     else if (d == 'size') {
-      $('div_size'+i).style.display = 'block';	 
+      $('div_size'+i).style.display = 'block';
       $('div_compare'+i).style.display = 'none';
       $('div_nocompare'+i).style.display = 'none';
     }
     else {
-      $('div_size'+i).style.display = 'none';	 
+      $('div_size'+i).style.display = 'none';
       $('div_compare'+i).style.display = 'block';
       $('div_nocompare'+i).style.display = 'none';
     }
@@ -68,7 +68,7 @@ function UpdateRules() {
       $('div_redirect'+i).style.display = 'none';
       $('div_automsg'+i).style.display = 'none';
     }/* TODO: we don't have any limits anymore */
-    if (highest_active_rule < 255 - 1) {
+    if (highest_active_rule < 49) {
       $('div_addrule').style.display = 'block';
     } else {
       $('div_addrule').style.display = 'none';
@@ -119,10 +119,3 @@ function DeleteRule(rd) {
   $('active'+highest_active_rule).checked = false;
 }
 </script>
-
-
-<br>
-
-<div id="div_addrule"><a href="javascript:AddRule();"><?_("Add rule")></a><br></div>
-<script type="text/javascript">UpdateRules();</script>
-</div>
diff --git a/webcit/static/t/sieve/display_one.html b/webcit/static/t/sieve/display_one.html
index e7bf25373..836109883 100644
--- a/webcit/static/t/sieve/display_one.html
+++ b/webcit/static/t/sieve/display_one.html
@@ -1,75 +1,73 @@
-<?SIEVE:SCRIPT:LOOKUP_FILEINTO><table cellpadding=2 width=100%>
-<tr id="rule<?ITERATE:N>" class="<?ITERATE:ODDEVEN>">
+<?SIEVE:SCRIPT:LOOKUP_FILEINTO><tr id="rule<?ITERATE:N>" class="<?ITERATE:ODDEVEN>">
 <td width=5% align="center">
 <div style="display:none">
 <input type="checkbox" name="active<?ITERATE:N>" id="active<?ITERATE:N>" <?%("COND:SIEVE:ACTIVE", 1, 0, 0, "checked", "")>>
 </div>
-
-<a href="javascript:SwapRules(<?ITERATE:N>,<?ITERATE:N> - 1);UpdateRules();"><img border="0" src="static/up_pointer.gif" title='<?_("Move rule up")>'/></a>
-<a href="javascript:SwapRules(<?ITERATE:N>,<?ITERATE:N> + 1);UpdateRules();"><img id="movedown%d" border="0" src="static/down_pointer.gif" title='<?_("Move rule down")>'/></a>
-<a href="javascript:DeleteRule(<?ITERATE:N>);UpdateRules();"><img id="delete<?ITERATE:N>" border="0" src="static/delete.gif" title='<?_("Delete rule")>'/></a>
+<??("COND:ITERATE:FIRSTN", 1)><a href="javascript:SwapRules(<?ITERATE:N> - 1, <?ITERATE:N>);UpdateRules();"><img border="0" src="static/webcit_icons/up_pointer.gif" title='<?_("Move rule up")>'/></a><??("X", 1)>
+<??("COND:ITERATE:LASTN",  2)><a href="javascript:SwapRules(<?ITERATE:N>,<?ITERATE:N> + 1);UpdateRules();"><img id="movedown<?ITERATE:N>" border="0" src="static/webcit_icons/down_pointer.gif" title='<?_("Move rule down")>'/></a><??("X", 2)>
+<a href="javascript:DeleteRule(<?ITERATE:N>);UpdateRules();"><img id="delete<?ITERATE:N>" border="0" src="static/webcit_icons/delete.gif" title='<?_("Delete rule")>'/></a>
 
 </td>
 
 <td width=5% align="center">
-<font size=+2><script type="text/javascript"> echo '<?ITERATE:N> + 1';</script></font>
+<font size=+2><script type="text/javascript"> $z = <?ITERATE:N> + 1; document.write($z);</script></font>
 </td>
 
 <td width=20%><?_("If")>
 
 <select id="hfield<?ITERATE:N>" name="hfield<?ITERATE:N>" size=1 onChange="UpdateRules();">
 
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"from",		"checked", "")> value="from"		><?_("From")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"tocc",		"checked", "")> value="tocc"		><?_("To or Cc")></option>		
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"subject",	"checked", ""> value="subject",		)><?_("Subject")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"replyto",	"checked", ""> value="replyto"		)><?_("Reply-to")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"sender",		"checked", "")> value="sender"		><?_("Sender")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"resentfrom",	"checked", "")> value="resentfrom"	><?_("Resent-From")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"resentto",	"checked", "")> value="resentto"		><?_("Resent-To")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"envfrom",	"checked", ""> value="envfrom"		)><?_("Envelope From")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"envto",		"checked", "")> value="envto"		><?_("Envelope To")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"xmailer",	"checked", ""> value="xmailer"		)><?_("X-Mailer")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"xspamflag",	"checked", "")> value="xspamflag"	><?_("X-Spam-Flag")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"xspamstatus",	"checked", "")> value="xspamstatus"	><?_("X-Spam-Status")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"listid",		"checked", "")> value="listid"		><?_("List-ID")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"size",		"checked", "")> value="size"		><?_("Message size")></option>
-<option <?%("COND:SIEVE:HFIELD", 1, 0, 0, #"all",		"checked", "")> value="all"		><?_("All")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"from",		"selected", "")> value="from"		><?_("From")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"tocc",		"selected", "")> value="tocc"		><?_("To or Cc")></option>		
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"subject",	"selected", "")> value="subject",	><?_("Subject")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"replyto",	"selected", "")> value="replyto"	><?_("Reply-to")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"sender",	"selected", "")> value="sender"		><?_("Sender")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"resentfrom",	"selected", "")> value="resentfrom"	><?_("Resent-From")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"resentto",	"selected", "")> value="resentto"	><?_("Resent-To")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"envfrom",	"selected", "")> value="envfrom"	><?_("Envelope From")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"envto",	"selected", "")> value="envto"		><?_("Envelope To")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"xmailer",	"selected", "")> value="xmailer"	><?_("X-Mailer")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"xspamflag",	"selected", "")> value="xspamflag"	><?_("X-Spam-Flag")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"xspamstatus",	"selected", "")> value="xspamstatus"	><?_("X-Spam-Status")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"listid",	"selected", "")> value="listid"		><?_("List-ID")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"size",		"selected", "")> value="size"		><?_("Message size")></option>
+<option <?%("COND:SIEVE:HFIELD", 1, 0, #"all",		"selected", "")> value="all"		><?_("All")></option>
 </select>
 </td>
 
 <td width=20%>
 <div id="div_compare<?ITERATE:N>">
 <select id="compare<?ITERATE:N>" name="compare<?ITERATE:N>" size=1 onChange="UpdateRules();">
-<option <?%("COND:SIEVE:COMPARE", 1, 0, 0, #"contains",	"checked", "")>><?_("contains"		)></option>
-<option <?%("COND:SIEVE:COMPARE", 1, 0, 0, #"notcontains",	"checked", "")>><?_("does not contain"	)></option>
-<option <?%("COND:SIEVE:COMPARE", 1, 0, 0, #"is",		"checked", "")>><?_("is"		)></option>
-<option <?%("COND:SIEVE:COMPARE", 1, 0, 0, #"isnot",		"checked", "")>><?_("is not"		)></option>
-<option <?%("COND:SIEVE:COMPARE", 1, 0, 0, #"matches",	"checked", "")>><?_("matches"		)></option>
-<option <?%("COND:SIEVE:COMPARE", 1, 0, 0, #"notmatches",	"checked", "")>><?_("does not match"	)></option>
+<option <?%("COND:SIEVE:COMPARE", 1, 0, #"contains",	"selected", "")> value="contains"><?_(		"contains"		)></option>
+<option <?%("COND:SIEVE:COMPARE", 1, 0, #"notcontains",	"selected", "")> value="notcontains"><?_(	"does not contain"	)></option>
+<option <?%("COND:SIEVE:COMPARE", 1, 0, #"is",		"selected", "")> value="is"><?_(		"is"			)></option>
+<option <?%("COND:SIEVE:COMPARE", 1, 0, #"isnot",	"selected", "")> value="isnot"><?_(		"is not"		)></option>
+<option <?%("COND:SIEVE:COMPARE", 1, 0, #"matches",	"selected", "")> value="matches"><?_(		"matches"		)></option>
+<option <?%("COND:SIEVE:COMPARE", 1, 0, #"notmatches",	"selected", "")> value="notmatches"><?_(	"does not match"	)></option>
 </select>
 
-<input type="text" id="htext<?ITERATE:N>" name="htext<?ITERATE:N>" value="<?SIEVE:SCRIPT:HTEXT("X")>">	escputs(htext);
+<input type="text" id="htext<?ITERATE:N>" name="htext<?ITERATE:N>" value="<?SIEVE:SCRIPT:HTEXT("X")>">
 </div>
 
 <div id="div_nocompare<?ITERATE:N>"><?_("(All messages)")></div>
 
 <div id="div_size<?ITERATE:N>">
 <select id="sizecomp<?ITERATE:N>" name="sizecomp<?ITERATE:N>" size=1 onChange="UpdateRules();">
-<option <?%("COND:SIEVE:SIZECOMP", 1, 0, 0, #"larger", "selected", ""> value="larger"><?_("is larger than")></option>
-<option <?%("COND:SIEVE:SIZECOMP", 1, 0, 0, #"smaller", "selected", ""> value="smaler"><?_("is smaller than")></option>
+<option <?%("COND:SIEVE:SIZECOMP", 1, 0, #"larger", "selected", "")> value="larger"><?_("is larger than")></option>
+<option <?%("COND:SIEVE:SIZECOMP", 1, 0, #"smaller", "selected", "")> value="smaller"><?_("is smaller than")></option>
 </select>
-<input type="text" id="sizeval<?ITERATE:N>" name="sizeval<?ITERATE:N>" value="<?SIEVE:SCRIPT:SIZE>">
+<input type="text" id="sizeval<?ITERATE:N>" name="sizeval<?ITERATE:N>" value="<?SIEVE:SCRIPT:SIZE>"><?_("bytes")>
 </div>
 </td>
 
 <td width=20%>
 <select id="action<?ITERATE:N>" name="action<?ITERATE:N>" size=1 onChange="UpdateRules();">
-<option <?%("COND:SIEVE:ACTION", 1, 0, 0, #"keep",	"selected", "")>><?_("Keep")>		</option>
-<option <?%("COND:SIEVE:ACTION", 1, 0, 0, #"discard",	"selected", "")>><?_("Discard silently")></option>
-<option <?%("COND:SIEVE:ACTION", 1, 0, 0, #"reject",	"selected", "")>><?_("Reject")>		</option>
-<option <?%("COND:SIEVE:ACTION", 1, 0, 0, #"fileinto","selected", "")>><?_("Move message to")></option>
-<option <?%("COND:SIEVE:ACTION", 1, 0, 0, #"redirect","selected", "")>><?_("Forward to")>	</option>
-<option <?%("COND:SIEVE:ACTION", 1, 0, 0, #"vacation","selected", "")>><?_("Vacation")>	</option>
+<option <?%("COND:SIEVE:ACTION", 1, 0, #"keep",	"selected", "")> value="keep"><?_("Keep")>		</option>
+<option <?%("COND:SIEVE:ACTION", 1, 0, #"discard",	"selected", "")> value="discard"><?_("Discard silently")></option>
+<option <?%("COND:SIEVE:ACTION", 1, 0, #"reject",	"selected", "")> value="reject"><?_("Reject")>		</option>
+<option <?%("COND:SIEVE:ACTION", 1, 0, #"fileinto",	"selected", "")> value="fileinto"><?_("Move message to")></option>
+<option <?%("COND:SIEVE:ACTION", 1, 0, #"redirect",	"selected", "")> value="redirect"><?_("Forward to")>	</option>
+<option <?%("COND:SIEVE:ACTION", 1, 0, #"vacation",	"selected", "")> value="vacation"><?_("Vacation")>	</option>
 </select>
 
 <div id="div_fileinto<?ITERATE:N>">
@@ -89,7 +87,7 @@
 
 </td>
 
-<td width=10% align="center">< _("and then")></td>
+<td width=10% align="center"><?_("and then")></td>
 <td width=20%>
 <select name="final<?ITERATE:N>" id="final<?ITERATE:N>" size=1 onChange="UpdateRules();">
 <option <?%("COND:SIEVE:FINAL", 1, 0, 0, #"continue", "select", "")> value="continue"><?_("continue processing")></option>
@@ -97,4 +95,3 @@
 </select>
 </td>
 </tr>
-</table>
diff --git a/webcit/static/t/sieve/display_one_script.html b/webcit/static/t/sieve/display_one_script.html
index 658d75a02..3a2bb941c 100644
--- a/webcit/static/t/sieve/display_one_script.html
+++ b/webcit/static/t/sieve/display_one_script.html
@@ -1,3 +1,3 @@
-<div id="script_<?SIEVE:SCRIPT:NAME("U")>" style="display:none">
+<div id="script_<?SIEVE:SCRIPT:NAME('U')>" style="display:none">
 <textarea name="text_<?SIEVE:SCRIPT:NAME("U")>" wrap=soft rows=20 cols=80 width=80><?SIEVE:SCRIPT:CONTENT("X")></textarea>
 </div>
diff --git a/webcit/static/t/sieve/list.html b/webcit/static/t/sieve/list.html
index 9580165c3..154bfe69f 100644
--- a/webcit/static/t/sieve/list.html
+++ b/webcit/static/t/sieve/list.html
@@ -3,7 +3,7 @@
 <?--("iterate over an empty template, so we have the states already loaded for below")><?ITERATE("SIEVE:SCRIPTS", ="sieve_empty")>
 <script type="text/javascript">
 
-var previously_active_script;									
+var previously_active_script;
 
 function ToggleSievePanels() {
  d = ($('sieveform').bigaction.options[$('sieveform').bigaction.selectedIndex].value);
@@ -25,8 +25,7 @@ function ToggleScriptPanels() {
  $('script_' + d).style.display = 'block';
  previously_active_script = d;
 }
-</script>								
-<?ITERATE("SIEVE:RULE:EMPTY", ="sieve_display_one")>
+</script>
 
 
 <div id="banner">
@@ -59,12 +58,24 @@ function ToggleScriptPanels() {
 <div id="sievediv1" style="display:none">
 
 <?=("sieve_display")>
+
+<br><table cellpadding=2 width=100%>
+<?ITERATE("SIEVE:RULES", ="sieve_display_one")>
+</table>
+
+
+<br>
+
+<div id="div_addrule"><a href="javascript:AddRule();"><?_("Add rule")></a><br></div>
+<script type="text/javascript">UpdateRules();</script>
+</div>
+
 </div>
 <?--("The I am smart and can write my own Sieve scripts div ")>
 
 <div id="sievediv2" style="display:none">
 
-<?!("COND:BSTR", 1, "__SIEVE:RULESSCRIPT", 1)>
+<??("COND:BSTR", 1, "__SIEVE:RULESSCRIPT", 1)>
 <?_("The currently active script is: ")>
 <select name="active_script" size=1 onChange="ToggleScriptPanels();">
 <?ITERATE("SIEVE:SCRIPTS", ="sieve_list_select_one")>
@@ -73,10 +84,11 @@ function ToggleScriptPanels() {
 &nbsp;&nbsp;&nbsp;
 <a href="display_add_remove_scripts"><?_("Add or delete scripts")></a>
 <br>
-<?ITERATE("SIEVE:RULES", ="sieve_display_one_script")>
+<?ITERATE("SIEVE:SCRIPTS", ="sieve_display_one_script")>
 
 <??("X", 1)>
 
+
 <script type="text/javascript">ToggleScriptPanels();</script>
 </div>
 <?--("The rest of this is common for all panels... ")>
diff --git a/webcit/static/t/sieve/list_select_one.html b/webcit/static/t/sieve/list_select_one.html
index f546351aa..25e9eaffb 100644
--- a/webcit/static/t/sieve/list_select_one.html
+++ b/webcit/static/t/sieve/list_select_one.html
@@ -1 +1 @@
-<option <?%("COND:SIEVE:SCRIPT:ACTIVE" 1, 0, "selected", "")> value="<?SIEVE:SCRIPT:NAME("U")>"><?SIEVE:SCRIPT:NAME("X")></option>
+<option <?%("COND:SIEVE:SCRIPT:ACTIVE" 1, 0, 0, "selected", "")> value="<?SIEVE:SCRIPT:NAME("U")>"><?SIEVE:SCRIPT:NAME("X")></option>
diff --git a/webcit/static/t/sieve/roomlist.html b/webcit/static/t/sieve/roomlist.html
index 9479a5eef..e3714ce22 100644
--- a/webcit/static/t/sieve/roomlist.html
+++ b/webcit/static/t/sieve/roomlist.html
@@ -1 +1 @@
-<option <?%("COND:THIS:THAT:ROOM", 1, 0, 0, "checked", "")> value='<?ROOM:INFO:NAME("U")>' ><?ROOM:INFO:NAME("X")></select>
+<option <?%("COND:THIS:THAT:ROOM", 1, 0, 0, "checked", "")> value='<?ROOM:INFO:NAME("U")>' ><?ROOM:INFO:NAME("X")></option>
-- 
2.39.2