Changeset 5640
- Timestamp:
- 03/06/12 14:20:00 (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/common_functions.js
r5588 r5640 683 683 dialogClass: 'dialog-configure-label' 684 684 }); 685 init_label({window:dialogElement, selectedItem:data.selectedItem });685 init_label({window:dialogElement, selectedItem:data.selectedItem, applyToSelectedMessages:data.applyToSelectedMessages}); 686 686 dialogElement.dialog("open"); 687 687 } … … 714 714 715 715 if(!User.followupflags) 716 DataLayer.remove('followupflag', false); 716 717 User.followupflags = DataLayer.get('followupflag', true); 717 718 var data = { -
trunk/expressoMail1_2/js/doiMenuData.js
r5625 r5640 159 159 $.contextMenu({ 160 160 selector: "#link_tools", 161 trigger: ' left',161 trigger: 'hover', 162 162 className: 'context-menu-tools', 163 163 position: function($menu, x, y){ … … 167 167 $menu.css('display', 'block').position({ my: "center top", at: "center bottom", of: this}).css('display', 'none'); 168 168 }, 169 delay:100, 170 autoHide:true, 169 171 events: { 170 172 show: function(opt) { 171 var $trigger = $(opt.selector).css({'background-color': '# EEEEEE', 'border': '1px solid #CCCCCC'});173 var $trigger = $(opt.selector).css({'background-color': '#ffffff', 'border': '1px solid #CCCCCC'}); 172 174 $('.context-menu-tools.context-menu-list.context-menu-root').css({'width': $trigger.css('width') }); 175 $('.context-menu-tools.context-menu-list').css({'background': '#ffffff'}) 176 .find(".context-menu-item").css({'background-color': '#ffffff'}).hover( 177 function(){ 178 $(this).css({'background-color': '#CCCCCC'}); 179 }, 180 function(){ 181 $(this).css({'background-color': '#ffffff'}); 182 } 183 ); 173 184 return true; 174 185 }, -
trunk/expressoMail1_2/templates/default/expressomail.css
r5626 r5640 133 133 .context-menu-item.icon-share-mailbox { background-image: url(images/menu/usersfolders.png); } 134 134 .context-menu-item.icon-label { background-image: url(images/menu/usersfolders.png); } 135 .context-menu-item.icon-tag { background-image: url(images/menu/tag.png); margin: 3px;}135 .context-menu-item.icon-tag { background-image: url(images/menu/tag.png); background-size: 12px; background-position: 6px 2px !important;} 136 136 .context-menu-item.icon-empty-trash { background-image: url(images/menu/trash.png); } 137 137 .context-menu-item.icon-queue { background-image: url(images/menu/queue.png); } -
trunk/expressoMail1_2/templates/default/index.tpl
r5576 r5640 22 22 <tr> 23 23 <td> 24 <div id="search_div" align="center" style="white-space:nowrap"></div>25 <input type="text" id="em_message_search" size="17" style="margin-left: 5px;"/>26 <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)"></a>27 28 < a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null', 'expressoMail')"></a>24 <div id="search_div" class="class_search_div" style="white-space:nowrap"> 25 <input type="text" id="em_message_search" size="17" style="margin-left: 5px;"/> 26 <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)"></a> 27 <a style="padding:1 8px; width:16px; height:16px; background: url(templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null', 'expressoMail')"></a> 28 </div> 29 29 </td> 30 30 </tr> … … 46 46 </tr> 47 47 <tr height="24"> 48 <td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'>48 <td id="link_tools" class='content-menu-td'> 49 49 <div class='em_div_sidebox_menu'> 50 50 <img height='16px' src='./templates/default/images/menu/tools.gif' /> -
trunk/expressoMail1_2/templates/default/main.css
r5436 r5640 373 373 .content-menu-td { 374 374 /* border: 1px solid #f7f7f7;*/ 375 } 375 margin-left: 5px; 376 } 377 378 .content-menu-td:hover{background-color: #ffffff; border: 1px solid #CCCCCC} 376 379 377 380 .content-folders { … … 479 482 } 480 483 484 .class_search_div{ 485 position: relative; 486 left: 12px; 487 } 481 488 482 489 .em_sidebox_menu { … … 494 501 .em_div_sidebox_menu { 495 502 position: relative; 496 left: 5px;503 left: 17px; 497 504 cursor: pointer; 498 505 } -
trunk/prototype/modules/mail/js/followupflag.js
r5625 r5640 163 163 164 164 .filter('.menu-configure-followupflag .save').click(function(){ 165 var saveFollowupflagged = function(){ 166 var isDone = winElement.find('[name="done"]').is(':checked') ? 1 : 0; 167 var alarmDate = false; 168 var doneDate = false; 169 var folder_name; 170 var folders = []; 171 var messages = []; 172 var roles = get_selected_messages_search_role().split(','); 173 for (var i=0; i < selectedMessageIds.length; i++ ){ 174 if (currentTab == 0) { 175 folder_name = current_folder; 176 var messageNumber = selectedMessageIds[i]; 177 }else{ 178 var tr = $('[role="'+roles[i]+'"]'); 179 folder_name = $(tr).attr('name'); 180 var id = $(tr).attr('id'); 181 var messageNumber = id.replace(/_[a-zA-Z0-9]+/,""); 182 } 183 folders.push(folder_name); 184 185 var idFollowupflagged = winElement.find('[name="followupflagId"]').val(); 186 var followupflagged = DataLayer.merge({ 187 uid : User.me.id, 188 followupflagId : followupflagId, 189 folderName : folder_name, 190 messageNumber : messageNumber, 191 isDone: isDone, 192 backgroundColor : backgroundColor 193 }, !!idFollowupflagged ? {id: idFollowupflagged} : {}); 194 195 if (alarmDate = winElement.find('[name="alarmDate"]').datepicker("getDate")) { 196 if (alarmTime = winElement.find('[name="alarmTime"]').datepicker("getDate")) { 197 alarmDate.set({hour:alarmTime.getHours(), minute:alarmTime.getMinutes()}); 198 } 199 followupflagged.alarmDeadline = alarmDate.toString('yyyy-MM-dd hh:mm:ss'); 200 } 201 202 if (doneDate = winElement.find('[name="doneDate"]').datepicker("getDate")) { 203 if (doneTime = winElement.find('[name="doneTime"]').datepicker("getDate")) { 204 doneDate.set({hour:doneTime.getHours(), minute:doneTime.getMinutes()}); 205 } 206 followupflagged.doneDeadline = doneDate.toString('yyyy-MM-dd hh:mm:ss'); 207 } 208 209 /** 210 * Aplica o ícone correspondente na lista de mensagens do expressoMail 211 */ 212 if(current_folder == folder_name){ 213 var flagged = $('#td_message_followup_' + messageNumber + ', tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited"); 214 } else{ 215 var flagged = $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited"); 216 } 217 if(isDone){ 218 flagged.find("img").attr("src", "../prototype/modules/mail/img/flagChecked.png").css("margin-left","-3px"); 219 }else{ 220 flagged.find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 221 } 222 223 224 if(current_folder == folder_name){ 225 $('#td_message_followup_' + messageNumber + ', ' + 226 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 227 }else{ 228 $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 229 } 230 /** 231 * Salva ou, caso já exista, atualiza 232 */ 233 DataLayer.put('followupflagged', followupflagged); 234 } 165 235 236 DataLayer.commit(false, false, function(data){ 237 followupflags = DataLayer.get('followupflagged',{criteria:{order: 'id'}}, true); 238 var id = followupflags[followupflags.length - 1].id; 239 winElement.find('[name="followupflagId"]').val(id); 240 winElement.find('.menu-configure-followupflag .save').button("option", "disabled", true); 241 winElement.find('.menu-configure-followupflag .delete').button("option", "disabled", false); 242 updateCacheFollowupflag(selectedMessageIds, folders, true); 243 }); 244 245 } 166 246 var backgroundColor = winElement.find('[name="backgroundColor"]').val(); 167 247 var followupflagId = winElement.find('[name="name"] option:selected').val(); 168 248 if (followupflagId == 'custom') { 169 249 DataLayer.put('followupflag', {name:winElement.find('[name="name"] option:selected').text(), uid:User.me.id}); 170 DataLayer.commit(); 171 172 followupflags = DataLayer.get('followupflag',{criteria:{order: 'id'}}, true); 173 followupflagId = followupflags[followupflags.length - 1].id; 174 winElement.find('[name="name"] option[value="custom"]').val(followupflagId); 175 } 176 177 178 var isDone = winElement.find('[name="done"]').is(':checked') ? 1 : 0; 179 var alarmDate = false; 180 var doneDate = false; 181 var folder_name; 182 var folders = []; 183 var messages = []; 184 var roles = get_selected_messages_search_role().split(','); 185 for (var i=0; i < selectedMessageIds.length; i++ ){ 186 if (currentTab == 0) { 187 folder_name = current_folder; 188 var messageNumber = selectedMessageIds[i]; 189 }else{ 190 var tr = $('[role="'+roles[i]+'"]'); 191 folder_name = $(tr).attr('name'); 192 var id = $(tr).attr('id'); 193 var messageNumber = id.replace(/_[a-zA-Z0-9]+/,""); 194 } 195 folders.push(folder_name); 196 197 var idFollowupflagged = winElement.find('[name="followupflagId"]').val(); 198 var followupflagged = DataLayer.merge({ 199 uid : User.me.id, 200 followupflagId : followupflagId, 201 folderName : folder_name, 202 messageNumber : messageNumber, 203 isDone: isDone, 204 backgroundColor : backgroundColor 205 }, !!idFollowupflagged ? {id: idFollowupflagged} : {}); 206 207 if (alarmDate = winElement.find('[name="alarmDate"]').datepicker("getDate")) { 208 if (alarmTime = winElement.find('[name="alarmTime"]').datepicker("getDate")) { 209 alarmDate.set({hour:alarmTime.getHours(), minute:alarmTime.getMinutes()}); 210 } 211 followupflagged.alarmDeadline = alarmDate.toString('yyyy-MM-dd hh:mm:ss'); 212 } 213 214 if (doneDate = winElement.find('[name="doneDate"]').datepicker("getDate")) { 215 if (doneTime = winElement.find('[name="doneTime"]').datepicker("getDate")) { 216 doneDate.set({hour:doneTime.getHours(), minute:doneTime.getMinutes()}); 217 } 218 followupflagged.doneDeadline = doneDate.toString('yyyy-MM-dd hh:mm:ss'); 219 } 220 221 /** 222 * Aplica o ícone correspondente na lista de mensagens do expressoMail 223 */ 224 if(current_folder == folder_name){ 225 var flagged = $('#td_message_followup_' + messageNumber + ', tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited"); 226 } else{ 227 var flagged = $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited"); 228 } 229 if(isDone){ 230 flagged.find("img").attr("src", "../prototype/modules/mail/img/flagChecked.png").css("margin-left","-3px"); 231 }else{ 232 flagged.find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0"); 233 } 234 235 236 if(current_folder == folder_name){ 237 $('#td_message_followup_' + messageNumber + ', ' + 238 'tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 239 }else{ 240 $('tr[role="'+messageNumber+'_'+folder_name+'"] #td_message_followup_search_' + messageNumber).find(".flag-edited").css("background", backgroundColor); 241 } 242 /** 243 * Salva ou, caso já exista, atualiza 244 */ 245 DataLayer.put('followupflagged', followupflagged); 246 } 247 248 DataLayer.commit(false, false, function(data){ 249 followupflags = DataLayer.get('followupflagged',{criteria:{order: 'id'}}, true); 250 var id = followupflags[followupflags.length - 1].id; 251 winElement.find('[name="followupflagId"]').val(id); 252 winElement.find('.menu-configure-followupflag .save').button("option", "disabled", true); 253 winElement.find('.menu-configure-followupflag .delete').button("option", "disabled", false); 254 updateCacheFollowupflag(selectedMessageIds, folders, true); 255 }); 250 DataLayer.commit(false, false, function(data){ 251 DataLayer.remove('followupflag', false); 252 DataLayer.get('followupflag'); 253 followupflags = DataLayer.get('followupflag',{criteria:{order: 'id'}}, true); 254 followupflagId = followupflags[followupflags.length - 1].id; 255 winElement.find('[name="name"] option[value="custom"]').val(followupflagId); 256 saveFollowupflagged(); 257 }); 258 }else{ 259 saveFollowupflagged(); 260 } 261 256 262 }).end() 257 263
Note: See TracChangeset
for help on using the changeset viewer.