From: Art Cancro <ajc@uncensored.citadel.org>
Date: Sat, 3 Mar 2012 20:29:19 +0000 (-0500)
Subject: Flipped a conditional that was causing the sieve script panel to not display, there... 
X-Git-Tag: v8.11~147
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=41b5b31698839858a5ac650fbdd2f76e84e5866e;p=citadel.git

Flipped a conditional that was causing the sieve script panel to not display, there is no way this was tested when it was templatized. Still some other problems I'm figuring out now...
---

diff --git a/webcit/static/t/sieve/list.html b/webcit/static/t/sieve/list.html
index f393d3d7c..068774e0a 100644
--- a/webcit/static/t/sieve/list.html
+++ b/webcit/static/t/sieve/list.html
@@ -27,7 +27,6 @@
 	}
 </script>
 
-
 <div id="banner">
 	<img src="static/webcit_icons/essen/32x32/config.png">
 	<h1><?_("View/edit server-side mail filters")></h1>
@@ -39,7 +38,6 @@
     <tr><td valign="top"><form id="sieveform" method="post" action="save_sieve">
 	<input type="hidden" name="nonce" value="<?NONCE>">
 
-<?--("The no filtering div")>
 	<?_("When new mail arrives: ")>
 	<select name="bigaction" size=1 onChange="ToggleSievePanels();">
  	  <option <?%("COND:BSTR", 1, "__SIEVE:RULESSCRIPT", 1, "", "selected")> value="0"><?_("Leave it in my inbox without filtering")></option>
@@ -47,6 +45,7 @@
  	  <option <?%("COND:BSTR", 1, "__SIEVE:EXTERNAL_SCRIPT", 1, "selected", "")> value="2"><?_("Filter it through a manually edited script (advanced users only)")></option>
 	</select>
 
+<?--("The no filtering div")>
 	<div id="sievediv0" style="display:none">
 		<div align="center">
 	    		<br><br>
@@ -66,11 +65,9 @@
 		<script type="text/javascript">UpdateRules();</script>
 	</div>
 
-</div> <!-- one closing div too many? --the_mgt -->
-
-<?--("The I am smart and can write my own Sieve scripts 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:EXTERNALSCRIPT", 1)>
 			<?_("The currently active script is: ")>
 			<select name="active_script" size=1 onChange="ToggleScriptPanels();">
 				<?ITERATE("SIEVE:SCRIPTS", ="sieve_list_select_one")>
@@ -81,7 +78,7 @@
 			<?ITERATE("SIEVE:SCRIPTS", ="sieve_display_one_script")>
 		<??("X", 1)>
 		<script type="text/javascript">ToggleScriptPanels();</script>
-     </div>
+	</div>
 
 <?--("The rest of this is common for all panels... ")>
 	<div align="center"><br>