Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
mkonecny 2011-02-02 11:22:29 -05:00
commit f413838cde
2 changed files with 41 additions and 8 deletions

View File

@ -21,6 +21,42 @@ function dayClick(date, allDay, jsEvent, view) {
var x;
}
function viewDisplay( view ) {
if(view.name === 'agendaDay' || view.name === 'agendaWeek') {
var select = $('.schedule_change_slots');
var calendarEl = this;
if(select.length === 0) {
select = $('<select class="schedule_change_slots"/>')
.append('<option value="5">5 min</option>')
.append('<option value="10">10 min</option>')
.append('<option value="15">15 min</option>')
.append('<option value="30">30 min</option>')
.append('<option value="60">60 min</option>')
.change(function(){
var x = $(this).val();
var opt = view.calendar.options;
opt.slotMinutes = parseInt(x);
opt.events = getFullCalendarEvents;
$(calendarEl).fullCalendar('destroy');
$(calendarEl).fullCalendar(opt);
});
$('.fc-header-left tbody tr:first')
.append('<td><span class="fc-header-space"></span></td>')
.append('<td></td>')
.find('td:last')
.append(select);
var slotMin = view.calendar.options.slotMinutes;
$('.schedule_change_slots option[value="'+slotMin+'"]').attr('selected', 'selected');
}
}
}
function eventRender(event, element, view) {
//element.qtip({
// content: event.description

View File

@ -190,7 +190,8 @@ function scheduleRefetchEvents() {
$("#schedule_calendar").fullCalendar( 'refetchEvents' );
}
$(document).ready(function() {
$(window).load(function() {
var mainHeight = document.documentElement.clientHeight - 200 - 50;
$('#schedule_calendar').fullCalendar({
header: {
@ -206,10 +207,12 @@ $(document).ready(function() {
agenda: 'H:mm{ - H:mm}',
month: 'H:mm{ - H:mm}'
},
contentHeight: mainHeight,
events: getFullCalendarEvents,
//callbacks (in full-calendar-functions.js)
viewDisplay: viewDisplay,
dayClick: dayClick,
eventRender: eventRender,
eventAfterRender: eventAfterRender,
@ -219,12 +222,6 @@ $(document).ready(function() {
eventDrop: eventDrop,
eventResize: eventResize
});
});
$(window).load(function() {
var mainHeight = document.documentElement.clientHeight - 200 - 50;
$('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight);
$('#schedule_calendar').fullCalendar('render');
});