Changeset 3026 for branches/2.2/expressoMail1_2/js/filter.js

Timestamp:

07/09/10 16:11:09 (14 years ago)

Author:

amuller

Message:

Ticket #1109 - Refazendo a tela de filtros do ExpressoMail1_2

File:

• branches/2.2/expressoMail1_2/js/filter.js (modified) (3 diffs)

branches/2.2/expressoMail1_2/js/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');
+                cb2 = Element('checkBox2');
                 field6 = Element('field6');
-                cb2 = Element('checkBox2');
 
                 if (cb2.checked)
                 {
                         radio3.disabled = true;
+                        radio4.disabled = true;
                         field6.disabled = true;
 
@@ -295 +297 @@
                 {
                         radio3.disabled = false;
+                        radio4.disabled = true;
                         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>"+
-                                                "</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><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 width='50%'><input type='radio' id='radio1' name='radio' value='folder'>"+get_lang('Store at')+".:</td>"+
+                                                 "<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>"+
                                                 "</tr><tr><td width='50%'><input type='radio' id='radio2' name='radio' value='address'>"+get_lang('Forward to the address')+".:</td>"+