- Applied fixes from trunk up to r5479

4 files changed, 38 insertions, 9 deletions

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index d7ef8e561..05506120e 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,4 +1,5 @@
 - Fixed setting test type to :is when none is specified
+- Fixed javascript error in IE8
 
 * version 5.0-rc1 [2011-11-17]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index 1dad18d99..df9d3a79d 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -53,6 +53,31 @@ $labels['none'] = 'ninguno';
 $labels['fromset'] = 'de conjunto ';
 $labels['fromfile'] = 'de archivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
+$labels['filtermatches'] = 'coincide con la expresión';
+$labels['filternotmatches'] = 'no coincide con la expresión';
+$labels['filterregex'] = 'coincide con la expresión regular';
+$labels['filternotregex'] = 'no coincide con la expresión regular';
+$labels['vacationsubject'] = 'Asunto del Mensaje:';
+$labels['countisgreaterthan'] = 'contiene más que';
+$labels['countisgreaterthanequal'] = 'contiene más o igual que';
+$labels['countislessthan'] = 'contiene menos que';
+$labels['countislessthanequal'] = 'contiene menos o igual que';
+$labels['countequals'] = 'contiene igual que';
+$labels['countnotequals'] = 'contiene distinto que';
+$labels['valueisgreaterthan'] = 'el valor es mayor que';
+$labels['valueisgreaterthanequal'] = 'el valor es mayor o igual que';
+$labels['valueislessthan'] = 'el valor es menor que';
+$labels['valueislessthanequal'] = 'el valor es menor o igual que';
+$labels['valueequals'] = 'el valor es igual que';
+$labels['valuenotequals'] = 'el valor es distinto que';
+$labels['setflags'] = 'Etiquetar el mensaje';
+$labels['addflags'] = 'Agregar etiqueta al mensaje';
+$labels['removeflags'] = 'Eliminar etiquetas al mensaje';
+$labels['flagread'] = 'Leido';
+$labels['flagdeleted'] = 'Eliminado';
+$labels['flaganswered'] = 'Respondido';
+$labels['flagflagged'] = 'Marcado';
+$labels['flagdraft'] = 'Borrador';
 
 $messages = array();
 $messages['filterunknownerror'] = 'Error desconocido de servidor';
@@ -77,5 +102,6 @@ $messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Ha ocurri
 $messages['setcreated'] = 'Conjunto de filtros creado satisfactoriamente';
 $messages['emptyname'] = 'Imposible crear el conjunto de filtros. Sin nombre';
 $messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo'
+$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
 
 ?>
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index a7b15f7b5..a8bfaf203 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -290,8 +290,8 @@ rcube_webmail.prototype.managesieve_updatelist = function(action, o)
         td.innerHTML = el.name;
         td.className = 'name';
         tr.id = 'rcmrow' + el.id;
-        if (el.class)
-            tr.className = el.class
+        if (el['class'])
+            tr.className = el['class'];
         tr.appendChild(td);
 
         list.insert_row(tr);
@@ -721,13 +721,11 @@ rcube_webmail.prototype.managesieve_create = function()
 
     // load form in the iframe
     var frame = $('<iframe>').attr({src: url, frameborder: 0})
-    frame.height(dialog.height()); // temp. 
-    dialog.empty().append(frame);
-    dialog.dialog('dialog').resize();
+    dialog.empty().append(frame).dialog('dialog').resize();
 
     // Change [Next Step] button with [Save] button
     buttons = {};
-    buttons[rcmail.gettext('save')] = function() {  
+    buttons[rcmail.gettext('save')] = function() {
       var win = $('iframe', dialog).get(0).contentWindow;
       win.rcmail.managesieve_save();
     };
@@ -743,7 +741,8 @@ rcube_webmail.prototype.managesieve_create = function()
     close: function() { rcmail.managesieve_dialog_close(); },
     buttons: buttons,
     minWidth: 600,
-    minHeight: 300
+    minHeight: 300,
+    height: 250
   }).show();
 
   this.env.managesieve_dialog = dialog;
diff --git a/plugins/managesieve/skins/default/managesieve.css b/plugins/managesieve/skins/default/managesieve.css
index 0b82be6f3..60f632504 100644
--- a/plugins/managesieve/skins/default/managesieve.css
+++ b/plugins/managesieve/skins/default/managesieve.css
@@ -110,6 +110,7 @@ body.iframe
 #filter-form
 {
   min-width: 550px;
+  width: expression(Math.max(550, document.documentElement.clientWidth)+'px');
   white-space: nowrap;
   padding: 20px 10px 10px 10px;
 }
@@ -145,8 +146,8 @@ div.rulerow:hover, div.actionrow:hover
 div.rulerow table, div.actionrow table
 {
   padding: 0px;
-  width: 100%;
-  min-width: 620px;
+  min-width: 600px;
+  width: expression(Math.max(600, document.documentElement.clientWidth)+'px');
 }
 
 td
@@ -189,6 +190,7 @@ td.rowactions
 {
   white-space: nowrap;
   width: 1%;
+  padding-top: 2px;
 }
 
 td.rowtargets
@@ -196,6 +198,7 @@ td.rowtargets
   white-space: nowrap;
   width: 98%;
   padding-left: 3px;
+  padding-top: 2px;
 }
 
 td.rowtargets div.adv