Changeset 5835
- Timestamp:
- 03/27/12 16:43:45 (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r5804 r5835 3285 3285 //$.ajax({ url: "../expressoCalendar/index.php", async: false}); 3286 3286 //$.ajax({url: "../prototype/modules/calendar/js/calendar.date.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3287 $.ajax({url: "../prototype/modules/calendar/js/map.disponibility.js", async: false, beforeSend: function( xhr ) { 3288 $.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false, beforeSend: function( xhr ) { 3287 $.ajax({url: "../prototype/modules/calendar/js/map.disponibility.js", async: false, beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3288 $.ajax({url: "../prototype/modules/calendar/js/helpers.js", async: false, beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3289 3289 //$.ajax({ url: "../prototype/modules/calendar/js/timezone.js", async: false}); 3290 3290 //$.ajax({ url: "../prototype/modules/calendar/js/calendar.codecs.js", async: false}); 3291 $.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false, beforeSend: function( xhr ) { 3291 $.ajax({url: "../prototype/plugins/encoder/encoder.js", async: false, beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3292 3292 //$.ajax({url: "../prototype/plugins/dateFormat/dateFormat.js", async: false, beforeSend: function( xhr ) { xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3293 3293 3294 $.ajax({ url: "../prototype/plugins/fullcalendar/fullcalendar.js", async: false , beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}});3294 $.ajax({url: "../prototype/plugins/fullcalendar/fullcalendar.js", async: false , beforeSend: function( xhr ) {xhr.overrideMimeType('text/javascript; charset=ISO-8859-1')}}); 3295 3295 3296 3296 … … 3417 3417 }); 3418 3418 return; 3419 break; 3420 case 4: 3421 alert('Seu evento já se encontra atualizado'); 3422 return; 3423 break; 3424 case 5: 3425 $.ajax({ 3426 url: "controller.php?action="+import_url+'&from_ajax=true&selected=true', 3427 success: function(msg){ 3428 alert( ( ( connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" ); 3429 } 3430 }); 3431 return; 3432 break; 3419 break; 3433 3420 case 6: 3434 3421 var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?"); … … 3456 3443 3457 3444 $.ajax({ 3458 url: "controller.php?action="+import_url+'&from_ajax=true&selected='+ $("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),3445 url: "controller.php?action="+import_url+'&from_ajax=true&selected='+ (parseInt(typeImport) == 5 || parseInt(typeImport) == 4 ? 'true' : $("#select-agenda option:selected").val()) +'&status='+$("#select-status option:selected").val(), 3459 3446 success: function(msg){ 3460 3447 alert( ( (msg = connector.unserialize(msg)) == "ok") ? "Atualizado com sucesso para " : "Ocorreu um erro ao atualizar o evento" ); -
trunk/prototype/modules/calendar/css/layout.css
r5788 r5835 623 623 624 624 .events-list-win.empty { 625 line-height: 270px;626 text-align: center;627 625 width: 100%; 626 } 627 628 .events-list-win.empty table.header-paginator{ 629 margin-bottom: 80px; 630 } 631 632 .events-list-win.empty label.empty-result{ 633 margin: 0 0 0 290px; 628 634 } 629 635 -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r5807 r5835 745 745 if( !repeat ) 746 746 return( false ); 747 if(typeof(repeat) == "object") 748 return repeat; 747 749 748 750 return DataLayer.get( 'repeat', repeat ); … … 837 839 if( !notArray ){ 838 840 var dates = {}; 841 var typeRepeat = {'none': false, 842 'daily': 'Repetição diária', 843 'weekly': 'Repetição semanal', 844 'monthly': 'Repetição mensal', 845 'yearly': 'repetição anual'} 839 846 840 847 for (var i=0; i < res.length; i++) { … … 858 865 859 866 var res2 = $.extend( {}, res[i], {'startDate': currentDate.toString( User.preferences.dateFormat ), 'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat ) } ); 867 868 869 870 871 res2.repeat = typeRepeat[res[i].repeat.frequency]; 860 872 861 873 while (counter.compareTo( currentDate ) == 0) { -
trunk/prototype/modules/calendar/js/helpers.js
r5752 r5835 370 370 } 371 371 372 DataLayer.render( 'templates/event_repeat.ejs', {event:objEvent}, function( repeatHtml ){372 DataLayer.render( path+'templates/event_repeat.ejs', {event:objEvent}, function( repeatHtml ){ 373 373 374 374 UI.dialogs.addEvent.find('#calendar_addevent_details3').html(repeatHtml); … … 2130 2130 '<input type="hidden" name="page_index" value="'+page_index+'"></inpunt>'+ 2131 2131 '<input type="hidden" name="keyword" value="'+keyword+'"></inpunt>'+ 2132 '<label >Não foram encontrados eventos neste intervalo.</label>' +2132 '<label class="empty-result">Não foram encontrados eventos neste intervalo.</label>' + 2133 2133 '</div>' 2134 2134 ); -
trunk/prototype/modules/calendar/templates/event_list.ejs
r5409 r5835 108 108 </p> 109 109 <%}%> 110 <p class="input-group"> 111 <label>Repete em</label> 110 <%if(_event.repeat ){%> 111 <p class="input-group"> 112 <label>Repetição</label> 112 113 <span><%= _event.repeat %></span> 113 </p> 114 </p> 115 <%}%> 114 116 <p class="input-group"> 115 117 <label>Lembretes</label> -
trunk/prototype/services/iCal.php
r5804 r5835 218 218 else 219 219 { 220 220 221 if( self::_getTime($component , 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty( 'sequence' , false , false ) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento 221 222 $interation = self::_makeVEVENT($schedulable , $component , $params); … … 225 226 //Aparentemente é para retornar um ical com o evento atualizado para o attende 226 227 } 228 if(isset($params['status'])) 229 { 230 $pID = self::_getParticipantByMail( Config::me('mail') , $schedulable['participants'] ); 231 $interation['participant://'.$pID]['status'] = $params['status']; 232 } 227 233 } 228 234
Note: See TracChangeset
for help on using the changeset viewer.