Changeset 2955 for trunk

Timestamp:

06/18/10 11:45:28 (14 years ago)

Author:

amuller

Message:

Ticket #1109 - Refaz a tela de regras com melhorias na visualização

Location:

trunk/expressoMail1_2/js/jscode

Files:

• filter.js (modified) (4 diffs)
• filters.js (modified) (1 diff)

trunk/expressoMail1_2/js/jscode/filter.js

@@ -276 +276 @@
          * quando a caixa de seleção para manter o e-mail na caixa de entrada do usuário for selecionada
          */
-        cfilter.prototype.disable_radio3 =  function()
-        {
+        cfilter.prototype.disable_radio =  function()
+        {
+                radio4 = Element('radio4');
                 radio3 = Element('radio3');
-                field6 = Element('field6');
                 cb2 = Element('checkBox2');
+                field6 = Element('field6')
 
                 if (cb2.checked)
                 {
                         radio3.disabled = true;
+                        radio4.disabled = true;
                         field6.disabled = true;
 
@@ -295 +297 @@
                 {
                         radio3.disabled = false;
+                        radio4.disabled = false;
                         field6.disabled = false;
                 }
@@ -304 +307 @@
                          var form = "";
                                  form = "<div id='div_rule' style='display:none'><table id='table_rule' border='0' cellpading='0' cellspacing='0' width='100%'>"+
-                                                "<tr><td colspan='2'><input type='checkBox' id='checkBox1' name='checkb'>"+get_lang('Also check message against next rule') + "</td></tr>"+
-                                                "<tr><td colspan='2'><input type='checkBox' id='checkBox2' onclick='filter.disable_radio3();' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
-                                                "<tr><td colspan='2'><hr size='1' width='100%'></td></tr><tr>"+
-                                                "<td rowspan='4' width='20%'>"+get_lang('Coincident')+"<br><select id='select_rules' name='select_rules'>"+
-                                                "<option value='0'>"+get_lang("with all")+"</option><option value='1'>"+get_lang("with some")+"</option>"+
+/*                                              "<tr><td colspan='2'><input type='checkBox' id='checkBox1' name='checkb'>"+get_lang('Also check message against next rule') + "</td></tr>"+*/
+                                                "<tr><td colspan='2'><b>"+get_lang("Criteria")+":</b></td></tr><tr>"+
+                                                "<td rowspan='4' width='20%'>"+get_lang('Find items')+":<br><select id='select_rules' name='select_rules'>"+
+                                                "<option value='1'>"+get_lang("If any criterion is met")+"</option><option value='0'>"+get_lang("If all criteria is met")+"</option>"+
                                                 "</select></td><td>"+get_lang('The field \"%1\" of the message it contains',get_lang('From'))+".: <input type='text' id='field1' name='field1' size='35' maxlength='200'></td>"+
                                                 "</tr><tr><td>"+get_lang('The field \"%1\" of the message it contains', get_lang('To'))+".: <input type='text' id='field2' name='field2' size='35' maxlength='200'></td>"+
                                                 "</tr><tr><td>"+get_lang('The field \"%1\" of the message it contains', get_lang('Subject'))+".: <input type='text' id='field3' name='field3' size='35' maxlength='200'></td>"+
                                                 "</tr><tr><td>"+get_lang('The size of the message is')+".: &nbsp<select id='select_size' name='select_size'>"+
-                                                "<option value='0'>"+get_lang("Less than")+"</option><option value='1'>"+get_lang("Greater than")+"</option>"+                                           
+                                                "<option value='1'>"+get_lang("Greater than")+"</option><option value='0'>"+get_lang("Less than")+"</option>"+                                           
                                                 "</select>&nbsp;<input type='text' id='field4' name='field4' size='8' maxlength='8'> Kb</td>"+
-                                                "</tr><tr><td colspan='2'><hr size='1' width='100%'></td></tr>"+
+                                                "</tr><tr><td colspan='2'><hr size='1' width='100%'><b>"+get_lang("Action")+":</b></td></tr>"+
                                                 "</table><table id='table_rule1' border='0' cellpading='0' cellspacing='0' width='100%'>"+
+                                                "<tr><td colspan='2'><input type='checkBox' id='checkBox2' onclick='filter.disable_radio();' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
+
                                                 "<tr><td width='50%'><input type='radio' id='radio1' name='radio' value='folder'>"+get_lang('Store at')+".:</td>"+
                                                 "<td width='50%'><select id='select_mailboxes' name='select_mailboxes'></select></td>"+
@@ -324 +328 @@
                                                 "<td width='50%'><textarea id='field6' onkeypress='return charCounter(this);' name='field6' rows='3' cols='25'></textarea></td>"+
                                                 "</tr><tr><td colspan='2'><input type='radio' id='radio4' name='radio' value='discard'>"+get_lang('Erase the message')+"</td>"+
+
                                                 "</tr></table></div><div id='div_vacation' style='display:none'>"+
                                                 "<table id='table_vacation' border='0' cellpading='0' cellspacing='0' width='100%'>"+

trunk/expressoMail1_2/js/jscode/filters.js

@@ -150 +150 @@
                 if(type == 'voip')
                         return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','voip')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - " + fields[3] + " <b>" + get_lang("Subject") + ":</b> " + fields[5] + "</a>";
-                else
-                        return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("E-mail rule") + ":</b> " + fields[3] + " - <b>" + get_lang("Action") + ":</b> " + fields[6] + "</a>";
+                else{
+
+                        var _criteria = " ";
+                        if (fields[3].length > 0)
+                                _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3];
+                        if (fields[4].length > 0)
+                                _criteria += "<b>"+get_lang("is to")+"</b>:"+fields[4];
+                        if (fields[5].length > 0)
+                                _criteria += "<b>"+get_lang("subject is")+"</b>:"+fields[5];
+                        if (parseInt(fields[11]) > 0)
+                        {
+                                if(fields[8] == "2")
+                                        _criteria += "<b>"+get_lang("size is over than")+"</b>:"+fields[11];
+                                else
+                                        _criteria += "<b>"+get_lang("size is under than")+"</b>:"+fields[11];
+                        }
+                        var _action = " ";
+                        if (fields[6] == 'folder')
+                                _action = get_lang("Store at")+" "+(fields[7].split("/"))[1];
+                        else
+                                _action = get_lang(fields[6]);
+
+                        return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("if email") + " </b>" + _criteria + " - <b>" + get_lang("Action") + ":</b> " + _action + "</a>";
+                }
         }