Changeset 5603
- Timestamp:
- 03/01/12 16:20:15 (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/doiMenuData.js
r5597 r5603 210 210 $('#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first') 211 211 .html(''); 212 $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first'); 212 //$.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', #td_message_labels_search_' + msg_number+':first'); 213 $.contextMenu( 'destroy', '#td_message_labels_' + msg_number +', tr[role="'+msg_number+'_'+msg_folder+'"] #td_message_labels_search_' + msg_number); 213 214 return false; 214 215 } -
trunk/expressoMail1_2/setup/tables_current.inc.php
r5547 r5603 77 77 'ix' => array(), 78 78 'uc' => array() 79 )80 79 ) 81 82 80 ); 83 81 ?> -
trunk/prototype/modules/mail/css/label.css
r5547 r5603 4 4 5 5 .label-configure-win { margin: 5px;} 6 .label-configure-win .input-nome { width: 200px; outline:0; background:#FFF;}6 .label-configure-win .input-nome { width: 135px; outline:0; background:#FFF;} 7 7 .label-configure-win .lebals-colorpicker { border: 1px solid #CCC; height: 210px; } 8 8 .label-configure-win .label-conf { float: left;} -
trunk/prototype/modules/mail/js/label.js
r5586 r5603 21 21 var span = $(this).parent().find(".text-list"); 22 22 $(this).parent().trigger('click').unbind('click', configureLabel).find("span.text-list") 23 .html('<input name="edit-value-list" class="edit-value-list" type="text" value="'+conteudoSpan+'">').find("input[name='edit-value-list']").keydown(function(event){23 .html('<input name="edit-value-list" class="edit-value-list" type="text" maxlength="18" value="'+conteudoSpan+'">').find("input[name='edit-value-list']").keydown(function(event){ 24 24 event.stopPropagation(); 25 25 $("input.edit-value-list").keyup(function () { … … 28 28 }).keyup(); 29 29 if(event.keyCode == 13){ 30 event.preventDefault(); 31 var nameLabel = $(".label-list").find(".edit-value-list").val(); 30 32 $(span).html($(".label-list").find(".edit-value-list").val()) 31 33 .parent().find('.edit').removeClass("hidden").parents("li").click(configureLabel).trigger("click"); 32 save_editLabel( );34 save_editLabel(nameLabel); 33 35 34 36 }else if( event.keyCode == 27){ … … 87 89 } 88 90 89 function save_editLabel(){ 90 var qtdLi = $(".label-list-container ul").find("li").not(".empty-item").length; 91 // salvar marcador 92 if(qtdLi > 0){ 93 $(".save-label").button("disable"); 94 var labelEdited = { 95 id : winElement.find(".edit-label").val(), 96 uid: User.me.id, 97 name : winElement.find('.input-nome').val(), 98 backgroundColor : winElement.find("input[name='backgroundColor']").val(), 99 fontColor : winElement.find("input[name='fontColor']").val(), 100 borderColor : winElement.find("input[name='borderColor']").val() 101 } 102 $(".label-list-container .label-list li").each(function(){ 103 var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/); 91 function save_editLabel(nameLabel){ 92 if(nameLabel.length >= 4){ 93 var qtdLi = $(".label-list-container ul").find("li").not(".empty-item").length; 94 // salvar marcador 95 if(qtdLi > 0){ 96 $(".save-label").button("disable"); 97 var labelEdited = { 98 id : winElement.find(".edit-label").val(), 99 uid: User.me.id, 100 name : winElement.find('.input-nome').val(), 101 backgroundColor : winElement.find("input[name='backgroundColor']").val(), 102 fontColor : winElement.find("input[name='fontColor']").val(), 103 borderColor : winElement.find("input[name='borderColor']").val() 104 } 105 $(".label-list-container .label-list li").each(function(){ 106 var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/); 107 108 if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){ 109 $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span class='text-list'>"+labelEdited.name+"</span><div class='button close tiny' style='float: right'></div><div class='button edit tiny' style='float: right'></div>").css({ 110 "background" : labelEdited.backgroundColor, 111 "color" : labelEdited.fontColor, 112 "border-color" : labelEdited.borderColor 113 }); 114 } 115 }); 104 116 105 if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){ 106 $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span class='text-list'>"+labelEdited.name+"</span><div class='button close tiny' style='float: right'></div><div class='button edit tiny' style='float: right'></div>").css({ 107 "background" : labelEdited.backgroundColor, 108 "color" : labelEdited.fontColor, 109 "border-color" : labelEdited.borderColor 110 }); 111 } 112 }); 113 114 $("#MyMarckersList .label-list li").each(function(){ 115 var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/); 116 117 if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){ 118 $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span>"+labelEdited.name+"</span>"); 119 $(this).find(".square-color").css('background', labelEdited.backgroundColor); 120 } 121 }); 122 DataLayer.put('label', labelEdited.id, labelEdited); 123 DataLayer.commit(false, false, function(){ 124 winElement.find(".insert-label").val(""); 125 $.Watermark.ShowAll(); 126 127 $(".label-list-container .label-list li").find('.button').button() 128 .filter('.edit').button({icons:{primary:'ui-icon-pencil'}, text:false}).end() 129 .filter('.close').button({icons:{primary:'ui-icon-close'}, text:false}); 130 131 winElement.find('.edit').unbind("click").click(editLabel); 132 winElement.find('.close').click(deleteLabel); 133 134 draw_tree_labels(); 135 updateMessageLabels(labelEdited.id); 136 137 /** 138 * Atualiza menu remove o menu presente em cada mensagem listada em uma pasta 139 * e carrega novamente para que os dados sejam atualizados 140 */ 141 $.contextMenu( 'destroy', ".table_box tbody tr"); 142 loadMenu(); 143 }); 144 // criar marcador 145 } else { 146 var nameLabel = winElement.find(".input-nome").val(); 147 if(nameLabel.length >= 2){ 117 $("#MyMarckersList .label-list li").each(function(){ 118 var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/); 119 120 if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){ 121 $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span>"+labelEdited.name+"</span>"); 122 $(this).find(".square-color").css('background', labelEdited.backgroundColor); 123 } 124 }); 125 DataLayer.put('label', labelEdited.id, labelEdited); 126 DataLayer.commit(false, false, function(){ 127 128 winElement.find(".insert-label").val(""); 129 $.Watermark.ShowAll(); 130 131 $(".label-list-container .label-list li").find('.button').button() 132 .filter('.edit').button({icons:{primary:'ui-icon-pencil'}, text:false}).end() 133 .filter('.close').button({icons:{primary:'ui-icon-close'}, text:false}); 134 135 winElement.find('.edit').unbind("click").click(editLabel); 136 winElement.find('.close').click(deleteLabel); 137 138 draw_tree_labels(); 139 updateMessageLabels(labelEdited.id); 140 141 /** 142 * Atualiza menu remove o menu presente em cada mensagem listada em uma pasta 143 * e carrega novamente para que os dados sejam atualizados 144 */ 145 $.contextMenu( 'destroy', ".table_box tbody tr"); 146 loadMenu(); 147 }); 148 // criar marcador 149 } else { 150 var nameLabel = winElement.find(".input-nome").val(); 148 151 new_label(nameLabel, false); 149 152 winElement.find(".insert-label").val(""); 150 153 $.Watermark.ShowAll(); 151 } else {152 alert("Mínimo 2 caracteres");153 154 } 154 } 155 $(".label-list-container .label-list").find(".label-item-"+labelEdited.id).trigger("click"); 155 $(".label-list-container .label-list").find(".label-item-"+labelEdited.id).trigger("click"); 156 } else { 157 alert("Mínimo 4 caracteres"); 158 } 156 159 } 157 160 … … 372 375 $.Watermark.HideAll(); 373 376 var nameLabel = winElement.find(".insert-label").val(); 374 if(nameLabel.length >= 2){377 if(nameLabel.length >= 4){ 375 378 new_label(nameLabel, true); 376 379 $.Watermark.ShowAll(); 377 380 winElement.find(".insert-label").val(""); 378 381 } else { 379 alert("Mínimo 2caracteres");382 alert("Mínimo 4 caracteres"); 380 383 } 381 384 event.stopImmediatePropagation(); … … 403 406 //salvar/criar marcador 404 407 winElement.find(".buttons .save-label").click(function(){ 405 save_editLabel(); 408 var nameLabel = winElement.find(".input-nome").val(); 409 save_editLabel(nameLabel); 406 410 }); 407 411 //desfazer marcador -
trunk/prototype/modules/mail/templates/label_configure.ejs
r5556 r5603 7 7 <fieldset class="add-attendee-search search-field ui-corner-all"> 8 8 <span class="ui-icon ui-icon-plus add-label-button"></span> 9 <input class="insert-label" type="text" value="<%=get_lang("Add Label")%>" maxlength="1 5" >9 <input class="insert-label" type="text" value="<%=get_lang("Add Label")%>" maxlength="18" > 10 10 </fieldset> 11 11 </div> … … 15 15 <fieldset> 16 16 <legend><%= get_lang("Basic")%></legend> 17 <%= get_lang("Label name")%>: <input type="text" class="input-nome" value="" name="marcador" >17 <%= get_lang("Label name")%>: <input type="text" class="input-nome" value="" name="marcador" maxlength="18"> 18 18 <input type="hidden" class="edit-label" value="" name="marcador"> 19 19 </fieldset>
Note: See TracChangeset
for help on using the changeset viewer.