Fixes bug 1127938 - Update FullCalendar to latest version

linyngfly · Feb 3, 2015 · 701d586 · 701d586
1 parent c758fb8
commit 701d586
Show file tree

Hide file tree

Showing 12 changed files with 377 additions and 6,834 deletions.
diff --git a/airmozilla/base/static/js/libs/moment.min.js b/airmozilla/base/static/js/libs/moment.min.js
diff --git a/airmozilla/main/forms.py b/airmozilla/main/forms.py
@@ -1,5 +1,3 @@
-import datetime
-
 from django import forms
 
 from airmozilla.base.forms import BaseModelForm, BaseForm, GallerySelect
@@ -8,24 +6,8 @@
 
 class CalendarDataForm(BaseForm):
 
-    start = forms.IntegerField()
-    end = forms.IntegerField()
-
-    def clean_start(self):
-        try:
-            return datetime.datetime.fromtimestamp(
-                self.cleaned_data['start']
-            )
-        except ValueError as x:
-            raise forms.ValidationError(x)
-
-    def clean_end(self):
-        try:
-            return datetime.datetime.fromtimestamp(
-                self.cleaned_data['end']
-            )
-        except ValueError as x:
-            raise forms.ValidationError(x)
+    start = forms.DateTimeField()
+    end = forms.DateTimeField()
 
     def clean(self):
         cleaned_data = super(CalendarDataForm, self).clean()

diff --git a/airmozilla/main/static/main/css/calendar.css b/airmozilla/main/static/main/css/calendar.css
@@ -2,11 +2,11 @@ th.fc-day-header {
     font-family: "Open Sans Light","Lucida Sans","Lucida Grande","Lucida Sans Unicode",Verdana,sans-serif;
 }
 
-.fc-widget-header, .fc-widget-content {
+tr .fc-widget-header, tr .fc-widget-content {
     border: 1px solid rgb(101, 101, 101);
 }
 
-a.fc-event span, a.fc-event .fc-event-inner {
+.fc-time, .fc-title {
     color: white;
     font-size: 0.8em;
 }
@@ -15,6 +15,18 @@ a.fc-event span, a.fc-event .fc-event-inner {
     font-size: 1.7em;
 }
 
-.fc-state-highlight {
+.fc-today.fc-state-highlight {
     background-color: rgb(42, 49, 52);
 }
+
+.fc-widget-header table {
+    margin-bottom: 0;
+}
+
+button {
+    border-radius: 0;
+}
+
+button:hover {
+    box-shadow: none;
+}