Changeset 5345 for trunk/prototype/modules/calendar
- Timestamp:
- 01/10/12 14:27:44 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/index.php
r5341 r5345 153 153 $tabs.tabs('select', '#' + ui.panel.id); 154 154 }, 155 remove: function( event, ui ) { 156 $tabs.tabs('select', User.lastView); 157 }, 155 158 show: function( event, ui ){ 156 159 delete Calendar.currentViewKey; … … 165 168 $tabs.find( "span.ui-icon-close" ).live( "click", function() { 166 169 var index = $( "li", $tabs ).index( $( this ).parent() ); 170 if($tabs.tabs('option' ,'selected') == index){ 171 if($tabs.tabs("length") == 2 && User.lastView != 1) 172 $tabs.tabs( "select", 0); 173 $tabs.tabs( "select", User.lastView); 174 } 175 if($tabs.tabs('option' ,'selected') == 0 || $tabs.tabs('option' ,'selected') == 1) 176 User.lastView = $tabs.tabs('option' ,'selected'); 167 177 if(index != -1) 168 $tabs.tabs( "remove", index ); 169 if($tabs.tabs("length") == 2 && User.lastView != 1) 170 $tabs.tabs( "select", 0); 171 $tabs.tabs( "select", User.lastView); 172 173 }); 178 $tabs.tabs( "remove", index ); 179 180 181 }); 174 182 $('.button.config-menu').button({ 175 183 icons: { -
trunk/prototype/modules/calendar/js/helpers.js
r5341 r5345 1229 1229 switch (view){ 1230 1230 case 'day': 1231 case 'basicDay': 1231 1232 var date = new Date().add({days: page_index}); 1232 1233 return (weekOfDay(date.getDay()))+", "+(date.toString('dd MMM yyyy')); 1234 case 'agendaWeek': 1233 1235 case 'week': 1234 1236 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>'); 1252 1254 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active') 1253 $(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'); 1255 if(view == 'basicDay') 1256 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button-agendaday').addClass('fc-state-active'); 1257 else 1258 $(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'); 1254 1259 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right').addClass('list-right'); 1255 1260 $(currentView+' .header-paginator .fc-header-right .fc-button-agendaday').hover( … … 1362 1367 function mountCriteriaList(view, page_index, calerdars_selecteds){ 1363 1368 switch (view){ 1369 case 'basicDay': 1364 1370 case 'day': 1365 1371 return {filter: ['AND', ['IN', 'calendar', calerdars_selecteds], ['=', 'rangeEnd', new Date().add({days: page_index}).toString("yyyy-MM-dd")]], criteria: {order: 'startTime'}}; 1372 case 'agendaWeek': 1366 1373 case 'week': 1367 1374 var dateStart = new Date().moveToDayOfWeek(dayOfWeek(User.preferences.weekDefault)); -
trunk/prototype/modules/calendar/templates/event_add.ejs
r5341 r5345 60 60 <p class="input-group"> 61 61 <label for="calendar_addevent_details_txtarea_description" class="for-textarea" >Descrição</label> 62 <textarea name="description" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> > <%=(data.event) ? data.event.description : '' %></textarea>62 <textarea name="description" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> ><%=(data.event) ? data.event.description : '' %></textarea> 63 63 </p> 64 64
Note: See TracChangeset
for help on using the changeset viewer.