Made changes suggested by Nina

umonya/requirements.txt

@@ -1,6 +1,4 @@
 Django==1.5.1
-Pillow-PIL
-gdata==2.0.18
-httplib2==0.8
-oauth2client==1.1
-python-gflags==2.0
+django-recaptcha==0.0.6
+Pillow==2.0.0
+South==0.8.1

umonya/umonya/apps/main/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Announcement, About, Page, Registration, Dynamic_Section
+from models import Announcement, About, Page, Registration
 
 #~ Ensuring that admin is aware of this class
 
@@ -14,4 +14,3 @@ class AnnouncementAdmin(admin.ModelAdmin):
 admin.site.register(About)
 admin.site.register(Page)
 admin.site.register(Registration)
-admin.site.register(Dynamic_Section)

umonya/umonya/apps/main/context_processors.py

@@ -1,7 +1,8 @@
 def dynamic_menu(request):
     # Adds Dynamic Menu Template Context
-    from models import Dynamic_Section
+    from models import Registration
     try:
-        return{"registration": Dynamic_Section.objects.get(section="registration")}
-    except:
-        return {"registration": False}
+        Registration.objects.get(pk=1)
+        return{"registration_open": True}
+    except Registration.DoesNotExist:
+        return {"registration_open": False}

umonya/umonya/apps/main/forms.py

@@ -1,35 +1,5 @@
 from django import forms
-from models import Registration
-
-
-class RegistrationForm(forms.Form):
-    questions = Registration.objects.all().order_by("priority")
-    for item in questions:
-        required = ""
-        if item.required:
-            required = "required"
-
-        if item.field_type == "CharField":
-            vars()[item.name] = forms.CharField(label=item.text,
-                                                required=item.required,
-                                                widget=forms.TextInput(attrs={"class": required,
-                                                                       required: ""}))
-        elif item.field_type == "EmailField":
-            vars()[item.name] = forms.EmailField(label=item.text,
-                                                 required=item.required,
-                                                 widget=forms.TextInput(attrs={"class": required,
-                                                                        required: "",
-                                                                        "type": "email"}))
-        elif item.field_type == "IntegerField":
-            vars()[item.name] = forms.IntegerField(label=item.text,
-                                                   required=item.required,
-                                                   widget=forms.TextInput(attrs={"class": required +
-                                                                          "digits", required: ""}))
-        elif item.field_type == "TextField":
-            vars()[item.name] = forms.CharField(label=item.text,
-                                                required=item.required,
-                                                widget=forms.Textarea(attrs={"class": required,
-                                                                      required: ""}))
+from captcha.fields import ReCaptchaField
 
 
 class ContactForm(forms.Form):
@@ -43,3 +13,5 @@ class ContactForm(forms.Form):
 
     text = forms.CharField(label="Talk to us",
                            widget=forms.Textarea(attrs={}))
+
+    captcha = ReCaptchaField()

umonya/umonya/apps/main/migrations/0001_initial.py

@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Announcement'
+        db.create_table(u'main_announcement', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(unique=True, max_length=200)),
+            ('body', self.gf('django.db.models.fields.TextField')()),
+            ('pub_date', self.gf('django.db.models.fields.DateField')(default=datetime.datetime(2013, 7, 22, 0, 0))),
+            ('event_date', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2013, 7, 22, 0, 0))),
+            ('venue', self.gf('django.db.models.fields.CharField')(max_length=300, blank=True)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(max_length=50)),
+        ))
+        db.send_create_signal(u'main', ['Announcement'])
+
+        # Adding model 'About'
+        db.create_table(u'main_about', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=200)),
+            ('bios', self.gf('django.db.models.fields.TextField')()),
+            ('bios_photo', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
+            ('pub_date', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal(u'main', ['About'])
+
+        # Adding model 'Page'
+        db.create_table(u'main_page', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('page', self.gf('django.db.models.fields.CharField')(max_length=200)),
+            ('content', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal(u'main', ['Page'])
+
+        # Adding model 'Dynamic_Section'
+        db.create_table(u'main_dynamic_section', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('section', self.gf('django.db.models.fields.CharField')(max_length=200)),
+            ('enabled', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal(u'main', ['Dynamic_Section'])
+
+        # Adding model 'Contact'
+        db.create_table(u'main_contact', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal(u'main', ['Contact'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Announcement'
+        db.delete_table(u'main_announcement')
+
+        # Deleting model 'About'
+        db.delete_table(u'main_about')
+
+        # Deleting model 'Page'
+        db.delete_table(u'main_page')
+
+        # Deleting model 'Dynamic_Section'
+        db.delete_table(u'main_dynamic_section')
+
+        # Deleting model 'Contact'
+        db.delete_table(u'main_contact')
+
+
+    models = {
+        u'main.about': {
+            'Meta': {'object_name': 'About'},
+            'bios': ('django.db.models.fields.TextField', [], {}),
+            'bios_photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'pub_date': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        u'main.announcement': {
+            'Meta': {'ordering': "['-pub_date']", 'object_name': 'Announcement'},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'event_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 7, 22, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pub_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 7, 22, 0, 0)'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'venue': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'})
+        },
+        u'main.contact': {
+            'Meta': {'object_name': 'Contact'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        u'main.dynamic_section': {
+            'Meta': {'object_name': 'Dynamic_Section'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.page': {
+            'Meta': {'object_name': 'Page'},
+            'content': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['main']

umonya/umonya/apps/main/migrations/0002_auto__del_field_about_pub_date.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'About.pub_date'
+        db.delete_column(u'main_about', 'pub_date')
+
+
+    def backwards(self, orm):
+        # Adding field 'About.pub_date'
+        db.add_column(u'main_about', 'pub_date',
+                      self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2013, 7, 22, 0, 0)),
+                      keep_default=False)
+
+
+    models = {
+        u'main.about': {
+            'Meta': {'object_name': 'About'},
+            'bios': ('django.db.models.fields.TextField', [], {}),
+            'bios_photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.announcement': {
+            'Meta': {'ordering': "['-pub_date']", 'object_name': 'Announcement'},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'event_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 7, 22, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pub_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 7, 22, 0, 0)'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'venue': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'})
+        },
+        u'main.contact': {
+            'Meta': {'object_name': 'Contact'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        u'main.dynamic_section': {
+            'Meta': {'object_name': 'Dynamic_Section'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.page': {
+            'Meta': {'object_name': 'Page'},
+            'content': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        }
+    }
+
+    complete_apps = ['main']

umonya/umonya/apps/main/migrations/0003_auto__del_contact__add_registration.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'Contact'
+        db.delete_table(u'main_contact')
+
+        # Adding model 'Registration'
+        db.create_table(u'main_registration', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('form_code', self.gf('django.db.models.fields.CharField')(max_length=500)),
+        ))
+        db.send_create_signal(u'main', ['Registration'])
+
+
+    def backwards(self, orm):
+        # Adding model 'Contact'
+        db.create_table(u'main_contact', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal(u'main', ['Contact'])
+
+        # Deleting model 'Registration'
+        db.delete_table(u'main_registration')
+
+
+    models = {
+        u'main.about': {
+            'Meta': {'object_name': 'About'},
+            'bios': ('django.db.models.fields.TextField', [], {}),
+            'bios_photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.announcement': {
+            'Meta': {'ordering': "['-pub_date']", 'object_name': 'Announcement'},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'event_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 7, 23, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pub_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 7, 23, 0, 0)'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'venue': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'})
+        },
+        u'main.dynamic_section': {
+            'Meta': {'object_name': 'Dynamic_Section'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.page': {
+            'Meta': {'object_name': 'Page'},
+            'content': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.registration': {
+            'Meta': {'object_name': 'Registration'},
+            'form_code': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['main']

umonya/umonya/apps/main/migrations/0004_auto__chg_field_registration_form_code.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Registration.form_code'
+        db.alter_column(u'main_registration', 'form_code', self.gf('django.db.models.fields.URLField')(max_length=500))
+
+    def backwards(self, orm):
+
+        # Changing field 'Registration.form_code'
+        db.alter_column(u'main_registration', 'form_code', self.gf('django.db.models.fields.CharField')(max_length=500))
+
+    models = {
+        u'main.about': {
+            'Meta': {'object_name': 'About'},
+            'bios': ('django.db.models.fields.TextField', [], {}),
+            'bios_photo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.announcement': {
+            'Meta': {'ordering': "['-pub_date']", 'object_name': 'Announcement'},
+            'body': ('django.db.models.fields.TextField', [], {}),
+            'event_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 7, 23, 0, 0)'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pub_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 7, 23, 0, 0)'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'venue': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'})
+        },
+        u'main.dynamic_section': {
+            'Meta': {'object_name': 'Dynamic_Section'},
+            'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.page': {
+            'Meta': {'object_name': 'Page'},
+            'content': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'page': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'main.registration': {
+            'Meta': {'object_name': 'Registration'},
+            'form_code': ('django.db.models.fields.URLField', [], {'max_length': '500'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        }
+    }
+
+    complete_apps = ['main']