Changeset 5751 for trunk

Timestamp:

03/19/12 16:28:51 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #673 - Novas dialogs com Jquery para o novo visual do expresso ( com EJS ).

Location:

trunk/expressoMail1_2

Files:

• js/search.js (modified) (3 diffs)
• templates/default/searchMails.ejs (added)
• templates/xsl/searchMails.xsl (deleted)

trunk/expressoMail1_2/js/search.js

@@ -1 +1 @@
         function searchE()
         {
-                this.totalPages = 1; 
-                this.numPages = 5; 
-                this.lastPage = 0; 
-                this.searchW            = [];
-                this.condition          = "";
-                this.sort_type          = "";
-                this.name_box_search = "";
-                this.all_boxes          = [];
-                this.type                       = "";
-                this.txtfields          = new Array("txt_ass","txt_de","txt_body","txt_para","txt_cc","txt_cco", "since_date", "before_date", "on_date");
-                this.selectFields       = new Array("flagged", "seen", "answered", "recent");
-                this.xtools             = new xtools('../expressoMail1_2/templates/');
-                this.divElement         = null;
-                this.elementChecked = false;
+                this.totalPages                 = 1; 
+                this.numPages                   = 5; 
+                this.lastPage                   = 0; 
+                this.searchW                    = [];
+                this.condition                  = "";
+                this.sort_type                  = "";
+                this.name_box_search    = "";
+                this.all_boxes                  = [];
+                this.type                               = "";
+                this.txtfields                  = new Array("txt_ass","txt_de","txt_body","txt_para","txt_cc","txt_cco", "since_date", "before_date", "on_date");
+                this.selectFields               = new Array("flagged", "seen", "answered", "recent");
+                this.divElement                 = null;
+                this.elementChecked     = false;
         }
         
@@ -24 +23 @@
                         if (Element("check_all_msg"))   
                                 Element("check_all_msg").checked = true;
-                        /*flag de controle. Evita o acesso ao elemento "check_all_msg" que será inserido no documento 
-                         * apenas quando o template for carregado
+                        
+                   /* flag de controle. Evita o acesso ao elemento "check_all_msg" que será inserido no documento 
+                        * apenas quando o template for carregado
                         */
+                        
                         this.elementChecked = true;     
                         EsearchE.all_mailboxes();
@@ -33 +34 @@
                 else
                 {
-                
-                        var div  = null;
-                        var args = null;
+                        var div         = document.createElement("div");
+                        var args        = null;
         
                         args = 
                         {
-                                'button_left'                   : "<<",
-                                'button_right'                  : ">>",
+                                "button_left"                           : "<<",
+                                "button_right"                          : ">>",
                                 "Inform_your_search_in_the_text_fields" : get_lang('Inform your search in the text fields'),
-                                "From"                                  : get_lang('From'),
-                                "To"                                    : get_lang('To'),
-                                "Cc"                                    : get_lang('Cc'),
-                                "Subject"                               : get_lang('Subject'),
-                                "Message_body"                  : get_lang('Message body'),
-                                "Since_Date"                    : get_lang('Since Date'),
-                                "Before_Date"                   : get_lang('Before Date'),
-                                "On_Date"                               : get_lang('On Date'),
-                                "Flags"                                 : get_lang('Flags'),
-                                "Flagged"                               : get_lang('Flagged'),
-                                "Unflagged"                     : get_lang('Unflagged'),
-                                "Seen"                                  : get_lang('Seen'),
-                                "Unseen"                                : get_lang('Unseen'),
-                                "Answered_Forwarded"    : get_lang('Answered/Forwarded'),
+                                "From"                                          : get_lang('From'),
+                                "To"                                            : get_lang('To'),
+                                "Cc"                                            : get_lang('Cc'),
+                                "Subject"                                       : get_lang('Subject'),
+                                "Message_body"                          : get_lang('Message body'),
+                                "Since_Date"                            : get_lang('Since Date'),
+                                "Before_Date"                           : get_lang('Before Date'),
+                                "On_Date"                                       : get_lang('On Date'),
+                                "Flags"                                         : get_lang('Flags'),
+                                "Flagged"                                       : get_lang('Flagged'),
+                                "Unflagged"                             : get_lang('Unflagged'),
+                                "Seen"                                          : get_lang('Seen'),
+                                "Unseen"                                        : get_lang('Unseen'),
+                                "Answered_Forwarded"            : get_lang('Answered/Forwarded'),
                                 "Unanswered_Unforwarded"        : get_lang('Unanswered/Unforwarded'),
                                 "Recent"                                        : get_lang('Recent'),
                                 "Old"                                           : get_lang('Old'),
                                 "Search_the_messages_in_these_folders" : get_lang('Search the messages in these folders'),
-                                "In_all_the_folders"    : get_lang('In all the folders')
+                                "In_all_the_folders"            : get_lang('In all the folders')
                         }
                         
-                        div                                     = document.createElement("div");
-                        div.innerHTML           = this.xtools.parse(this.xtools.xml('searchMails'), 'searchMails.xsl', args );
+                        $(div).html(DataLayer.render("./templates/default/searchMails.ejs", args ));
                         div.setAttribute( "style","overflow:hidden");
-        
+                        
                         $(div).dialog(
                         {