Changeset 5729
- Timestamp:
- 03/15/12 11:50:53 (11 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
expressoMail1_2/index.php (modified) (1 diff)
-
expressoMail1_2/js/main.js (modified) (2 diffs)
-
expressoMail1_2/templates/default/expressoMail_reset.css (modified) (1 diff)
-
prototype/modules/calendar/interceptors/DBMapping.php (modified) (7 diffs)
-
prototype/modules/calendar/js/calendar.codecs.js (modified) (2 diffs)
-
prototype/modules/calendar/templates/alarm.ejs (modified) (2 diffs)
-
prototype/modules/calendar/templates/event_add.ejs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r5713 r5729 80 80 81 81 <script type="text/javascript" src="../prototype/modules/calendar/js/timezone.js"></script> 82 82 <script type="text/javascript" src="../prototype/plugins/dateFormat/dateFormat.js"></script> 83 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.date.js"></script> 83 84 <script type="text/javascript" src="../prototype/modules/calendar/js/calendar.codecs.js"></script> 84 85 85 86 <script src="js/rich_text_editor.js" type="text/javascript"></script> 86 <script src="js/base64.js" type="text/javascript"></script>'; 87 <script src="js/base64.js" type="text/javascript"></script> 88 89 <script type="text/javascript"> 90 User.moduleName = "expressoMail1_2"; 91 </script> 92 93 94 '; 87 95 //---------------------------// 88 96 -
trunk/expressoMail1_2/js/main.js
r5718 r5729 3270 3270 3271 3271 //$.ajax({ url: "../expressoCalendar/index.php", async: false}); 3272 $.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});3272 //$.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3273 3273 $.ajax({url: "../prototype/modules/calendar/js/map.disponibility.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3274 3274 $.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); … … 3276 3276 //$.ajax({ url: "../prototype/modules/calendar/js/calendar.codecs.js", async: false}); 3277 3277 $.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3278 $.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});3278 //$.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3279 3279 3280 3280 $.ajax({ url: "../prototype/plugins/fullcalendar/fullcalendar.js", async: false , beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); -
trunk/expressoMail1_2/templates/default/expressoMail_reset.css
r5642 r5729 135 135 } 136 136 137 137 #new_event_map .map-event .fc-event-inner.fc-event-skin .fc-event-head, #new_event_map .map-event .fc-event-inner.fc-event-skin .fc-event-content{ 138 138 background-color: transparent !important; 139 139 color: transparent !important; 140 140 } 141 141 142 142 #new_event_map .map-event .ui-resizable-handle{ 143 143 display : block !important; 144 144 color: black !important; 145 } 146 147 fieldset.alarm{ 148 border: none !important; 149 padding: 0px !important; 150 margin: 0px !important; 145 151 } 146 152 -
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r5727 r5729 319 319 $u = $result->format('U') * 1000; 320 320 321 if( $u > $end ) //data da repeti ção atual maior que a data final da busca do usuario ?321 if( $u > $end ) //data da repetição atual maior que a data final da busca do usuario ? 322 322 break; 323 323 … … 616 616 $result[$i]['calendar'] = Controller::read( array( 'concept' => 'calendar' , 'id' => $v['calendar']), false, false); 617 617 $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature' , $v['id']) )); 618 //Caso n ão seja o dono da agenda retorna o objeto permission com as acls618 //Caso não seja o dono da agenda retorna o objeto permission com as acls 619 619 if($result[$i]['isOwner'] == 0){ 620 620 $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' , $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); … … 733 733 ))); 734 734 735 return false; /* Mata o restante da execu ção */735 return false; /* Mata o restante da execução */ 736 736 } 737 737 … … 770 770 public function createDefaultSignature( &$uri , &$result , &$criteria , $original ){ 771 771 772 //Caso uma busca n ão retorne nenhum resultado e foi buscado pelas assinaturas do usuario logado apenas772 //Caso uma busca não retorne nenhum resultado e foi buscado pelas assinaturas do usuario logado apenas 773 773 if(count($result) <= 0 && 774 774 ( $original['criteria']['filter'][0] == '=' && … … 821 821 else 822 822 { 823 //Criaremos uma agenda padr ão823 //Criaremos uma agenda padrão 824 824 $cal = array('name' => 'Calendario', 825 'description' => 'Calendario Padr ão',825 'description' => 'Calendario Padrão', 826 826 'timezone' => (date_default_timezone_get()) ? date_default_timezone_get() : 'America/Sao_Paulo', 827 827 'dtstamp' => time().'000' … … 910 910 continue; 911 911 912 //Cria ção do ical912 //Criação do ical 913 913 $ical = null; 914 914 $ical = new vcalendar(); … … 948 948 ),ROOTPATH.'/api/templates/notify_create_body.tpl'); 949 949 950 //TODO: Internacionaliza ção do Subject950 //TODO: Internacionalização do Subject 951 951 $mail['subject'] = 'Schedulableo do Calendário : '.$schedulable['summary'] .' @ '.date_format( $sTime , 'd/m/Y H:i') . ' - ' . date_format( $eTime , 'd/m/Y H:i'); 952 952 $mail['from'] = $organizer['mail']; -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r5724 r5729 198 198 this.addAlarm( eventsDay[i] ); 199 199 } 200 201 202 addAlarm: function( eventDay ){ 200 }, 201 202 addAlarm: function( eventDay ){ 203 203 if(!DataLayer.tasks[parseInt(eventDay.sendTime)]){ 204 204 DataLayer.task( parseInt(eventDay.sendTime) , function( timestamp ){ 205 DataLayer.render('templates/alarm.ejs',{event: eventDay}, function( html ){ 206 var dlgAlarm = jQuery('#div-alarm').html( html ).find('.alarm-event.active'); 207 dlgAlarm.dialog({resizable: false, modal:true, width:400, minHeight: 100,position: 'center', close:function(){$(this).dialog('destroy');$(this).dialog('open');}}); 205 var path = User.moduleName == 'expressoCalendar' ? '' : '../prototype/modules/calendar/'; 206 DataLayer.render(path+'templates/alarm.ejs',{event: eventDay}, function( html ){ 207 $.Zebra_Dialog(html , { 208 'type': 'question', 209 'overlay_opacity': '0.5', 210 'buttons': ['Fechar'], 211 'onClose': function(clicked) {} 212 }); 208 213 }); 209 214 }); … … 611 616 receiveNotification : attend.receiveNotification, 612 617 alarms : $.map(attend.alarms || [], function( alarm ){ 613 return DataLayer.get('alarm', alarm); 618 var alarm = DataLayer.get('alarm', alarm); 619 return (alarm == "" ? (null) : alarm); 614 620 }) 615 621 }; -
trunk/prototype/modules/calendar/templates/alarm.ejs
r5341 r5729 3 3 <legend class="hidden">Alarme de Evento</legend> 4 4 <div class="new-event-alarm"> 5 Você possui um compromisso agendado: 5 <b>Você possui um compromisso agendado:</b> 6 6 </div> 7 7 <div class="title-event-alarm"> … … 21 21 </div> 22 22 </fieldset> 23 <div class="menu-container footer-container">24 <a class="button alarm-btn-fechar" href="#"></a>25 </div>26 23 </div> -
trunk/prototype/modules/calendar/templates/event_add.ejs
r5715 r5729 124 124 <label>Avisar-me por </label> 125 125 <select name="alarmType[]"> 126 <!--<option value="alert" <%= data.event.alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option>127 <option value="mail" <%= data.event.alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option>-->128 <option value="sms" <%= data.event.alarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>126 <option value="alert" <%= data.event.alarms[i].type=='alert' ? 'selected="selected"':'' %>>Alerta</option> 127 <option value="mail" <%= data.event.alarms[i].type=='mail' ? 'selected="selected"':'' %>>E-mail</option> 128 <!--<option value="sms" <%= data.event.alarms[i].type=='sms' ? 'selected="selected"':'' %>>SMS</option>--> 129 129 </select> 130 130 <input type="text" name="alarmTime[]" class="number input-small" value="<%= data.event.alarms[i].time %>"/>
Note: See TracChangeset
for help on using the changeset viewer.
