Merge branch 'master' into fullcalendar

Conflicts:
	apps/calendar/index.php

diff --cc apps/calendar/index.php
index 2442d27db492cec71ccc5218b23ee3cfdf2bf184,8b8ac72958846de6f44250408ab9b04e3f112f2c..e5326d26e970ee324e7122c32a1f114d12098c7c
--- 1/apps/calendar/index.php
--- 2/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@@ -10,33 -10,15 +10,33 @@@ require_once ('../../lib/base.php')
  OC_Util::checkLoggedIn();
  OC_Util::checkAppEnabled('calendar');
  // Create default calendar ...
 -$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
 +$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
  if( count($calendars) == 0){
-       OC_Calendar_Calendar::addCalendar(OC_User::getUser(),'default','Default calendar');
+       OC_Calendar_Calendar::addCalendar(OC_User::getUser(),'Default calendar');
 -      $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
 +      $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
  }
 -OC_UTIL::addScript('calendar', 'calendar');
 -OC_UTIL::addStyle('calendar', 'style');
 -OC_UTIL::addScript('', 'jquery.multiselect');
 -OC_UTIL::addStyle('', 'jquery.multiselect');
 -OC_APP::setActiveNavigationEntry('calendar_index');
 -$output = new OC_TEMPLATE('calendar', 'calendar', 'user');
 -$output -> printPage();
 +$eventSources = array();
 +foreach($calendars as $calendar){
 +      $eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
 +}
 +//Fix currentview for fullcalendar
 +if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){
 +      OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "agendaWeek");
 +}
 +if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "onemonthview"){
 +      OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "month");
 +}
 +if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
 +      OC_Preferences::setValue(OC_USER::getUser(), "calendar", "currentview", "list");
 +}
 +
 +OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar');
 +OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
 +OC_Util::addScript('calendar', 'calendar');
 +OC_Util::addStyle('calendar', 'style');
 +OC_Util::addScript('', 'jquery.multiselect');
 +OC_Util::addStyle('', 'jquery.multiselect');
 +OC_App::setActiveNavigationEntry('calendar_index');
 +$tmpl = new OC_Template('calendar', 'calendar', 'user');
 +$tmpl->assign('eventSources', $eventSources);
 +$tmpl->printPage();