--- a/gcalendar/forms.py	Tue Dec 08 17:32:31 2015 -0600
+++ b/gcalendar/forms.py	Tue Dec 08 21:39:19 2015 -0600
@@ -5,6 +5,9 @@
 import pytz
 from django import forms
 
+from core.html import ImageCheckError
+from core.html import image_check
+from core.markup import site_markup
 from gcalendar.models import Event
 
 
@@ -68,8 +71,12 @@
     end_time = forms.TimeField(required=False, widget=forms.Select(choices=TIME_CHOICES))
     time_zone = forms.CharField(required=False, widget=forms.HiddenInput())
     where = forms.CharField(required=False, widget=forms.TextInput(attrs={'size': 60}))
-    description = forms.CharField(required=False,
-            widget=forms.Textarea(attrs={'class': 'markItUp smileyTarget'}))
+    description = forms.CharField(
+            required=False,
+            widget=forms.Textarea(attrs={
+                'class': 'markItUp smileyTarget',
+                'id': 'id_body',    # needed for image related js
+                }))
 
     DATE_FORMAT = '%m/%d/%Y'    # must match the jQuery UI datepicker config
     TIME_FORMAT = '%H:%M'
@@ -116,6 +123,17 @@
         if instance is not None:
             del self.fields['create_forum_thread']
 
+    def clean_description(self):
+        description = self.cleaned_data['description']
+        self.html = None
+        if description:
+            self.html = site_markup(description, relative_urls=False)
+            try:
+                image_check(self.html)
+            except ImageCheckError as ex:
+                raise forms.ValidationError(str(ex))
+        return description
+
     def clean(self):
         start_date = self.cleaned_data.get('start_date')
         start_time = self.cleaned_data.get('start_time')