- Fixed disabling rules with many tests

- Small css unification with core


git-svn-id: https://svn.roundcube.net/trunk@3398 208e9e7b-5314-0410-a742-e7e81cd9613c

5 files changed, 7 insertions, 8 deletions

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index c84a49512..3936be910 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,6 @@
+- Fixed disabling rules with many tests
+- Small css unification with core
+
 * version 2.3 [2010-03-18]
 -----------------------------------------------------------
 - Added import from Horde-INGO
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php
index 649967f57..1ad887a97 100644
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ b/plugins/managesieve/lib/rcube_sieve.php
@@ -467,7 +467,7 @@ class rcube_sieve_script
             $script .= 'if' . ($rule['disabled'] ? ' false #' : '');
 	    $script .= $rule['join'] ? ' allof (' : ' anyof (';
 	    if (sizeof($tests) > 1)
-	        $script .= implode(",\n\t", $tests);
+	        $script .= implode(", ", $tests);
 	    else if (sizeof($tests))
 	        $script .= $tests[0];
 	    else
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/default/managesieve.css
index 9f72e4a62..3d8f530a1 100644
--- a/plugins/managesieve/skins/default/managesieve.css
+++ b/plugins/managesieve/skins/default/managesieve.css
@@ -8,7 +8,6 @@
   top: 120px;
   bottom: 30px;
   border: 1px solid #999999;
-  background-color: #F9F9F9;
   overflow: auto;
   /* css hack for IE */
   height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
@@ -154,13 +153,11 @@
 
 #filter-frame
 {
-  background-color: #F9F9F9;
   border: none;
 }
 
 body.iframe
 {
-  background-color: #F9F9F9;
   min-width: 740px;
   width: expression(Math.max(740, document.documentElement.clientWidth)+'px');
 }
@@ -169,7 +166,6 @@ body.iframe
 {
   min-width: 650px;
   white-space: nowrap;
-  background-color: #F9F9F9;
   padding: 20px 10px 10px 10px;
 }
 
@@ -202,7 +198,7 @@ div.rulerow:hover, div.actionrow:hover
 {
   padding: 2px;
   white-space: nowrap;
-  background: #F2F2F2;
+  background: #F6F6F6;
   border: 1px solid silver;
 }
 
diff --git a/plugins/managesieve/skins/default/templates/filteredit.html b/plugins/managesieve/skins/default/templates/filteredit.html
index 81c6e6bc6..881fd4f81 100644
--- a/plugins/managesieve/skins/default/templates/filteredit.html
+++ b/plugins/managesieve/skins/default/templates/filteredit.html
@@ -96,7 +96,7 @@ function rule_join_radio(value)
 
 <div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.filterdef" /></div>
 
-<div id="filter-form">
+<div id="filter-form" class="boxcontent">
 <roundcube:object name="filterform" />
 
 <div id="footer">
diff --git a/plugins/managesieve/skins/default/templates/setedit.html b/plugins/managesieve/skins/default/templates/setedit.html
index 343fe4e63..26f7fece6 100644
--- a/plugins/managesieve/skins/default/templates/setedit.html
+++ b/plugins/managesieve/skins/default/templates/setedit.html
@@ -9,7 +9,7 @@
 
 <div id="filter-title" class="boxtitle"><roundcube:label name="managesieve.newfilterset" /></div>
 
-<div id="filter-form">
+<div id="filter-form" class="boxcontent">
 <roundcube:object name="filtersetform" />
 
 <p>