diff --git a/README.md b/README.md index 6464447..f9e26b0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # coalio -Application for HackDance 2014 +~~Application for~~ Winner of HackDance 2014! ## Contributing @@ -34,6 +34,12 @@ eg: `vim ~/.virtualenvs/coalio/bin/postactivate` 1. This part’s easy: `./manage.py syncdb --migrate` enter a local admin username (email) and password if prompted. +### Load Static-page fixtures + +To load static pages (such as about; etc) you will need to load the static page fixtures: + +* `./manage.py loaddata apps/pages/fixtures/pages.json` + ### Let ‘er rip! 1. In the repo, run `./manage.py runserver` diff --git a/apps/coalio/settings/production.py b/apps/coalio/settings/production.py index d0017f6..f625650 100644 --- a/apps/coalio/settings/production.py +++ b/apps/coalio/settings/production.py @@ -2,7 +2,7 @@ from os import environ -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG DATABASES = { @@ -10,7 +10,6 @@ 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'coaliodb', 'USER': 'coalio', - #'PASSWORD': DB_PASS, 'HOST': '127.0.0.1', 'PORT': '5432', } diff --git a/apps/coalio/urls.py b/apps/coalio/urls.py index 95526be..ec14c3f 100644 --- a/apps/coalio/urls.py +++ b/apps/coalio/urls.py @@ -14,6 +14,7 @@ url(r'^$', 'profiles.views.home.login_view', name='home'), url(r'^profiles/', include('profiles.urls', namespace='profiles')), url(r'^accounts/login/$', 'profiles.views.home.login_view', name='login'), + url(r'^taggedposts/', include('tagger.urls', namespace='tagger')), url(r'^discussion/', include('discussions.urls', namespace='discussions')), url(r'^pages/', include('pages.urls', namespace='pages')), diff --git a/apps/discussions/admin.py b/apps/discussions/admin.py index d359e54..3c4af64 100644 --- a/apps/discussions/admin.py +++ b/apps/discussions/admin.py @@ -2,9 +2,13 @@ from django.contrib import admin -from discussions.models import Discussion +from discussions.models import Discussion, Reply class DiscussionAdmin(admin.ModelAdmin): model = Discussion +class ReplyAdmin(admin.ModelAdmin): + model = Reply + +admin.site.register(Reply, ReplyAdmin) admin.site.register(Discussion, DiscussionAdmin) \ No newline at end of file diff --git a/apps/discussions/forms.py b/apps/discussions/forms.py new file mode 100644 index 0000000..f426f5a --- /dev/null +++ b/apps/discussions/forms.py @@ -0,0 +1,14 @@ +#encoding=utf-8 + +from django import forms + +from models import Reply + +class ReplyForm(forms.ModelForm): + def __init__(self, *args, **kwargs): + super(ReplyForm, self).__init__(*args, **kwargs) + self.fields['content'].widget.attrs['class'] = 'form-control' + class Meta: + model = Reply + exclude = ('author', 'discussion') + diff --git a/apps/discussions/migrations/0002_auto__add_reply.py b/apps/discussions/migrations/0002_auto__add_reply.py new file mode 100644 index 0000000..63f0847 --- /dev/null +++ b/apps/discussions/migrations/0002_auto__add_reply.py @@ -0,0 +1,94 @@ +# -*- 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 'Reply' + db.create_table(u'discussions_reply', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('created_at', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('updated_at', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('content', self.gf('django.db.models.fields.TextField')()), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['profiles.CoalioUser'])), + ('discussion', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['discussions.Discussion'])), + )) + db.send_create_signal(u'discussions', ['Reply']) + + + def backwards(self, orm): + # Deleting model 'Reply' + db.delete_table(u'discussions_reply') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'discussions.discussion': { + 'Meta': {'object_name': 'Discussion'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'tagged_post': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['tagger.TaggedPost']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + u'discussions.reply': { + 'Meta': {'object_name': 'Reply'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['profiles.CoalioUser']"}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'discussion': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['discussions.Discussion']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + u'profiles.coaliouser': { + 'Meta': {'object_name': 'CoalioUser'}, + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_admin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'role': ('django.db.models.fields.CharField', [], {'default': "'peer'", 'max_length': '7'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}) + }, + u'tagger.taggedpost': { + 'Meta': {'object_name': 'TaggedPost'}, + 'bully_social_id': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200', 'blank': 'True'}), + 'content': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'ref_url': ('django.db.models.fields.URLField', [], {'max_length': '300'}), + 'tagged_by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['profiles.CoalioUser']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['discussions'] \ No newline at end of file diff --git a/apps/discussions/models.py b/apps/discussions/models.py index 5727d57..e3c6ac8 100644 --- a/apps/discussions/models.py +++ b/apps/discussions/models.py @@ -13,3 +13,16 @@ def __unicode__(self): def get_absolute_url(self): return reverse('discussions:view', args=[self.id]) + +class Reply(TimestampMixin): + content = models.TextField() + + author = models.ForeignKey('profiles.CoalioUser') + discussion = models.ForeignKey(Discussion) + + def __unicode__(self): + return "%s's reply in %s" % (self.author, self.discussion) + + def get_absolute_url(self): + return reverse('discussions:view', args=[self.id]) + diff --git a/apps/discussions/static/img/icon-128.png b/apps/discussions/static/img/icon-128.png new file mode 100644 index 0000000..060c0a5 Binary files /dev/null and b/apps/discussions/static/img/icon-128.png differ diff --git a/apps/discussions/static/img/icon-16.png b/apps/discussions/static/img/icon-16.png new file mode 100644 index 0000000..f3f51f2 Binary files /dev/null and b/apps/discussions/static/img/icon-16.png differ diff --git a/apps/discussions/static/img/icon-19.png b/apps/discussions/static/img/icon-19.png new file mode 100644 index 0000000..365846e Binary files /dev/null and b/apps/discussions/static/img/icon-19.png differ diff --git a/apps/discussions/static/img/icon-38.png b/apps/discussions/static/img/icon-38.png new file mode 100644 index 0000000..2f785da Binary files /dev/null and b/apps/discussions/static/img/icon-38.png differ diff --git a/apps/discussions/static/img/shirt.xcf b/apps/discussions/static/img/shirt.xcf new file mode 100644 index 0000000..0488502 Binary files /dev/null and b/apps/discussions/static/img/shirt.xcf differ diff --git a/apps/discussions/templates/discussions/_base.html b/apps/discussions/templates/discussions/_base.html index 704e82f..aecdc63 100644 --- a/apps/discussions/templates/discussions/_base.html +++ b/apps/discussions/templates/discussions/_base.html @@ -2,7 +2,7 @@ - Coalio {% block title %}{% endblock %} + Coal.io {% block title %}{% endblock %} @@ -48,19 +48,19 @@ - Coalio.co + YMCA Anti-Cyberbullying Project @@ -68,16 +68,19 @@
{% block body %} - {% endblock %} + {% endblock %}
-