Changeset 5738 for trunk/prototype/modules/mail
- Timestamp:
- 03/15/12 19:01:40 (12 years ago)
- Location:
- trunk/prototype/modules/mail
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/mail/js/followupflag.js
r5711 r5738 71 71 }, 72 72 select: function( event, ui ) { 73 winElement.find('.menu-configure-followupflag .save').button("enable");74 73 ui.item.option.selected = true; 75 74 self._trigger( "selected", event, { … … 333 332 winElement.find('.time').timepicker({}); 334 333 winElement.find('[name="name"]').combobox(); 334 winElement.find('.ui-corner-right.ui-button-icon').attr('title', get_lang('Show All Items')); 335 335 336 336 winElement.find('[name="alarmDate"],[name="alarmTime"]').attr("disabled","disabled"); … … 416 416 { 417 417 attrDeadline: 'doneDeadline', 418 caption: {singular:' Você tem uma mensagem concluindo hoje:', plural:"Você tem %1 mensagens concluindo hoje:"},418 caption: {singular:'You have one undone message today:', plural:"You have %1 undone messages today:"}, 419 419 onOk: function(event){ 420 420 if($(event.target).parents('.doneDeadline').find('[name="stopAlert"]').is(':checked')){ … … 426 426 { 427 427 attrDeadline: 'alarmDeadline', 428 caption: {singular:' Você tem uma mensagem sinalizada para hoje:', plural:'Você tem %1 mensagens sinalizadas para hoje:'},428 caption: {singular:'You have a follow up due for today:', plural:'You have %1 follow ups due for today:'}, 429 429 onOk: function(event){ 430 430 if($(event.target).parents('.alarmDeadline').find('[name="stopAlert"]').is(':checked')){ -
trunk/prototype/modules/mail/templates/followupflag_alarm_list.ejs
r5705 r5738 5 5 for(var i=0; i<data.alarmInRange.length; i++){ 6 6 var openMessageScript = "cExecute('$this.imap_functions.get_info_msg&msg_number="+data.alarmInRange[i].messageNumber+"&msg_folder="+data.alarmInRange[i].folderName+"&alarm=true', show_msg);"; 7 7 if(data.alarmInRange[i].followupflag.id < 7){ 8 var nameFollowupflag = get_lang(data.alarmInRange[i].followupflag.name); 9 }else{ 10 var nameFollowupflag = data.alarmInRange[i].followupflag.name; 11 } 8 12 %> 9 13 <li class="message-item"> 10 14 <a onclick="<%=openMessageScript%>"> 11 <%= (it.attrDeadline == 'alarmDeadline') ? data.alarmInRange[i].alarmDeadline : data.alarmInRange[i].doneDeadline %> - <%= data.alarmInRange[i].followupflag.name%> - <%= data.alarmInRange[i].message.headers.subject %>15 <%= (it.attrDeadline == 'alarmDeadline') ? data.alarmInRange[i].alarmDeadline : data.alarmInRange[i].doneDeadline %> - <%= nameFollowupflag %> - <%= data.alarmInRange[i].message.headers.subject %> 12 16 </a> 13 17 </li> … … 18 22 19 23 <fieldset class="alert-options"> 20 <input type="checkbox" name="stopAlert"> <label> Não mostrar essa janela por hoje.</label>24 <input type="checkbox" name="stopAlert"> <label><%= get_lang("Don't show this window anymore today.")%></label> 21 25 </fieldset> -
trunk/prototype/modules/mail/templates/followupflag_configure.ejs
r5676 r5738 2 2 <% 3 3 if (data.messages.length == 1) { 4 var followupflagged = data.messages[0].followupflagged ? data.messages[0].followupflagged : followupflagged = { followupflag: {} };4 var followupflagged = data.messages[0].followupflagged ? data.messages[0].followupflagged : { followupflag: {id: 1} }; 5 5 if (followupflagged.doneDeadline) 6 6 followupflagged.doneDeadline = Date.parseExact(followupflagged.doneDeadline, 'yyyy-MM-dd hh:mm:ss'); … … 10 10 } else if (data.messages.length > 1) { 11 11 var followupflagged = { 12 followupflag: {name: true },12 followupflag: {name: true, id: 1}, 13 13 isDone: true, 14 14 doneDeadline: true, … … 21 21 for(var i=0; i<data.messages.length; i++){ 22 22 if (!data.messages[i].followupflagged) { 23 followupflagged = { followupflag: { } };23 followupflagged = { followupflag: {name: false, id: false} }; 24 24 break; 25 25 } … … 28 28 followupflagged.followupflag.name = (followupflagged.followupflag.name && data.messages[i].followupflagged.followupflag.name == data.messages[i-1].followupflagged.followupflag.name) ? 29 29 data.messages[i].followupflagged.followupflag.name : false; 30 31 followupflagged.followupflag.id = (followupflagged.followupflag.id && data.messages[i].followupflagged.followupflag.id == data.messages[i-1].followupflagged.followupflag.id) ? 32 data.messages[i].followupflagged.followupflag.id : false; 30 33 31 34 followupflagged.isDone = (followupflagged.isDone && data.messages[i].followupflagged.isDone == data.messages[i-1].followupflagged.isDone) ? … … 58 61 <select name="name"> 59 62 <% for(var i=0; i<data.followupflags.length; i++) { %> 60 <% var selected = (data.followupflags[i].name == followupflagged.followupflag.name ) ? 'selected="selected"' : '' %> 61 <option value="<%= data.followupflags[i].id %>" <%= selected %>><%= data.followupflags[i].name %></option> 63 <% var selected = (data.followupflags[i].id == followupflagged.followupflag.id ) ? 'selected="selected"' : '' %> 64 <% if(data.followupflags[i].id >= 1 && data.followupflags[i].id <= 6){ var innerOption = get_lang(data.followupflags[i].name) 65 }else{var innerOption = data.followupflags[i].name}%> 66 <option value="<%= data.followupflags[i].id %>" <%= selected %>><%= innerOption %></option> 62 67 <% } %> 63 68 </select>
Note: See TracChangeset
for help on using the changeset viewer.