Changeset 6387 for trunk

Timestamp:

06/01/12 17:53:57 (12 years ago)

Author:

natan

Message:

Ticket #2828 - Melhoria na busca de mensagens - Corrigido

Location:

trunk/prototype/modules/filters

Files:

• edit-filter.ejs (modified) (1 diff)
• filters.css (modified) (1 diff)
• filters.js (modified) (2 diffs)

trunk/prototype/modules/filters/edit-filter.ejs

@@ -167 +167 @@
                 <div>
                         <fieldset>
-                                <table class="hidden fields-search-messages-grid" id="fields-search-messages-grid"><tr><td/></tr></table>
-                                <div class="hidden fields-search-messages-grid-pager" id="fields-search-messages-grid-pager"></div>
+                                <div id="filtergrid-container" class="empty-container">
+                                        <span class="message"><%= 'nenhuma mensagem pesquisada' %></span>
+                                </div>
                                 <fieldset class="fields-search-messages" style="border: none;">
                                         <span class="button ui-button-text-only search menu-container"><%= get_lang("Search Inbox")%></span>

trunk/prototype/modules/filters/filters.css

@@ -37 +37 @@
 /*      height: 18px;*/
 }
+
+#filtergrid-container { width:645px;/*height:240px;*/ margin:5px 0px 5px 0px; float:left; overflow:auto; }
 
 .rule-list .rule .rule-briefing { max-width:  500px; }

trunk/prototype/modules/filters/filters.js

@@ -367 +367 @@
         }
         showGridButton = thiss.parent();
+//      .html('buscando mensagens...');
+        showGridButton.siblings("#filtergrid-container").block({  
+                                                        message: '<div id="loading-content"><div class="image"></div></div>',  
+                                                        css: {  
+                                                                backgroundImage: 'url('+BASE_PATH+'modules/attach_message/images/loading.gif)',  
+                                                                backgroundRepeat: 'no-repeat', 
+                                                                backgroundPosition: 'center', 
+                                                                backgroundColor: 'transparent', 
+                                                                width: '32px', 
+                                                                height: '32px', 
+                                                                border:'none'  
+                                                        }, 
+                                                        overlayCSS: {  
+                                                                backgroundColor: '#CCC',  
+                                                                opacity:         0.5 
+                                                        }  
+                                                }); 
+
         $.ajax({  
                 url: DataLayer.basePath + 'folder/INBOX/message&' +  $.param( {"filter": criterias_} ),
@@ -379 +397 @@
                                 //return;
                         }
-                        grid = showGridButton.siblings(".fields-search-messages-grid, .fields-search-messages-grid-pager")
-                        .removeClass('hidden').filter(".fields-search-messages-grid").trigger( 'reloadGrid' ).jqGrid({
+                        grid = showGridButton.siblings("#filtergrid-container").removeClass('empty-container')
+                        .html('<table class="hidden fields-search-messages-grid" id="fields-search-messages-grid"><tr><td/></tr></table><div class="hidden fields-search-messages-grid-pager" id="fields-search-messages-grid-pager"></div>')
+                        .children(".fields-search-messages-grid, .fields-search-messages-grid-pager").removeClass('hidden').filter(".fields-search-messages-grid").trigger( 'reloadGrid' ).jqGrid({
                                 //url: DataLayer.basePath + 'folder/INBOX/message&' +  $.param( {"filter": [ "msgNumber", "IN", data ]} ),
                                 url: DataLayer.basePath + 'folder/INBOX/message&' +  $.param( parametro ),