Changeset 6985 for sandbox/2.4.2-expresso1/expressoMail1_2
- Timestamp:
- 08/10/12 12:25:20 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1/expressoMail1_2
- Files:
-
- 3 edited
-
js/main.js (modified) (11 diffs)
-
templates/default/index.tpl (modified) (1 diff)
-
templates/default/main.css (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js
r6965 r6985 1 1 // Tempo do auto refresh (em milisegundos) 2 //var time_refresh = 300000; 3 var time_refresh = 30000; 2 var time_refresh = 300000; 4 3 5 4 // tempo do auto save (em milisegundos) … … 589 588 var handler_refresh = function(data){ 590 589 handlerMessageFilter = function (data) { 591 if(checkAlarmsFilter){ 592 alarmFollowupflagged('filtersAlarms', data); 593 } 590 alarmFollowupflagged('filtersAlarms', data); 594 591 notificationFilter(data, notifyPermission); 595 596 checkAlarmsFilter = true;597 598 592 } 599 593 /* Busca nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */ … … 3962 3956 type == 'event' ? 3963 3957 {calendar: User.preferences.defaultCalendar ? User.preferences.defaultCalendar : Calendar.calendars[0], calendars: Calendar.calendars} 3964 : {group: Calendar.groups[0].id, groups: Calendar.groups }3958 : {group: Calendar.groups[0].id, groups: Calendar.groups, percentage: 0} 3965 3959 ); 3966 3960 … … 4088 4082 4089 4083 if(typeof(typeImport) == "object"){ 4090 var calendar Permission = typeImport.calendar;4084 var calendarIds = !!typeImport.calendar ? typeImport.calendar : Calendar[typeImport.type]; 4091 4085 typeImport = typeImport.action; 4092 4086 } … … 4100 4094 var options = ''; 4101 4095 4102 if(typeImport == 10){ 4103 for(var i = 0; i < calendarPermission.length; i++) 4104 options += '<option value="'+calendarPermission[i]+'">'+Calendar.signatureOf[calendarPermission[i]].calendar.name+'</option>' 4105 }else{ 4106 for(var id in Calendar.signatures) 4107 options += parseInt(Calendar.signatures[id].isOwner) ? '<option value="'+Calendar.signatures[id].calendar.id+'">'+Calendar.signatures[id].calendar.name+'</option>' : ''; 4096 if(calendarIds){ 4097 for(var i = 0; i < calendarIds.length; i++) 4098 options += '<option value="'+calendarIds[i]+'">'+Calendar.signatureOf[calendarIds[i]].calendar.name+'</option>' 4108 4099 } 4109 4100 … … 4120 4111 url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val()+'&uidAccount='+decodeOwner(), 4121 4112 success: function(msg){ 4122 var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";4113 var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento/tarefa para a agenda "; 4123 4114 alert( alt + $("#select-agenda option:selected").text() ); 4124 4115 } … … 4138 4129 url: "controller.php?action="+import_url+'&from_ajax=true&selected=true', 4139 4130 success: function(msg){ 4140 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento foi removido " : "Ocorreu um erro ao remover o evento" );4131 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento/tarefa foi removido " : "Ocorreu um erro ao remover o evento/tarefa" ); 4141 4132 } 4142 4133 }); … … 4147 4138 url: "controller.php?action="+import_url+'&from_ajax=true&selected=true', 4148 4139 success: function(msg){ 4149 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento foi Atualizado com sucesso" : "Ocorreu um erro ao atualizar evento" );4140 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento/tarefa foi Atualizado com sucesso" : "Ocorreu um erro ao atualizar evento/tarefa" ); 4150 4141 } 4151 4142 }); … … 4153 4144 break; 4154 4145 case 6: 4155 var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?");4146 var acceptedSuggestion = confirm("Deseja atualizar o evento/tarefa de acordo com a sugestão ?"); 4156 4147 $.ajax({ 4157 4148 url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&selected=true&cirus_delimiter='+cyrus_delimiter+'&acceptedSuggestion='+acceptedSuggestion+"&from="+document.getElementById('from_values_'+currentTab).value+'&uidAccount='+decodeOwner(), 4158 4149 success: function(msg){ 4159 4150 if(acceptedSuggestion) 4160 alert( ( ( connector.unserialize(msg)) == "ok") ? "Evento atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" );4151 alert( ( ( connector.unserialize(msg)) == "ok") ? "Evento/tarefa atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" ); 4161 4152 } 4162 4153 }); … … 4164 4155 break; 4165 4156 case 9: 4166 alert('Seu evento não possui alterações!');4157 alert('Seu evento/tarefa não possui alterações!'); 4167 4158 return; 4168 4159 break; 4169 4160 case 11: 4170 alert('Este evento já fora importando por algum dos particpantes e já se encontra disponível em sua agenda compartilhada!');4161 alert('Este evento/tarefa já fora importando por algum dos particpantes e já se encontra disponível em sua agenda compartilhada!'); 4171 4162 return; 4172 4163 break; … … 4177 4168 $("#import-dialog" ).dialog({ 4178 4169 height: 160, 4179 title: 'Atualizar Evento ',4170 title: 'Atualizar Evento/Tarefa', 4180 4171 buttons: { 4181 4172 Cancel: function() { -
sandbox/2.4.2-expresso1/expressoMail1_2/templates/default/index.tpl
r6487 r6985 186 186 </fieldset> 187 187 </div> 188 <div id="import-dialog" title="Importar Evento " style="display:none">188 <div id="import-dialog" title="Importar Evento/Tarefa" style="display:none"> 189 189 <p>Seleciona uma Agenda para o Evento :</p> 190 190 <p> -
sandbox/2.4.2-expresso1/expressoMail1_2/templates/default/main.css
r6965 r6985 1060 1060 } 1061 1061 1062 div.new-event-win.active div.button-files-upload {margin: 15px 0 0 0;} 1063 1062 1064 fieldset.alarm{ 1063 1065 border: none !important; … … 1435 1437 1436 1438 .div-addtask #calendar_addtask_details2 textarea { 1437 width: 670px; 1438 } 1439 1440 .div-addtask{ 1441 width: 760px; 1442 } 1443 1444 .calendar-addevent-details-txt-timezone, .calendar-addtask-details-txt-timezone{width: 227px;} 1439 width: 675px; 1440 } 1441 1442 .div-addtask .button-files-upload{width: 100%;} 1443 .div-addtask fieldset.block-add-attendee .search-result-list, fieldset.block-add-activity .search-result-list{width: 330px;} 1444 1445 .new-event-win div.div-addevent, .new-task-win div.div-addtask{width: 775px;} 1446 1447 .calendar-addevent-details-txt-timezone, .calendar-addtask-details-txt-timezone{width: 212px;} 1445 1448 1446 1449 .div-addtask #calendar_addtask_details1 .time-previsao { width: 40px; } … … 1453 1456 .div-addtask #calendar_addtask_details1 .end-time{ width: 40px; } 1454 1457 .div-addtask #calendar_addtask_details1 .end-date{ width: 80px; } 1455 .div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 50px; }1458 .div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 20px; } 1456 1459 .div-addtask #calendar_addtask_details1 .subitem { margin: 5px; display: block;} 1457 1460 .div-addtask #calendar_addtask_details1 .subitem .span_done{ margin: 0 30px;} … … 1463 1466 .div-addtask #calendar_addtask_details1 .ui-spinner-buttons .ui-spinner-down{height: 8px !important;} 1464 1467 1465 .div-addtask #calendar_addtask_details1 .subitem .span_done.noAction{background-image: url("../img/gray.png"); background-repeat: no-repeat; } 1466 .div-addtask #calendar_addtask_details1 .subitem .span_done.inProcess{background-image: url("../img/yellow.png"); background-repeat: no-repeat;} 1467 .div-addtask #calendar_addtask_details1 .subitem .span_done.finished{background-image: url("../img/green.png"); background-repeat: no-repeat;} 1468 .div-addtask #calendar_addtask_details1 .subitem .span_done.canceled{background-image: url("../img/red.png"); background-repeat: no-repeat;} 1468 .div-addtask #calendar_addtask_details1 .subitem .span_done.noAction{background-image: url("../../../prototype/modules/calendar/img/gray.png"); background-repeat: no-repeat; } 1469 .div-addtask #calendar_addtask_details1 .subitem .span_done.inProcess{background-image: url("../../../prototype/modules/calendar/img/yellow.png"); background-repeat: no-repeat;} 1470 .div-addtask #calendar_addtask_details1 .subitem .span_done.finished{background-image: url("../../../prototype/modules/calendar/img/green.png"); background-repeat: no-repeat;} 1471 .div-addtask #calendar_addtask_details1 .subitem .span_done.canceled{background-image: url("../../../prototype/modules/calendar/img/red.png"); background-repeat: no-repeat;} 1472 1473 #calendar_addtask_details4{margin: 0;} 1474 #calendar_addtask_details5{margin: -2px 0 0 0;} 1475 #calendar_addtask_details7{margin: 3px 0 0 0;} 1469 1476 .div-addtask #calendar_addtask_details1 .subitem .span_done label{position: relative; left: 28px;} 1470 1477 1471 1478 .div-addtask fieldset#calendar_addtask_details5.tab-level2{ margin: 0 } 1472 1479 1473 .div-addtask #calendar_addtask_details8 .parent {width: 715px; min-height: 208px; float: left;} 1474 .div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 1480 .div-addtask #calendar_addtask_details8 .parent {width: 746px; min-height: 208px; float: left;} 1481 /*.div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 20px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}*/ 1482 .div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 25px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC; border-top: 1px solid #CCC;} 1475 1483 .div-addtask #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 208px; overflow: auto; float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 1476 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 30px; }1484 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 20px; } 1477 1485 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;} 1478 1486 1479 1480 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour { width: 30%; float: left; height: 30px} 1487 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour {overflow: hidden; width: 140px; float: left; height: 20px} 1481 1488 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; } 1482 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .organization{ width: 69%; float: left; height: 30px; border-left: 1px solid #CCC; } 1483 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .organization span{ margin: 8px; float: left; } 1484 1485 1486 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour { width: 29%; float: left; background: #E8F4FD; height: 30px; } 1487 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour span{ margin: 8px; float: left; font-weight: bold; color: #2E6E9E; } 1488 .div-addtask #calendar_addtask_details8 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; } 1489 .div-addtask #calendar_addtask_details8 .parent .child-top .organization span{margin: 8px; float: left; } 1489 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .user{overflow: hidden; width: 150px; float: left; height: 20px; border-left: 1px solid #CCC; } 1490 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .user span{ margin: 8px; float: left; } 1491 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .attribute{overflow: hidden; width: 130px; float: left; height: 20px; border-left: 1px solid #CCC; } 1492 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .attribute span{ margin: 8px; float: left; } 1493 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .beforeValue{overflow: hidden; width: 150px; float: left; height: 20px; border-left: 1px solid #CCC; } 1494 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .beforeValue span{ margin: 8px; float: left; } 1495 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .afterValue{overflow: hidden; width: 150px; float: left; height: 20px; border-left: 1px solid #CCC; } 1496 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .afterValue span{ margin: 8px; float: left; } 1497 1498 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour { width: 140px; float: left; background: #E8F4FD; height: 20px; text-align: center; } 1499 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour span{ display: block; padding: 6px; font-weight: bold; color: #2E6E9E; } 1500 .div-addtask #calendar_addtask_details8 .parent .child-top .user { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1501 .div-addtask #calendar_addtask_details8 .parent .child-top .user span{display: block; padding: 6px;} 1502 .div-addtask #calendar_addtask_details8 .parent .child-top .attribute { width: 130px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1503 .div-addtask #calendar_addtask_details8 .parent .child-top .attribute span{display: block; padding: 6px;} 1504 .div-addtask #calendar_addtask_details8 .parent .child-top .beforeValue { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1505 .div-addtask #calendar_addtask_details8 .parent .child-top .beforeValue span{display: block; padding: 6px; } 1506 .div-addtask #calendar_addtask_details8 .parent .child-top .afterValue { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1507 .div-addtask #calendar_addtask_details8 .parent .child-top .afterValue span{display: block; padding: 6px; }
Note: See TracChangeset
for help on using the changeset viewer.
