Changeset 4943 for branches

Timestamp:

08/17/11 15:36:20 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #2197 - Sumiram algumas opções no rodapé ao abrir um e-mail.

Location:

branches/2.2/expressoMail1_2/js

Files:

• abas.js (modified) (3 diffs)
• search.js (modified) (3 diffs)

branches/2.2/expressoMail1_2/js/abas.js

@@ -45 +45 @@
                         for (i = 0; i < spans_search.length; i++){
                                 span_search = spans_search[i];
-                                span_search.className == 'message_options_export'?span_search.style.display = (openTab.type[ID] == 0 ? '' : 'none'):'';
+                                span_search.className == 'message_options_export'?span_search.style.display = (openTab.type[ID] != 1 ? '' : 'none'):'';
                                 span_search.className == 'message_options_import'?span_search.style.display = (openTab.type[ID] == 0 ? '' : 'none'):'';
                                 (span_search.title  == get_lang("Archive") || span_search.title == get_lang("Unarchive"))?span_search.style.display = (openTab.type[ID] == 0 ? '' : 'none'):'';
@@ -135 +135 @@
 }
 
-function create_border(borderTitle, id_value)
-{
-        if (borderTitle == get_lang("Server Results"))
-                id_value = "search_" + parseInt(BordersArray.length-1) + 1;
+function create_border(borderTitle, id_value, border_type)
+{
         borderTitle = ( ( borderTitle && borderTitle.constructor == String && borderTitle.length > 0 ) ? borderTitle : '&nbsp;' );
 
@@ -210 +208 @@
 
         Element("exmail_main_body").insertBefore(div,Element("footer_menu"));
+        
+        if(border_type)
+                openTab.type[ID] = border_type;
         alternate_border(ID);
         return ID;

branches/2.2/expressoMail1_2/js/search.js

@@ -375 +375 @@
                 numBox++;
 
-                if( Data['data'] )
-                        var border_id = create_border(get_lang("Server Results"), "search_" + numBox);
+                if( Data['data'] )
+                        var border_id = create_border(get_lang("Server Results"), "search_" + numBox,1);
                 
                 if( Data['data_gears'])
-                        var border_id = create_border(get_lang("Local Results"), "search_local_msg" + numBox);
+                        var border_id = create_border(get_lang("Local Results"), "search_local_msg" + numBox,1);
                         
                 if (!border_id)
@@ -387 +387 @@
         openTab.content_id[currentTab] = Element('content_id_search_' + numBox);
         openTab.type[currentTab] = 1;
-        
+                                   
                 var table = document.createElement("TABLE");
                         table.id    = "table_resultsearch_" + numBox;
@@ -1066 +1066 @@
                                 }
                         }
+                        
+                        var footer_menu = Element("footer_menu");       
+        if (footer_menu) {
+                footer_menu.style.display = (openTab.type[ID] != 4 ? '' : 'none');
+        
+                var options_search = Element('span_options');
+                if (options_search){
+                        var spans_search = options_search.getElementsByTagName("span");
+                        var span_search;
+                        
+                        //alert(openTab.type[ID]);
+                        for (i = 0; i < spans_search.length; i++){
+                                span_search = spans_search[i];
+                                span_search.className == 'message_options_export'?span_search.style.display = (openTab.type[ID] != 1 ? '' : 'none'):'';
+                                span_search.className == 'message_options_import'?span_search.style.display = (openTab.type[ID] == 0 ? '' : 'none'):'';
+                                (span_search.title == get_lang("Archive") || span_search.title == get_lang("Unarchive"))?span_search.style.display = (openTab.type[ID] == 0 ? '' : 'none'):'';
+                
+                        }
+                        
+                }
+
+        }
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
                 }