Changeset 6335 for sandbox/2.4.1-3

Timestamp:

05/29/12 09:25:20 (12 years ago)

Author:

douglasz

Message:

Ticket #2768 - Melhorias na inserção de destinatário.

Location:

sandbox/2.4.1-3/expressoMail1_2

Files:

• js/draw_api.js (modified) (3 diffs)
• templates/default/images/contato_pessoal.png (added)
• templates/default/images/contato_recente.png (added)
• templates/default/images/linha.png (added)
• templates/default/listContacts.ejs (modified) (1 diff)
• templates/default/main.css (modified) (1 diff)

sandbox/2.4.1-3/expressoMail1_2/js/draw_api.js

@@ -3780 +3780 @@
                 var dynamicContactList = new Array();
                 var myArray = contacts.split(",");
+                //Variavel de teste...Remover depois...
+                var flag = true;
                 for(var i in myArray){
                         var dynamicContact = myArray[i].split(";");
-                        if(dynamicContact.length > 1)
+                                                
+                        /* if(dynamicContact.length > 1)
                                 dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1])});
                         else
-                                dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0]});
+                                dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0]}); */
+                                
+                        //Verificar outro modo para criar a divisão dos contatos dinâmicos
+                        if( i <(myArray.length / 2)){
+                                var type = 'recente';
+
+                                if(dynamicContact.length > 1)
+                                        dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1]), type:type });
+                                else
+                                        dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0], type:type});
+                        
+                        }else{
+                                var type = 'pessoal';
+
+                                if(flag){
+                                        dynamicContactList.push({name : "", email: "", value :"", type:"linha"});
+                                        flag = false;
+                                }
+                                
+                                if(dynamicContact.length > 1)
+                                        dynamicContactList.push({name : dynamicContact[0], email: dynamicContact[1], value : (dynamicContact[0] +" - "+dynamicContact[1]), type:type });
+                                else
+                                        dynamicContactList.push({name : "", email: dynamicContact[0], value :dynamicContact[0], type:type});
+                        }       
                 }
                 
@@ -3811 +3837 @@
                 //MONTAGEM DA LISTA DE CONTATOS DINÂMICOS DO AUTO COMPLETE
                 .data( "autocomplete" )._renderItem = function( ul, item ) {
-                        ul.css({"min-width":"20%", "max-height" : "150px", "overflow-y" : "auto"});
+                        ul.css({"min-width":"280px", "width":"50%", "max-height" : "180px", "overflow-y" : "auto"});
                         if( $(ul).find("li").length > 10 ){
                                 return;
@@ -3823 +3849 @@
                                 text: false
                         }).click(function(){
-                                alert("Excluir?")
+                                var removeLi = $(this).parents("li:first");
+                                $.Zebra_Dialog('Deseja remover este contato?', {
+                                                'type':     'question',
+                                                'custom_class': (is_ie ? 'configure-zebra-dialog' : ''),
+                                                'title':    'Atenção',
+                                                'buttons': ['Sim','Não'],               
+                                                'overlay_opacity': '0.5',
+                                                'onClose':  function(caption) {
+                                                        if(caption == 'Sim')
+                                                                $(removeLi).remove();
+                                                }
+                                });
                         });
                 };

sandbox/2.4.1-3/expressoMail1_2/templates/default/listContacts.ejs

@@ -1 @@
-<li >
-        <img style="position:relative; top:2px; "src="templates/default/images/user_add.png" title="Contatos recentes" />
+
+<%if (data.type == 'linha'){%>
+<li>
+        <div class="line-separator">
+                &nbsp;
+        </div>
+<%}else{%>
+<li>
+        <img style="position:relative; top:2px; "src="templates/default/images/<%=data.type == 'pessoal' ? 'contato_pessoal' : 'contato_recente'%>.png" title="Contato <%=data.type == 'pessoal' ? data.type : 'recente'%>"/>
         <a style="width:80%; display: inline-block;"><%= data.name %> - <%= data.email %></a>
-        <span style="width:16px; height:16px; top:5px;">Excluir contato recente</span>
-<li>
- 
+        <span style="width:16px; height:16px; top:5px; <%=data.type == 'pessoal' ? 'display:none' : ''%>">Excluir contato recente</span>        
+<%}%>
+</li>

sandbox/2.4.1-3/expressoMail1_2/templates/default/main.css

@@ -1321 +1321 @@
         background-repeat : no-repeat !important;
 }
+
+.line-separator{
+        background: url(images/linha.png) repeat-x 0 96% ;
+}