Changeset 5345

Timestamp:

01/10/12 14:27:44 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - (acoutinho) Correcoes de bugs e melhorias

Location:

trunk

Files:

• expressoCalendar/inc/class.adapter.inc.php (deleted)
• prototype/modules/calendar/index.php (modified) (2 diffs)
• prototype/modules/calendar/js/helpers.js (modified) (3 diffs)
• prototype/modules/calendar/templates/event_add.ejs (modified) (1 diff)

trunk/prototype/modules/calendar/index.php

@@ -153 +153 @@
                         $tabs.tabs('select', '#' + ui.panel.id);
                 },
+                remove: function( event, ui ) {
+                        $tabs.tabs('select', User.lastView);
+                },
                 show: function( event, ui ){
                         delete Calendar.currentViewKey;
@@ -165 +168 @@
         $tabs.find( "span.ui-icon-close" ).live( "click", function() {
                 var index = $( "li", $tabs ).index( $( this ).parent() );
+                if($tabs.tabs('option' ,'selected') == index){
+                        if($tabs.tabs("length") == 2 && User.lastView != 1)
+                                $tabs.tabs( "select", 0);
+                        $tabs.tabs( "select", User.lastView);
+                }
+                if($tabs.tabs('option' ,'selected') == 0 || $tabs.tabs('option' ,'selected') == 1)
+                        User.lastView = $tabs.tabs('option' ,'selected');
                 if(index != -1)
-                  $tabs.tabs( "remove", index );
-                if($tabs.tabs("length") == 2 && User.lastView != 1)
-                        $tabs.tabs( "select", 0);
-                $tabs.tabs( "select", User.lastView);
-                
-        });     
+                  $tabs.tabs( "remove", index );        
+                        
+                
+                });     
         $('.button.config-menu').button({
             icons: {

trunk/prototype/modules/calendar/js/helpers.js

@@ -1229 +1229 @@
         switch (view){
                 case 'day':
+                case 'basicDay':
                         var date = new Date().add({days: page_index});
                         return (weekOfDay(date.getDay()))+", "+(date.toString('dd MMM yyyy'));
+                case 'agendaWeek':
                 case 'week':
                         var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault));
@@ -1251 +1253 @@
                 $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($('[name = page_index]').val()),view)+'</h2>');
                 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active')
-                $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-'+((view == 'day' || view == 'week') ? 'agenda'+view : view )).addClass('fc-state-active');
+                if(view == 'basicDay')
+                        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-agendaday').addClass('fc-state-active');
+                else
+                        $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-'+((view == 'day' || view == 'week') ? 'agenda'+view : view )).addClass('fc-state-active');
                 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right').addClass('list-right');
                 $(currentView+' .header-paginator .fc-header-right .fc-button-agendaday').hover(
@@ -1362 +1367 @@
 function mountCriteriaList(view, page_index, calerdars_selecteds){
         switch (view){
+                case 'basicDay':
                 case 'day':
                         return {filter: ['AND', ['IN', 'calendar',  calerdars_selecteds], ['=', 'rangeEnd', new Date().add({days: page_index}).toString("yyyy-MM-dd")]], criteria: {order: 'startTime'}}; 
+                case 'agendaWeek':
                 case 'week':
                         var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault)); 

trunk/prototype/modules/calendar/templates/event_add.ejs

@@ -60 +60 @@
                 <p class="input-group">
                         <label for="calendar_addevent_details_txtarea_description" class="for-textarea" >Descrição</label>
-                        <textarea name="description" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> > <%= (data.event) ? data.event.description : '' %></textarea>
+                        <textarea name="description" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> ><%=(data.event) ? data.event.description : '' %></textarea>
                 </p>