- Timestamp:
- 02/29/12 15:35:16 (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/doiMenuData.js
r5584 r5586 208 208 menuItems[labeleds[i].label.id] = labeleds[i].label; 209 209 } else { 210 //não existem labels 210 $('#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first') 211 .html(''); 212 $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first'); 211 213 return false; 212 214 } 213 215 } 214 215 216 if(current_folder == msg_folder || !current_folder){ 216 217 $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number); -
trunk/expressoMail1_2/js/draw_api.js
r5584 r5586 1640 1640 if (headers_msgs.labels) { 1641 1641 td_element27.innerHTML = '<img src="../prototype/modules/mail/img/tag.png">'; 1642 updateLabelsColumn(headers_msgs) 1642 updateLabelsColumn(headers_msgs); 1643 1643 } 1644 1644 … … 3627 3627 if ((e.keyCode) == 120) //F9 3628 3628 { 3629 emQuickSearch(input_replyto.value, 'replyto', ID );3629 emQuickSearch(input_replyto.value, 'replyto', ID, undefined, true); 3630 3630 } 3631 3631 else … … 3653 3653 if ((window.event.keyCode) == 120) //F9 3654 3654 { 3655 emQuickSearch(input_replyto.value, 'replyto', ID );3655 emQuickSearch(input_replyto.value, 'replyto', ID, undefined, true); 3656 3656 } 3657 3657 else … … 3694 3694 if ((e.keyCode) == 120) //F9 3695 3695 { 3696 emQuickSearch(input_to.value, 'to', ID );3696 emQuickSearch(input_to.value, 'to', ID, undefined, true); 3697 3697 } 3698 3698 else … … 3720 3720 if ((window.event.keyCode) == 120) //F9 3721 3721 { 3722 emQuickSearch(input_to.value, 'to', ID );3722 emQuickSearch(input_to.value, 'to', ID, undefined, true); 3723 3723 } 3724 3724 else … … 3777 3777 if ((e.keyCode) == 120) //F9 3778 3778 { 3779 emQuickSearch(input_cc.value, 'cc', ID );3779 emQuickSearch(input_cc.value, 'cc', ID, undefined, true); 3780 3780 } 3781 3781 else … … 3803 3803 if ((window.event.keyCode) == 120) //F9 3804 3804 { 3805 emQuickSearch(input_cc.value, 'cc', ID );3805 emQuickSearch(input_cc.value, 'cc', ID, undefined, true); 3806 3806 } 3807 3807 else … … 3849 3849 if ((e.keyCode) == 120) //F9 3850 3850 { 3851 emQuickSearch(input_cco.value, 'cco', ID );3851 emQuickSearch(input_cco.value, 'cco', ID, undefined, true); 3852 3852 } 3853 3853 else … … 3874 3874 if ((window.event.keyCode) == 120) //F9 3875 3875 { 3876 emQuickSearch(input_cco.value, 'cco', ID );3876 emQuickSearch(input_cco.value, 'cco', ID, undefined, true); 3877 3877 } 3878 3878 else -
trunk/expressoMail1_2/setup/phpgw_pt-br.lang
r5563 r5586 776 776 Delete/move subfolders first expressoMail1_2 pt-br Delete/mova suas subpastas primeiro 777 777 My Labels expressoMail1_2 pt-br Meus marcadores 778 Label None expressoMail1_2 pt-br Nenhum marcador cadastrado778 No labels found. expressoMail1_2 pt-br Nenhum marcador encontrado 779 779 Close expressoMail1_2 pt-br Fechar 780 780 Basic expressoMail1_2 pt-br Básico -
trunk/prototype/modules/mail/js/label.js
r5573 r5586 66 66 } 67 67 68 function updateMessageLabels(idLabel){ 69 var msgsReference = DataLayer.get('labeled', {filter: ['=', 'labelId', ''+idLabel]}, true); 70 for(var i = 0; i < msgsReference.length; i++){ 71 updateLabelsColumn({msg_number: msgsReference[i].messageNumber, boxname: msgsReference[i].folderName}); 72 } 73 } 74 68 75 function confirmDelete(id){ 69 76 $.Zebra_Dialog('<strong>Deseja excluir esse marcador?</strong>', { 70 77 'type': 'question', 71 78 'title': 'Atenção', 72 'buttons': ['Sim','Não'], 79 'buttons': ['Sim','Não'], 80 'overlay_opacity': '0.5', 73 81 'onClose': function(caption) { 74 82 if(caption == 'Sim'){ … … 125 133 126 134 draw_tree_labels(); 135 updateMessageLabels(labelEdited.id); 127 136 128 137 /** … … 154 163 } 155 164 }); 165 156 166 DataLayer.remove('label', id); 157 DataLayer.commit(); 167 DataLayer.commit(false, false, function(data){ 168 $.contextMenu( 'destroy', ".table_box tbody tr"); 169 loadMenu(); 170 updateMessageLabels(id); 171 }); 158 172 winElement.find(".label-list li:first").trigger("click"); 159 173 160 174 if($(".label-list li").length == 0){ 161 winElement.find(".label-list-container").html('<ul class="label-list"><li class="empty-item">'+get_lang("No labels found ")+'.</li></ul>');175 winElement.find(".label-list-container").html('<ul class="label-list"><li class="empty-item">'+get_lang("No labels found.")+'.</li></ul>'); 162 176 } 163 177 var qtdLi = $(".label-list-container ul").find("li").not(".empty-item").length; … … 265 279 //Exibe a mensagem informando o usuário de que não há nenhum marcador cadastrado. 266 280 Label_List = winElement 267 .find(".label-list-container").html('<ul class="label-list"><li class="empty-item">'+get_lang("No labels found ")+'.</li></ul>');281 .find(".label-list-container").html('<ul class="label-list"><li class="empty-item">'+get_lang("No labels found.")+'.</li></ul>'); 268 282 269 283 } … … 375 389 //excluir marcador {deve ser para o botão grande na janela de edição e nao o pequeno da lista} 376 390 winElement.find(".buttons .delete-label").click(function(event){ 377 var id = winElement.find(".edit-label").val(); 391 var id = winElement.find(".edit-label").val(); 378 392 confirmDelete(id); 379 393 event.stopImmediatePropagation(); … … 423 437 }).keyup(); 424 438 } 425 426 439 /** 427 440 * TODO: -
trunk/prototype/services/ImapServiceAdapter.php
r5570 r5586 375 375 { 376 376 list($messageId, $labelId) = explode('#', $URI['id']); 377 $folderName = basename($messageId);378 $messageNumber = dirname($messageId);379 377 $folderName = dirname($messageId); 378 $messageNumber = basename($messageId); 379 380 380 if ($folderName && $messageNumber && $labelId) { 381 381 $this->mbox = $this->open_mbox($folderName);
Note: See TracChangeset
for help on using the changeset viewer.