Changeset 197 for trunk/expressoMail1_2/js/filters.js

Timestamp:

03/05/08 08:46:58 (17 years ago)

Author:

niltonneto

Message:

Ticket #147: Revisão da internacionalização
Ticket #152: Melhoria no Fora de Escritório
Implementação da funcao write_msg com a opção de não apagar aviso.
Implementação da funcao clean_msg para limpar aviso.

File:

• trunk/expressoMail1_2/js/filters.js (modified) (4 diffs)

trunk/expressoMail1_2/js/filters.js

@@ -30 +30 @@
                 form_cont.style.display = "";                   
                 form_cont.style.position = "absolute";
-                form_cont.style.top = "0px";
+                form_cont.style.top = "10px";
                 form_cont.style.left = "600px";
                 form_cont.innerHTML = "";
@@ -91 +91 @@
                 list += "</div><br>";
                 // out office
-                if(filter.out_officeR.length == 0){
+                if(!filter.out_officeR){
                         list += "<img id='set_out_img' src='"+this.grp_close_img.src+"' border='0'>&nbsp;";
                         list += "<span><b>"+get_lang('out office') + " - ( 0 ) </b></span> " + "<a href='javascript:filters.n_out_office()'>" + get_lang("new rule") + "</a>";                  
                 }else{
                         list += "<img id='set_out_img' src='"+this.grp_open_img.src+"' onclick=filters.hidden(\"set_out\") border='0'>&nbsp;";
-                        list += "<span><b>"+get_lang('out office') + " - ( " + filter.out_officeR.length + " )</b></span>";
+                        list += "<span><b>"+get_lang('out office') + " - ( 1 )</b></span>";
                         list += "<div id='set_out'>";
                         list += "<input id='out_0' type='checkBox'><img id='set_out_form_email_img' src='"+this.for_email_img.src+"' border='0'>";
-                        list += " " + this.vl_outOffice(filter.out_officeR[0]) + " " ;
+                        list += " " + this.vl_outOffice(filter.out_officeR) + " " ;
                         list += "</div>";
                 }
@@ -107 +107 @@
         cfilterSh.prototype.vl_rule = function(rule,pos){
                 var aux = rule.split("&&");
-                return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"')><b>" + get_lang("Status") + " :</b>" + "<font color='red'>" + get_lang(aux[2]) + "</font>" + "- <b>" + get_lang("E-mail rule") + ":</b> " + aux[3] + " - <b>" + get_lang("Action") + ":</b> " + aux[6] + "</a>";
+                return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(aux[2]) + "</font>" + " - <b>" + get_lang("E-mail rule") + ":</b> " + aux[3] + " - <b>" + get_lang("Action") + ":</b> " + aux[6] + "</a>";
         }
         
-        cfilterSh.prototype.vl_outOffice = function(outOffice){
+        cfilterSh.prototype.vl_outOffice = function(outOffice){         
                 var aux = outOffice.split("&&");
-                return " <a href='javascript:void(0)' onclick=filter.form_out()><b>" + get_lang("Answer messages from") + " :</b>" + aux[2] + "- <b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + aux[4] + "</font>" + "- <b>" + get_lang("message") + ":</b> " + aux[3] + "</a>";
+                return get_lang("Rule") + " - <a href='javascript:void(0)' onclick=filter.form_out()> " + "<b>" + get_lang("Status") + " : </b><font color='red'>" + (aux[4] == "off" ? get_lang("Disabled") : get_lang("Enabled")) + "</font></a>";
         }
         
@@ -131 +131 @@
                 Element('form_buttons').style.display = 'none';
                 filter.ac_form = "new_out";     
-                var el2 = document.getElementById("select_2");
-                for(var i=0; i < filter.email_ld.length; i++){
-                        var opt = new Option(filter.email_ld[i],filter.email_ld[i],false,false);
-                        el2.options[el2.length] = opt;
-                }                       
-        }
+                }
 
         cfilterSh.prototype.hidden = function(el){