{{ event.title }}
- {% if event.main_image %}
+ This is not a KCDC event. It is produced by another organization. + We include it because we think that it will be of interest to our students. +
+ {% endif %} + {% if event.documentation %}Documentation
{{ event.documentation|safe }} @@ -67,6 +87,7 @@Additional meetings
{% endif %}Location
+ {% if event.location_text %}{{ event.location_text|safe }}
{% endif %}
{% ifnotequal event.location.name event.location.address1 %}{{ event.location.name }}
{% endifnotequal %}
{% if event.location.address1 and event.location.show_exact %}
@@ -95,8 +116,8 @@
Past event
{% elif event.registration_status == "HIDE" %} {% else %} - {% if event.registration_status == "AUTO" %} -Registration is not yet open.
+ {% if event.registration_status == "AUTO" and not event.is_registration_open %} +Registration for this class opens {{ event.registration_opens|date:"l, j F, P" }}
{% elif event.registration_status == "PREVENT" %}Registration is closed.
{% elif registration_count >= event.max_students %} @@ -105,7 +126,7 @@This class is full, but there is a waitlist available.
{% else %}This class is full.
{% endif %} - {% else %} + {% else%}Register
{% endif %} {% endif %} @@ -166,10 +187,14 @@Register
diff --git a/kcdc3/templates/classes/event_list.html b/kcdc3/apps/classes/templates/classes/event_list.html similarity index 64% rename from kcdc3/templates/classes/event_list.html rename to kcdc3/apps/classes/templates/classes/event_list.html index 6401673e..c439bb26 100644 --- a/kcdc3/templates/classes/event_list.html +++ b/kcdc3/apps/classes/templates/classes/event_list.html @@ -1,12 +1,18 @@ {% extends "classes/event_base.html" %} +{% load pinata_filters %} + {% block title %} / Classes and Events{% endblock %} {% block content %}Classes + Events
-As always, KCDC classes are free – and they fill up fast!
+ {% for session in selected_session %} + {% if forloop.last %} +{{ session.kicker|safe }}
+ {% endif %} + {% endfor %}
@@ -43,33 +49,45 @@
+
{% endif %}
+
{{ event.summary|safe }}
+
+
{% endif %}
{{ event.summary|safe }}
@@ -139,9 +166,11 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/kcdc3/templates/classes/event_session.html b/kcdc3/apps/classes/templates/classes/event_session.html
similarity index 100%
rename from kcdc3/templates/classes/event_session.html
rename to kcdc3/apps/classes/templates/classes/event_session.html
diff --git a/kcdc3/templates/classes/facilitator_event_detail.html b/kcdc3/apps/classes/templates/classes/facilitator_event_detail.html
similarity index 89%
rename from kcdc3/templates/classes/facilitator_event_detail.html
rename to kcdc3/apps/classes/templates/classes/facilitator_event_detail.html
index 47ea948c..c140c5cb 100644
--- a/kcdc3/templates/classes/facilitator_event_detail.html
+++ b/kcdc3/apps/classes/templates/classes/facilitator_event_detail.html
@@ -16,6 +16,9 @@
+
+
+
+{% endblock %}
+
diff --git a/kcdc3/apps/classes/templates/classes/staff_session_list.html b/kcdc3/apps/classes/templates/classes/staff_session_list.html
new file mode 100644
index 00000000..e8f88608
--- /dev/null
+++ b/kcdc3/apps/classes/templates/classes/staff_session_list.html
@@ -0,0 +1,68 @@
+{% extends "classes/staff.html" %}
+
+
+{% block content %}
+
+
+ +
+
+
+
+ + + + +{% endblock %} + diff --git a/kcdc3/apps/classes/templates/classes/staff_teacher_list.html b/kcdc3/apps/classes/templates/classes/staff_teacher_list.html new file mode 100644 index 00000000..c6ddabce --- /dev/null +++ b/kcdc3/apps/classes/templates/classes/staff_teacher_list.html @@ -0,0 +1,72 @@ + + +{% block content %} + +
+
+
+
+ + {% for bio in teacher_list %} + {{ bio.get_email }}, + {% endfor %} + + + +{% endblock %} + diff --git a/kcdc3/classes/tests.py b/kcdc3/apps/classes/tests.py similarity index 100% rename from kcdc3/classes/tests.py rename to kcdc3/apps/classes/tests.py diff --git a/kcdc3/apps/classes/urls.py b/kcdc3/apps/classes/urls.py new file mode 100644 index 00000000..d1c5491d --- /dev/null +++ b/kcdc3/apps/classes/urls.py @@ -0,0 +1,20 @@ +from django.conf.urls import patterns, include, url +from models import Event, Registration +from views import EventListView, EventDetailView, ResponseTemplateView, EventArchiveView, SessionView, RegistrationListView, SessionAdminListView, TeacherAdminListView, FilteredTeacherAdminListView + +urlpatterns = patterns('kcdc3.apps.classes.views', + + url(r'^$', EventListView.as_view()), + url(r'^staff/$', SessionAdminListView.as_view()), + url(r'^staff/teachers/$', TeacherAdminListView.as_view()), + url(r'^staff/teachers/session/(?P[A-Za-z0-9_-]+)/$', FilteredTeacherAdminListView.as_view()),
+ url(r'^staff/registrations/session/(?P[A-Za-z0-9_-]+)/$', RegistrationListView.as_view()),
+ url(r'^(?P[0-9_-]+)/$', EventArchiveView.as_view()),
+ url(r'^(?P[0-9_-]+)/background/$', SessionView.as_view()),
+ url(r'^response/(?P[A-Za-z0-9_-]+)$', ResponseTemplateView.as_view()),
+ url(r'^(?P[A-Za-z0-9_-]+)/$', EventDetailView.as_view(model=Event,)),
+ url(r'^(?P[A-Za-z0-9_-]+)/register$', 'register'),
+ url(r'^(?P[A-Za-z0-9_-]+)/cancel$', 'cancel'),
+ url(r'^(?P[A-Za-z0-9_-]+)/facilitator$', 'facilitator'),
+
+)
diff --git a/kcdc3/classes/views.py b/kcdc3/apps/classes/views.py
similarity index 78%
rename from kcdc3/classes/views.py
rename to kcdc3/apps/classes/views.py
index bb05846e..1aace5c6 100644
--- a/kcdc3/classes/views.py
+++ b/kcdc3/apps/classes/views.py
@@ -1,8 +1,8 @@
-from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
+from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, Http404
from django.shortcuts import render_to_response
from datetime import datetime
from django.views.generic import DetailView, TemplateView, ListView
-from classes.models import Event, Registration, Bio, Session
+from models import Event, Registration, Bio, Session
from django.core.mail import send_mail
from django.template.loader import render_to_string
from django.template import Context
@@ -82,7 +82,7 @@ class EventDetailView(DetailView):
model = Event
def get_context_data(self, **kwargs):
-
+
context = super(EventDetailView, self).get_context_data(**kwargs)
# get list of sessions for use in local navigation
@@ -95,7 +95,7 @@ def get_context_data(self, **kwargs):
user = None
event = self.get_object()
-
+
context['registration_count'] = event.registration_count()
context['waitlist_count'] = event.waitlist_count()
context['user_is_waitlisted'] = is_waitlisted(user, event)
@@ -108,7 +108,10 @@ def get_context_data(self, **kwargs):
if Event.objects.filter(slug=self.object.slug, facilitators=self.request.user).count() > 0 or self.request.user.is_staff:
context['show_facilitator'] = True
- return context
+ if event.status == 'PUBLISHED' or event.status == 'HIDDEN':
+ return context
+ else:
+ raise Http404
@@ -233,6 +236,7 @@ def facilitator(request, slug):
# display a list of registrations for a given session
class RegistrationListView(ListView):
+ template_name = "classes/staff_registration_list.html"
context_object_name = "registration_list"
model = Registration
@@ -251,4 +255,77 @@ def get_context_data(self, **kwargs):
@method_decorator(login_required)
def dispatch(self, *args, **kwargs):
return super(RegistrationListView, self).dispatch(*args, **kwargs)
-
\ No newline at end of file
+
+
+
+
+# display a list of registrations for a given session
+class SessionAdminListView(ListView):
+
+ template_name = "classes/staff_session_list.html"
+ context_object_name = "session_list"
+ model = Session
+
+ def get_context_data(self, **kwargs):
+
+ context = super(SessionAdminListView, self).get_context_data(**kwargs)
+ context['session_list'] = Session.objects.all()
+
+ # is the user staff?
+ if self.request.user.is_staff:
+ return context
+ else:
+ # TODO this should really return a 403
+ return HttpResponse()
+
+ @method_decorator(login_required)
+ def dispatch(self, *args, **kwargs):
+ return super(SessionAdminListView, self).dispatch(*args, **kwargs)
+
+
+
+
+
+# display a list of teacher (bios) in the system
+class TeacherAdminListView(ListView):
+
+ template_name = "classes/staff_teacher_list.html"
+ context_object_name = "teacher_list"
+ model = Bio
+
+ def get_context_data(self, **kwargs):
+
+ context = super(TeacherAdminListView, self).get_context_data(**kwargs)
+ context['teacher_list'] = Bio.objects.all().order_by('name')
+
+ # is the user staff?
+ if self.request.user.is_staff:
+ return context
+ else:
+ # TODO this should really return a 403
+ return HttpResponse()
+
+ @method_decorator(login_required)
+ def dispatch(self, *args, **kwargs):
+ return super(TeacherAdminListView, self).dispatch(*args, **kwargs)
+
+
+
+
+class FilteredTeacherAdminListView(TeacherAdminListView):
+
+ def get_context_data(self, **kwargs):
+
+ context = super(TeacherAdminListView, self).get_context_data(**kwargs)
+ context['teacher_list'] = Bio.objects.filter(event__session__slug__iexact=self.kwargs['slug']).order_by('name')
+
+ # is the user staff?
+ if self.request.user.is_staff:
+ return context
+ else:
+ # TODO this should really return a 403
+ return HttpResponse()
+
+ # if self.kwargs['slug'] is not None:
+ # context['teacher_list'] = Bio.objects.filter(name__contains="teacher")
+
diff --git a/kcdc3/apps/pigeon/__init__.py b/kcdc3/apps/pigeon/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/kcdc3/apps/pigeon/admin.py b/kcdc3/apps/pigeon/admin.py
new file mode 100644
index 00000000..e30e6923
--- /dev/null
+++ b/kcdc3/apps/pigeon/admin.py
@@ -0,0 +1,50 @@
+from models import Post
+from kcdc3.apps.classes.models import Bio
+from django import forms
+from django.contrib import admin
+from django.contrib.admin.sites import site
+from django.contrib.admin.widgets import ManyToManyRawIdWidget
+from django.core.urlresolvers import reverse
+from django.utils.encoding import smart_unicode
+from django.utils.html import escape
+
+
+
+class PostAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title', 'slug', 'department_label', ('date', 'author',), ('status', 'featured',),
+ ]}),
+ ('Text', {
+ 'classes': ('grp-collapse grp-open',),
+ 'fields': [
+ 'thumbnail',
+ 'teaser',
+ 'main_text',
+ ]}),
+ ('Tags and comments', {
+ 'classes': ('grp-collapse grp-open',),
+ 'fields': [
+ 'tags',
+ 'allow_comments',
+ ]}),
+ ]
+
+ prepopulated_fields = {"slug": ("title",)}
+ raw_id_fields = ['author']
+ related_lookup_fields = {
+ 'm2m': ['author'],
+ }
+
+ list_display = ('title', 'date', 'status', 'featured', 'allow_comments', 'tags',)
+ list_editable = ('status', 'featured',)
+
+ class Media:
+ js = [
+ 'tiny_mce/tiny_mce.js',
+ 'tinymce_setup.js',
+ ]
+
+admin.site.register(Post, PostAdmin)
+
diff --git a/kcdc3/apps/pigeon/migrations/0001_initial.py b/kcdc3/apps/pigeon/migrations/0001_initial.py
new file mode 100644
index 00000000..28fe703c
--- /dev/null
+++ b/kcdc3/apps/pigeon/migrations/0001_initial.py
@@ -0,0 +1,116 @@
+# -*- 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 'Post'
+ db.create_table('pigeon_post', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50)),
+ ('status', self.gf('django.db.models.fields.CharField')(default='CURRENT', max_length=9)),
+ ('featured', self.gf('django.db.models.fields.BooleanField')(default=False)),
+ ('date', self.gf('django.db.models.fields.DateTimeField')()),
+ ('thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
+ ('teaser', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('tags', self.gf('django.db.models.fields.CharField')(max_length=128, blank=True)),
+ ('allow_comments', self.gf('django.db.models.fields.BooleanField')(default=True)),
+ ))
+ db.send_create_signal('pigeon', ['Post'])
+
+ # Adding M2M table for field author on 'Post'
+ db.create_table('pigeon_post_author', (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('post', models.ForeignKey(orm['pigeon.post'], null=False)),
+ ('bio', models.ForeignKey(orm['classes.bio'], null=False))
+ ))
+ db.create_unique('pigeon_post_author', ['post_id', 'bio_id'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'Post'
+ db.delete_table('pigeon_post')
+
+ # Removing M2M table for field author on 'Post'
+ db.delete_table('pigeon_post_author')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ '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': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'classes.bio': {
+ 'Meta': {'object_name': 'Bio'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'role': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'role'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['classes.Role']"}),
+ 'staff_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'user'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+ },
+ 'classes.role': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Role'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '48'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'})
+ },
+ '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'}),
+ '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'})
+ },
+ 'pigeon.post': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'Post'},
+ 'allow_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'author': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'author'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['classes.Bio']"}),
+ 'date': ('django.db.models.fields.DateTimeField', [], {}),
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'tags': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pigeon']
\ No newline at end of file
diff --git a/kcdc3/apps/pigeon/migrations/0002_auto__add_field_post_department_label.py b/kcdc3/apps/pigeon/migrations/0002_auto__add_field_post_department_label.py
new file mode 100644
index 00000000..ac84eab1
--- /dev/null
+++ b/kcdc3/apps/pigeon/migrations/0002_auto__add_field_post_department_label.py
@@ -0,0 +1,96 @@
+# -*- 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 field 'Post.department_label'
+ db.add_column('pigeon_post', 'department_label',
+ self.gf('django.db.models.fields.TextField')(default='', blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'Post.department_label'
+ db.delete_column('pigeon_post', 'department_label')
+
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ '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': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'classes.bio': {
+ 'Meta': {'object_name': 'Bio'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'role': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'role'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['classes.Role']"}),
+ 'staff_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'user'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+ },
+ 'classes.role': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Role'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '48'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'})
+ },
+ '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'}),
+ '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'})
+ },
+ 'pigeon.post': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'Post'},
+ 'allow_comments': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'author': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'author'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['classes.Bio']"}),
+ 'date': ('django.db.models.fields.DateTimeField', [], {}),
+ 'department_label': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'tags': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pigeon']
\ No newline at end of file
diff --git a/kcdc3/apps/pigeon/migrations/0003_auto__chg_field_post_department_label.py b/kcdc3/apps/pigeon/migrations/0003_auto__chg_field_post_department_label.py
new file mode 100644
index 00000000..b57d74c3
--- /dev/null
+++ b/kcdc3/apps/pigeon/migrations/0003_auto__chg_field_post_department_label.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):
+
+ # Changing field 'Post.department_label'
+ db.alter_column('pigeon_post', 'department_label', self.gf('django.db.models.fields.CharField')(max_length=128))
+
+ def backwards(self, orm):
+
+ # Changing field 'Post.department_label'
+ db.alter_column('pigeon_post', 'department_label', self.gf('django.db.models.fields.TextField')())
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ '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': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'classes.bio': {
+ 'Meta': {'object_name': 'Bio'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'role': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'role'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['classes.Role']"}),
+ 'staff_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'user'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+ },
+ 'classes.role': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Role'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '48'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'})
+ },
+ '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'}),
+ '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'})
+ },
+ 'pigeon.post': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'Post'},
+ 'allow_comments': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'author': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'author'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['classes.Bio']"}),
+ 'date': ('django.db.models.fields.DateTimeField', [], {}),
+ 'department_label': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'tags': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pigeon']
\ No newline at end of file
diff --git a/kcdc3/apps/pigeon/migrations/__init__.py b/kcdc3/apps/pigeon/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/kcdc3/apps/pigeon/models.py b/kcdc3/apps/pigeon/models.py
new file mode 100644
index 00000000..5c1f0efc
--- /dev/null
+++ b/kcdc3/apps/pigeon/models.py
@@ -0,0 +1,38 @@
+from django.db import models
+from kcdc3.apps.classes.models import Bio
+import datetime
+
+
+
+class Post(models.Model):
+
+ title = models.CharField(max_length=200)
+ slug = models.SlugField(unique=True)
+ STATUS_CHOICES = (
+ ('PUBLISHED', 'Published'),
+ ('HIDDEN', 'Hidden'),
+ ('DRAFT', 'Draft'),
+ ('REMOVED', 'Removed'),
+ )
+ status = models.CharField(max_length=9, choices=STATUS_CHOICES, default='CURRENT')
+ featured = models.BooleanField(default=False)
+ date = models.DateTimeField()
+
+ department_label = models.CharField(max_length=128, blank=True)
+ thumbnail = models.ImageField(upload_to='blog', blank=True, null=True)
+ teaser = models.TextField(blank=True)
+ main_text = models.TextField(blank=True)
+
+ author = models.ManyToManyField(Bio, blank=True, null=True, related_name='author')
+ tags = models.CharField(max_length=128, blank=True)
+ allow_comments = models.BooleanField(default=False)
+
+ class Meta:
+ ordering = ['-date']
+
+ def __unicode__(self):
+ return self.title
+
+ @models.permalink
+ def get_absolute_url(self):
+ return ('post_view', [str(self.slug)])
diff --git a/kcdc3/apps/pigeon/templates/pigeon/base.html b/kcdc3/apps/pigeon/templates/pigeon/base.html
new file mode 100644
index 00000000..c1e55265
--- /dev/null
+++ b/kcdc3/apps/pigeon/templates/pigeon/base.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+
+
+{% block sidebar %}
+
+
+
+{% endblock %}
+
+
+
+
diff --git a/kcdc3/apps/pigeon/templates/pigeon/post_detail.html b/kcdc3/apps/pigeon/templates/pigeon/post_detail.html
new file mode 100644
index 00000000..ca84170d
--- /dev/null
+++ b/kcdc3/apps/pigeon/templates/pigeon/post_detail.html
@@ -0,0 +1,43 @@
+{% extends "pigeon/base.html" %}
+
+
+
+{% block title %}
+ / {{ post.title }}
+{% endblock %}
+
+
+
+{% block content %}
+
+ [0-9_-]+)/$', PostArchiveView.as_view()),
+ url(r'^(?P[A-Za-z0-9_-]+)/$', PostDetailView.as_view(model=Post,), name='post_view'),
+
+)
diff --git a/kcdc3/apps/pigeon/views.py b/kcdc3/apps/pigeon/views.py
new file mode 100644
index 00000000..8d71dd8c
--- /dev/null
+++ b/kcdc3/apps/pigeon/views.py
@@ -0,0 +1,80 @@
+from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, Http404
+from django.views.generic import DetailView, TemplateView, ListView
+from datetime import datetime
+from django.template import Context
+from django.db.models import Q
+from django.contrib.syndication.views import Feed
+from models import Post
+from kcdc3.apps.classes.models import Bio
+
+
+
+# display a list of posts
+class PostListView(ListView):
+
+ context_object_name = "post_list"
+ model = Post
+
+ def get_context_data(self, **kwargs):
+
+ context = super(PostListView, self).get_context_data(**kwargs)
+ context['posts'] = Post.objects.filter(status='PUBLISHED').exclude(date__gte=datetime.now()).order_by('-date')
+ context['recent_posts'] = context['posts'][:15]
+
+ return context
+
+
+
+
+# display a list of posts for a particular month
+class PostArchiveView(ListView):
+
+ context_object_name = "post_list"
+ model = Post
+
+ def get_context_data(self, **kwargs):
+
+ # convert slug into date: remarkable thing, this datetime object
+ target_date = datetime.strptime(self.kwargs['date_slug'], '%y%m')
+
+ context = super(PostArchiveView, self).get_context_data(**kwargs)
+ context['posts'] = Post.objects.filter(status='PUBLISHED').exclude(date__gte=datetime.now())
+ context['recent_posts'] = context['posts'].filter(date__year=target_date.year).filter(date__month=target_date.month)
+
+ return context
+
+
+
+# display a single post
+class PostDetailView(DetailView):
+
+ context_object_name = "post"
+ model = Post
+
+ def get_context_data(self, **kwargs):
+
+ context = super(PostDetailView, self).get_context_data(**kwargs)
+ context['posts'] = Post.objects.filter(status='PUBLISHED').exclude(date__gte=datetime.now())
+ return context
+
+
+
+
+# RSS feed
+class BlogFeed(Feed):
+ title = "KCDC Blog"
+ link = "/blog/"
+ description = "Knowledge Commons DC Blog"
+
+ def items(self):
+ return Post.objects.filter(status='PUBLISHED').exclude(date__gte=datetime.now()).order_by('-date')[:10]
+
+ def item_title(self, item):
+ return item.title
+
+ def item_description(self, item):
+ return item.teaser
+
+
+
+
diff --git a/kcdc3/apps/pinata/__init__.py b/kcdc3/apps/pinata/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/kcdc3/apps/pinata/admin.py b/kcdc3/apps/pinata/admin.py
new file mode 100644
index 00000000..e23caf8b
--- /dev/null
+++ b/kcdc3/apps/pinata/admin.py
@@ -0,0 +1,158 @@
+from kcdc3.apps.pinata.models import Page, Notice, Slide, Sponsor, PressClipping, Snippet
+from django import forms
+from django.contrib import admin
+from django.contrib.admin.sites import site
+from django.contrib.admin.widgets import ManyToManyRawIdWidget, ForeignKeyRawIdWidget
+from django.core.urlresolvers import reverse
+from django.utils.encoding import smart_unicode
+from django.utils.html import escape
+
+
+
+class PageAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title', 'short_title', 'parent', 'path', 'status', 'sort_order',
+ ]}),
+ ('Text', {
+ 'classes': ('grp-collapse grp-open',),
+ 'fields': [
+ #'teaser',
+ 'main_text'
+ ]}),
+ ('Additional Text', {
+ 'classes': ('grp-collapse grp-closed',),
+ 'fields': [
+ 'sidebar_text',
+ ]}),
+ ('Layout', {
+ 'classes': ('grp-collapse grp-closed',),
+ 'fields': [
+ 'template',
+ ]}),
+ ]
+
+ list_display = ('title', 'short_title', 'status', 'parent', 'path', 'sort_order', 'template')
+ list_editable = ('status', 'sort_order', 'template')
+
+ class Media:
+ js = [
+ 'tiny_mce/tiny_mce.js',
+ 'tinymce_setup.js',
+ ]
+
+admin.site.register(Page, PageAdmin)
+
+
+
+
+
+class SnippetAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title', 'path',
+ ]}),
+ ('Text', {
+ 'classes': ('grp-collapse grp-open',),
+ 'fields': [
+ 'main_text'
+ ]}),
+ ]
+
+ list_display = ('title', 'path')
+
+admin.site.register(Snippet, SnippetAdmin)
+
+
+
+
+
+class NoticeAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title', 'main_text', 'live', 'sort_order',
+ ]}),
+ ]
+
+ list_display = ('title', 'live', 'sort_order',)
+ list_editable = ('live', 'sort_order',)
+
+admin.site.register(Notice, NoticeAdmin)
+
+
+
+
+
+class SlideAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title', 'image', 'main_text', 'live',
+ ]}),
+ ]
+
+ list_display = ('title', 'live', 'image',)
+ list_editable = ('live',)
+
+admin.site.register(Slide, SlideAdmin)
+
+
+
+
+
+class SponsorAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title',
+ ('group', 'status', 'sort_order',),
+ 'destination_url',
+ 'image',
+ # 'main_text',
+ ]}),
+ ]
+
+ list_display = ('title', 'status', 'group',)
+ list_editable = ('status', 'group',)
+
+ class Media:
+ js = [
+ 'tiny_mce/tiny_mce.js',
+ 'tinymce_setup.js',
+ ]
+
+admin.site.register(Sponsor, SponsorAdmin)
+
+
+
+
+class PressClippingAdmin(admin.ModelAdmin):
+
+ fieldsets = [
+ (None, {'fields': [
+ 'title',
+ 'date',
+ 'publication',
+ 'image',
+ 'destination_url',
+ # 'main_text',
+ 'excerpt',
+ 'status',
+ ]}),
+ ]
+
+ list_display = ('title', 'status', 'date',)
+ list_editable = ('status',)
+
+ class Media:
+ js = [
+ 'tiny_mce/tiny_mce.js',
+ 'tinymce_setup.js',
+ ]
+
+
+admin.site.register(PressClipping, PressClippingAdmin)
+
diff --git a/kcdc3/apps/pinata/migrations/0001_initial.py b/kcdc3/apps/pinata/migrations/0001_initial.py
new file mode 100644
index 00000000..9fea0f0b
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0001_initial.py
@@ -0,0 +1,48 @@
+# -*- 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 'Page'
+ db.create_table('pinata_page', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('short_title', self.gf('django.db.models.fields.CharField')(max_length=32)),
+ ('status', self.gf('django.db.models.fields.CharField')(default='CURRENT', max_length=9)),
+ ('featured', self.gf('django.db.models.fields.BooleanField')(default=False)),
+ ('path', self.gf('django.db.models.fields.CharField')(unique=True, max_length=200)),
+ ('parent', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['pinata.Page'], null=True)),
+ ('teaser', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('sidebar_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ))
+ db.send_create_signal('pinata', ['Page'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'Page'
+ db.delete_table('pinata_page')
+
+
+ models = {
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0002_auto__add_field_page_sort_order.py b/kcdc3/apps/pinata/migrations/0002_auto__add_field_page_sort_order.py
new file mode 100644
index 00000000..f299312f
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0002_auto__add_field_page_sort_order.py
@@ -0,0 +1,39 @@
+# -*- 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 field 'Page.sort_order'
+ db.add_column('pinata_page', 'sort_order',
+ self.gf('django.db.models.fields.IntegerField')(default=50, null=True, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'Page.sort_order'
+ db.delete_column('pinata_page', 'sort_order')
+
+
+ models = {
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0003_auto__add_notice__add_slide.py b/kcdc3/apps/pinata/migrations/0003_auto__add_notice__add_slide.py
new file mode 100644
index 00000000..6ed2bcf2
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0003_auto__add_notice__add_slide.py
@@ -0,0 +1,75 @@
+# -*- 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 'Notice'
+ db.create_table('pinata_notice', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('live', self.gf('django.db.models.fields.BooleanField')(default=True)),
+ ('sort_order', self.gf('django.db.models.fields.IntegerField')(default=50, null=True, blank=True)),
+ ))
+ db.send_create_signal('pinata', ['Notice'])
+
+ # Adding model 'Slide'
+ db.create_table('pinata_slide', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
+ ('live', self.gf('django.db.models.fields.BooleanField')(default=True)),
+ ('sort_order', self.gf('django.db.models.fields.IntegerField')(default=50, null=True, blank=True)),
+ ))
+ db.send_create_signal('pinata', ['Slide'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'Notice'
+ db.delete_table('pinata_notice')
+
+ # Deleting model 'Slide'
+ db.delete_table('pinata_slide')
+
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0004_auto__add_sponsor.py b/kcdc3/apps/pinata/migrations/0004_auto__add_sponsor.py
new file mode 100644
index 00000000..64579271
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0004_auto__add_sponsor.py
@@ -0,0 +1,75 @@
+# -*- 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 'Sponsor'
+ db.create_table('pinata_sponsor', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
+ ('destination_url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
+ ('group', self.gf('django.db.models.fields.CharField')(default='B', max_length=3)),
+ ('status', self.gf('django.db.models.fields.CharField')(default='CURRENT', max_length=9)),
+ ('sort_order', self.gf('django.db.models.fields.IntegerField')(default=50, null=True, blank=True)),
+ ))
+ db.send_create_signal('pinata', ['Sponsor'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'Sponsor'
+ db.delete_table('pinata_sponsor')
+
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.sponsor': {
+ 'Meta': {'ordering': "['group', 'sort_order', 'title']", 'object_name': 'Sponsor'},
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'group': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '3'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'CURRENT'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0005_auto__add_pressclipping.py b/kcdc3/apps/pinata/migrations/0005_auto__add_pressclipping.py
new file mode 100644
index 00000000..f05d3ee3
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0005_auto__add_pressclipping.py
@@ -0,0 +1,86 @@
+# -*- 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 'PressClipping'
+ db.create_table('pinata_pressclipping', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('date', self.gf('django.db.models.fields.DateField')(blank=True)),
+ ('publication', self.gf('django.db.models.fields.CharField')(max_length=200, blank=True)),
+ ('excerpt', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('destination_url', self.gf('django.db.models.fields.URLField')(max_length=200, blank=True)),
+ ('status', self.gf('django.db.models.fields.CharField')(default='PUBLISHED', max_length=9)),
+ ))
+ db.send_create_signal('pinata', ['PressClipping'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'PressClipping'
+ db.delete_table('pinata_pressclipping')
+
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.pressclipping': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'PressClipping'},
+ 'date': ('django.db.models.fields.DateField', [], {'blank': 'True'}),
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'publication': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.sponsor': {
+ 'Meta': {'ordering': "['group', 'sort_order', 'title']", 'object_name': 'Sponsor'},
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'group': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '3'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0006_auto__add_field_pressclipping_image.py b/kcdc3/apps/pinata/migrations/0006_auto__add_field_pressclipping_image.py
new file mode 100644
index 00000000..099f95f6
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0006_auto__add_field_pressclipping_image.py
@@ -0,0 +1,79 @@
+# -*- 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 field 'PressClipping.image'
+ db.add_column('pinata_pressclipping', 'image',
+ self.gf('django.db.models.fields.CharField')(default='', max_length=200, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'PressClipping.image'
+ db.delete_column('pinata_pressclipping', 'image')
+
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.pressclipping': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'PressClipping'},
+ 'date': ('django.db.models.fields.DateField', [], {'blank': 'True'}),
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'publication': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.sponsor': {
+ 'Meta': {'ordering': "['group', 'sort_order', 'title']", 'object_name': 'Sponsor'},
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'group': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '3'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0007_auto__chg_field_page_status.py b/kcdc3/apps/pinata/migrations/0007_auto__chg_field_page_status.py
new file mode 100644
index 00000000..e4cac27b
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0007_auto__chg_field_page_status.py
@@ -0,0 +1,77 @@
+# -*- 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 'Page.status'
+ db.alter_column('pinata_page', 'status', self.gf('django.db.models.fields.CharField')(max_length=48))
+
+ def backwards(self, orm):
+
+ # Changing field 'Page.status'
+ db.alter_column('pinata_page', 'status', self.gf('django.db.models.fields.CharField')(max_length=9))
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'basic.html'", 'max_length': '48'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.pressclipping': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'PressClipping'},
+ 'date': ('django.db.models.fields.DateField', [], {'blank': 'True'}),
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'publication': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.sponsor': {
+ 'Meta': {'ordering': "['group', 'sort_order', 'title']", 'object_name': 'Sponsor'},
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'group': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '3'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0008_auto__add_field_page_template__chg_field_page_status.py b/kcdc3/apps/pinata/migrations/0008_auto__add_field_page_template__chg_field_page_status.py
new file mode 100644
index 00000000..bc416880
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0008_auto__add_field_page_template__chg_field_page_status.py
@@ -0,0 +1,86 @@
+# -*- 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 field 'Page.template'
+ db.add_column('pinata_page', 'template',
+ self.gf('django.db.models.fields.CharField')(default='basic.html', max_length=48),
+ keep_default=False)
+
+
+ # Changing field 'Page.status'
+ db.alter_column('pinata_page', 'status', self.gf('django.db.models.fields.CharField')(max_length=9))
+
+ def backwards(self, orm):
+ # Deleting field 'Page.template'
+ db.delete_column('pinata_page', 'template')
+
+
+ # Changing field 'Page.status'
+ db.alter_column('pinata_page', 'status', self.gf('django.db.models.fields.CharField')(max_length=48))
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'template': ('django.db.models.fields.CharField', [], {'default': "'basic.html'", 'max_length': '48'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.pressclipping': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'PressClipping'},
+ 'date': ('django.db.models.fields.DateField', [], {'blank': 'True'}),
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'publication': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.sponsor': {
+ 'Meta': {'ordering': "['group', 'sort_order', 'title']", 'object_name': 'Sponsor'},
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'group': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '3'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/0009_auto__add_snippet.py b/kcdc3/apps/pinata/migrations/0009_auto__add_snippet.py
new file mode 100644
index 00000000..b8489c7e
--- /dev/null
+++ b/kcdc3/apps/pinata/migrations/0009_auto__add_snippet.py
@@ -0,0 +1,91 @@
+# -*- 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 'Snippet'
+ db.create_table('pinata_snippet', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('main_text', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('path', self.gf('django.db.models.fields.CharField')(unique=True, max_length=200)),
+ ))
+ db.send_create_signal('pinata', ['Snippet'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'Snippet'
+ db.delete_table('pinata_snippet')
+
+
+ models = {
+ 'pinata.notice': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Notice'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.page': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Page'},
+ 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['pinata.Page']", 'null': 'True', 'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'short_title': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'sidebar_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'teaser': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'template': ('django.db.models.fields.CharField', [], {'default': "'basic.html'", 'max_length': '48'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.pressclipping': {
+ 'Meta': {'ordering': "['date']", 'object_name': 'PressClipping'},
+ 'date': ('django.db.models.fields.DateField', [], {'blank': 'True'}),
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'publication': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.slide': {
+ 'Meta': {'ordering': "['sort_order', 'title']", 'object_name': 'Slide'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.snippet': {
+ 'Meta': {'ordering': "['path']", 'object_name': 'Snippet'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ 'pinata.sponsor': {
+ 'Meta': {'ordering': "['group', 'sort_order', 'title']", 'object_name': 'Sponsor'},
+ 'destination_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+ 'group': ('django.db.models.fields.CharField', [], {'default': "'B'", 'max_length': '3'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '50', 'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'PUBLISHED'", 'max_length': '9'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ }
+ }
+
+ complete_apps = ['pinata']
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/migrations/__init__.py b/kcdc3/apps/pinata/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/kcdc3/apps/pinata/models.py b/kcdc3/apps/pinata/models.py
new file mode 100644
index 00000000..cee11a94
--- /dev/null
+++ b/kcdc3/apps/pinata/models.py
@@ -0,0 +1,154 @@
+from django.db import models
+import datetime
+
+
+
+class Page(models.Model):
+ title = models.CharField(max_length=200)
+ short_title = models.CharField(max_length=32)
+ STATUS_CHOICES = (
+ ('PUBLISHED', 'Published'),
+ ('HIDDEN', 'Hidden'),
+ ('DRAFT', 'Draft'),
+ ('REMOVED', 'Removed'),
+ )
+ status = models.CharField(max_length=9, choices=STATUS_CHOICES, default='PUBLISHED')
+ featured = models.BooleanField(default=False)
+ sort_order = models.IntegerField(blank=True, null=True, default=50)
+
+ path = models.CharField(max_length=200, unique=True)
+ parent = models.ForeignKey('self', null=True,blank=True)
+
+ teaser = models.TextField(blank=True)
+ main_text = models.TextField(blank=True)
+ sidebar_text = models.TextField(blank=True)
+
+ TEMPLATE_CHOICES = (
+ ('page.html', 'Basic'),
+ ('page_wide.html', 'Wide'),
+ ('page_nosidebar.html', 'No Sidebar'),
+ ('page_multipart.html', 'Multipart'),
+ )
+ template = models.CharField(max_length=48, choices=TEMPLATE_CHOICES, default='basic.html')
+
+ class Meta:
+ ordering = ['path']
+
+ def __unicode__(self):
+ return self.title
+
+
+
+class Snippet(models.Model):
+ """ Small pieces of content, inserted into special page templates.
+ The path should identify the snippet. Examples:
+ /contribute#section1
+ /contribute/details#intro
+ sitewide#copyright
+ """
+
+ title = models.CharField(max_length=200)
+ main_text = models.TextField(blank=True)
+ path = models.CharField(max_length=200, unique=True)
+
+ class Meta:
+ ordering = ['path']
+
+ def __unicode__(self):
+ return self.title
+
+
+
+class Notice(models.Model):
+ """ Short-term notices that appear on the front page """
+
+ title = models.CharField(max_length=200)
+ main_text = models.TextField(blank=True)
+ live = models.BooleanField(default=True)
+ sort_order = models.IntegerField(blank=True, null=True, default=50)
+
+ class Meta:
+ ordering = ['sort_order','title']
+ verbose_name=u'Front Notice'
+
+ def __unicode__(self):
+ return self.title
+
+
+
+class Slide(models.Model):
+ """ Slides for the front page """
+
+ title = models.CharField(max_length=200)
+ main_text = models.TextField(blank=True)
+ image = models.ImageField('Image (960x360px)', upload_to='front_slides', blank=True, null=True)
+ live = models.BooleanField(default=True)
+ sort_order = models.IntegerField(blank=True, null=True, default=50)
+
+ class Meta:
+ ordering = ['sort_order','title']
+ verbose_name=u'Front Slide'
+
+ def __unicode__(self):
+ return self.title
+
+
+
+class Sponsor(models.Model):
+ """ Partners and sponsors """
+
+ title = models.CharField(max_length=200)
+ main_text = models.TextField(blank=True)
+ image = models.ImageField('Image', upload_to='sponsors', blank=True, null=True)
+ destination_url = models.URLField(blank=True)
+ GROUP_CHOICES = (
+ ('A', 'Major Partner'),
+ ('B', 'Minor Partner'),
+ ('S', 'Space'),
+ )
+ group = models.CharField(max_length=3, choices=GROUP_CHOICES, default='B')
+
+ STATUS_CHOICES = (
+ ('PUBLISHED', 'Published'),
+ ('HIDDEN', 'Hidden'),
+ ('DRAFT', 'Draft'),
+ ('REMOVED', 'Removed'),
+ )
+ status = models.CharField(max_length=9, choices=STATUS_CHOICES, default='PUBLISHED')
+ sort_order = models.IntegerField(blank=True, null=True, default=50)
+
+ class Meta:
+ verbose_name = 'Partner'
+ ordering = ['group','sort_order','title']
+
+ def __unicode__(self):
+ return self.title
+
+
+
+
+class PressClipping(models.Model):
+ """ A press article """
+
+ title = models.CharField(max_length=200)
+ main_text = models.TextField(blank=True)
+ date = models.DateField(blank=True)
+ publication = models.CharField(max_length=200,blank=True)
+ excerpt = models.TextField(blank=True)
+ destination_url = models.URLField(blank=True)
+ image = models.CharField(max_length=200,blank=True)
+
+ STATUS_CHOICES = (
+ ('PUBLISHED', 'Published'),
+ ('HIDDEN', 'Hidden'),
+ ('DRAFT', 'Draft'),
+ ('REMOVED', 'Removed'),
+ )
+ status = models.CharField(max_length=9, choices=STATUS_CHOICES, default='PUBLISHED')
+
+ class Meta:
+ ordering = ['date']
+ verbose_name=u'Press Clipping'
+
+ def __unicode__(self):
+ return self.title
diff --git a/kcdc3/apps/pinata/templates/pinata/base.html b/kcdc3/apps/pinata/templates/pinata/base.html
new file mode 100644
index 00000000..f5d733d9
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/base.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+
+
+{% block sidebar %}
+
+
+
+{% endblock %}
+
+
+
+
diff --git a/kcdc3/apps/pinata/templates/pinata/home.html b/kcdc3/apps/pinata/templates/pinata/home.html
new file mode 100644
index 00000000..f3eee175
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/home.html
@@ -0,0 +1,135 @@
+{% extends "pinata/base.html" %}
+
+{% load pinata_filters %}
+
+{% block pre_content %}
+
+ [A-Za-z0-9_-]+)$', RegistrationListView.as_view()),
- url(r'^(?P[0-9_-]+)/$', EventArchiveView.as_view()),
- url(r'^(?P[0-9_-]+)/background/$', SessionView.as_view()),
- url(r'^response/(?P[A-Za-z0-9_-]+)$', ResponseTemplateView.as_view()),
- url(r'^(?P[A-Za-z0-9_-]+)/$', EventDetailView.as_view(model=Event,)),
- url(r'^(?P[A-Za-z0-9_-]+)/register$', 'register'),
- url(r'^(?P[A-Za-z0-9_-]+)/cancel$', 'cancel'),
- url(r'^(?P[A-Za-z0-9_-]+)/facilitator$', 'facilitator'),
-
-)
diff --git a/kcdc3/kcdc3/urls.py b/kcdc3/kcdc3/urls.py
deleted file mode 100644
index 385a7152..00000000
--- a/kcdc3/kcdc3/urls.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from django.conf.urls.defaults import *
-from accounts.views import SignupFormExtra
-from filebrowser.sites import site
-
-# development
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-# Uncomment the next two lines to enable the admin:
-from django.contrib import admin
-admin.autodiscover()
-
-urlpatterns = patterns('',
-
- url(r'^$', include('classes.urls')),
- url(r'^classes/', include('classes.urls')),
- url(r'^admin/filebrowser/', include(site.urls)),
- url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- url(r'^admin/', include(admin.site.urls)),
- url(r'^grappelli/', include('grappelli.urls')),
- url(r'^accounts/signup/$', 'userena.views.signup', {'signup_form': SignupFormExtra}),
- url(r'^accounts/', include('userena.urls')),
-
-)
-
-# development
-urlpatterns += staticfiles_urlpatterns()
diff --git a/kcdc3/passenger_wsgi.py b/kcdc3/passenger_wsgi.py
deleted file mode 100644
index e3a683a9..00000000
--- a/kcdc3/passenger_wsgi.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import sys, os
-INTERP = "/home/kcdc/.pythonbrew/venvs/Python-2.7.3/kcdc_production/bin/python"
-if sys.executable != INTERP: os.execl(INTERP, INTERP, *sys.argv)
-sys.path.append(os.getcwd())
-os.environ['DJANGO_SETTINGS_MODULE'] = "kcdc3.settings"
-import django.core.handlers.wsgi
-application = django.core.handlers.wsgi.WSGIHandler()
-
-# To cut django out of the loop, comment the above application = ... line ,
-# and remove "test" from the below function definition.
-# def application(environ, start_response):
-# status = '200 OK'
-# output = 'Hello World! Running Python version ' + sys.version + '\n\n'
-# response_headers = [('Content-type', 'text/plain'),
-# ('Content-Length', str(len(output)))]
-# # to test paste's error catching prowess, uncomment the following line
-# # while this function is the "application"
-# raise("error")
-# start_response(status, response_headers)
-# return [output]
-# application = ErrorMiddleware(application, debug=True)
diff --git a/kcdc3/paste/__init__.py b/kcdc3/paste/__init__.py
deleted file mode 100644
index ba666066..00000000
--- a/kcdc3/paste/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-try:
- import pkg_resources
- pkg_resources.declare_namespace(__name__)
-except ImportError:
- # don't prevent use of paste if pkg_resources isn't installed
- from pkgutil import extend_path
- __path__ = extend_path(__path__, __name__)
-
-try:
- import modulefinder
-except ImportError:
- pass
-else:
- for p in __path__:
- modulefinder.AddPackagePath(__name__, p)
diff --git a/kcdc3/paste/auth/__init__.py b/kcdc3/paste/auth/__init__.py
deleted file mode 100644
index 186e2eff..00000000
--- a/kcdc3/paste/auth/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-"""
-Package for authentication/identification of requests.
-
-The objective of this package is to provide single-focused middleware
-components that implement a particular specification. Integration of
-the components into a usable system is up to a higher-level framework.
-"""
diff --git a/kcdc3/paste/auth/auth_tkt.py b/kcdc3/paste/auth/auth_tkt.py
deleted file mode 100644
index 8dfce00a..00000000
--- a/kcdc3/paste/auth/auth_tkt.py
+++ /dev/null
@@ -1,396 +0,0 @@
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-##########################################################################
-#
-# Copyright (c) 2005 Imaginary Landscape LLC and Contributors.
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-##########################################################################
-"""
-Implementation of cookie signing as done in `mod_auth_tkt
-`_.
-
- ``secret`` is requird, but can be set globally or locally.
- """
- from paste.deploy.converters import asbool
- secure = asbool(secure)
- include_ip = asbool(include_ip)
- if secret is None:
- secret = global_conf.get('secret')
- if not secret:
- raise ValueError(
- "You must provide a 'secret' (in global or local configuration)")
- return AuthTKTMiddleware(
- app, secret, cookie_name, secure, include_ip, logout_path or None)
diff --git a/kcdc3/paste/auth/basic.py b/kcdc3/paste/auth/basic.py
deleted file mode 100644
index 69db1287..00000000
--- a/kcdc3/paste/auth/basic.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# (c) 2005 Clark C. Evans
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-# This code was written with funding by http://prometheusresearch.com
-"""
-Basic HTTP/1.0 Authentication
-
-This module implements ``Basic`` authentication as described in
-HTTP/1.0 specification [1]_ . Do not use this module unless you
-are using SSL or need to work with very out-dated clients, instead
-use ``digest`` authentication.
-
->>> from paste.wsgilib import dump_environ
->>> from paste.httpserver import serve
->>> # from paste.auth.basic import AuthBasicHandler
->>> realm = 'Test Realm'
->>> def authfunc(environ, username, password):
-... return username == password
->>> serve(AuthBasicHandler(dump_environ, realm, authfunc))
-serving on...
-
-.. [1] http://www.w3.org/Protocols/HTTP/1.0/draft-ietf-http-spec.html#BasicAA
-"""
-from paste.httpexceptions import HTTPUnauthorized
-from paste.httpheaders import *
-
-class AuthBasicAuthenticator(object):
- """
- implements ``Basic`` authentication details
- """
- type = 'basic'
- def __init__(self, realm, authfunc):
- self.realm = realm
- self.authfunc = authfunc
-
- def build_authentication(self):
- head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
- return HTTPUnauthorized(headers=head)
-
- def authenticate(self, environ):
- authorization = AUTHORIZATION(environ)
- if not authorization:
- return self.build_authentication()
- (authmeth, auth) = authorization.split(' ', 1)
- if 'basic' != authmeth.lower():
- return self.build_authentication()
- auth = auth.strip().decode('base64')
- username, password = auth.split(':', 1)
- if self.authfunc(environ, username, password):
- return username
- return self.build_authentication()
-
- __call__ = authenticate
-
-class AuthBasicHandler(object):
- """
- HTTP/1.0 ``Basic`` authentication middleware
-
- Parameters:
-
- ``application``
-
- The application object is called only upon successful
- authentication, and can assume ``environ['REMOTE_USER']``
- is set. If the ``REMOTE_USER`` is already set, this
- middleware is simply pass-through.
-
- ``realm``
-
- This is a identifier for the authority that is requesting
- authorization. It is shown to the user and should be unique
- within the domain it is being used.
-
- ``authfunc``
-
- This is a mandatory user-defined function which takes a
- ``environ``, ``username`` and ``password`` for its first
- three arguments. It should return ``True`` if the user is
- authenticated.
-
- """
- def __init__(self, application, realm, authfunc):
- self.application = application
- self.authenticate = AuthBasicAuthenticator(realm, authfunc)
-
- def __call__(self, environ, start_response):
- username = REMOTE_USER(environ)
- if not username:
- result = self.authenticate(environ)
- if isinstance(result, str):
- AUTH_TYPE.update(environ, 'basic')
- REMOTE_USER.update(environ, result)
- else:
- return result.wsgi_application(environ, start_response)
- return self.application(environ, start_response)
-
-middleware = AuthBasicHandler
-
-__all__ = ['AuthBasicHandler']
-
-def make_basic(app, global_conf, realm, authfunc, **kw):
- """
- Grant access via basic authentication
-
- Config looks like this::
-
- [filter:grant]
- use = egg:Paste#auth_basic
- realm=myrealm
- authfunc=somepackage.somemodule:somefunction
-
- """
- from paste.util.import_string import eval_import
- import types
- authfunc = eval_import(authfunc)
- assert isinstance(authfunc, types.FunctionType), "authfunc must resolve to a function"
- return AuthBasicHandler(app, realm, authfunc)
-
-
-if "__main__" == __name__:
- import doctest
- doctest.testmod(optionflags=doctest.ELLIPSIS)
diff --git a/kcdc3/paste/auth/cas.py b/kcdc3/paste/auth/cas.py
deleted file mode 100644
index c3521a06..00000000
--- a/kcdc3/paste/auth/cas.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# (c) 2005 Clark C. Evans
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-# This code was written with funding by http://prometheusresearch.com
-"""
-CAS 1.0 Authentication
-
-The Central Authentication System is a straight-forward single sign-on
-mechanism developed by Yale University's ITS department. It has since
-enjoyed widespread success and is deployed at many major universities
-and some corporations.
-
- https://clearinghouse.ja-sig.org/wiki/display/CAS/Home
- http://www.yale.edu/tp/auth/usingcasatyale.html
-
-This implementation has the goal of maintaining current path arguments
-passed to the system so that it can be used as middleware at any stage
-of processing. It has the secondary goal of allowing for other
-authentication methods to be used concurrently.
-"""
-import urllib
-from paste.request import construct_url
-from paste.httpexceptions import HTTPSeeOther, HTTPForbidden
-
-class CASLoginFailure(HTTPForbidden):
- """ The exception raised if the authority returns 'no' """
-
-class CASAuthenticate(HTTPSeeOther):
- """ The exception raised to authenticate the user """
-
-def AuthCASHandler(application, authority):
- """
- middleware to implement CAS 1.0 authentication
-
- There are several possible outcomes:
-
- 0. If the REMOTE_USER environment variable is already populated;
- then this middleware is a no-op, and the request is passed along
- to the application.
-
- 1. If a query argument 'ticket' is found, then an attempt to
- validate said ticket /w the authentication service done. If the
- ticket is not validated; an 403 'Forbidden' exception is raised.
- Otherwise, the REMOTE_USER variable is set with the NetID that
- was validated and AUTH_TYPE is set to "cas".
-
- 2. Otherwise, a 303 'See Other' is returned to the client directing
- them to login using the CAS service. After logon, the service
- will send them back to this same URL, only with a 'ticket' query
- argument.
-
- Parameters:
-
- ``authority``
-
- This is a fully-qualified URL to a CAS 1.0 service. The URL
- should end with a '/' and have the 'login' and 'validate'
- sub-paths as described in the CAS 1.0 documentation.
-
- """
- assert authority.endswith("/") and authority.startswith("http")
- def cas_application(environ, start_response):
- username = environ.get('REMOTE_USER','')
- if username:
- return application(environ, start_response)
- qs = environ.get('QUERY_STRING','').split("&")
- if qs and qs[-1].startswith("ticket="):
- # assume a response from the authority
- ticket = qs.pop().split("=", 1)[1]
- environ['QUERY_STRING'] = "&".join(qs)
- service = construct_url(environ)
- args = urllib.urlencode(
- {'service': service,'ticket': ticket})
- requrl = authority + "validate?" + args
- result = urllib.urlopen(requrl).read().split("\n")
- if 'yes' == result[0]:
- environ['REMOTE_USER'] = result[1]
- environ['AUTH_TYPE'] = 'cas'
- return application(environ, start_response)
- exce = CASLoginFailure()
- else:
- service = construct_url(environ)
- args = urllib.urlencode({'service': service})
- location = authority + "login?" + args
- exce = CASAuthenticate(location)
- return exce.wsgi_application(environ, start_response)
- return cas_application
-
-middleware = AuthCASHandler
-
-__all__ = ['CASLoginFailure', 'CASAuthenticate', 'AuthCASHandler' ]
-
-if '__main__' == __name__:
- authority = "https://secure.its.yale.edu/cas/servlet/"
- from paste.wsgilib import dump_environ
- from paste.httpserver import serve
- from paste.httpexceptions import *
- serve(HTTPExceptionHandler(
- AuthCASHandler(dump_environ, authority)))
diff --git a/kcdc3/paste/auth/cookie.py b/kcdc3/paste/auth/cookie.py
deleted file mode 100644
index 2601a904..00000000
--- a/kcdc3/paste/auth/cookie.py
+++ /dev/null
@@ -1,396 +0,0 @@
-# (c) 2005 Clark C. Evans
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-# This code was written with funding by http://prometheusresearch.com
-"""
-Cookie "Saved" Authentication
-
-This authentication middleware saves the current REMOTE_USER,
-REMOTE_SESSION, and any other environment variables specified in a
-cookie so that it can be retrieved during the next request without
-requiring re-authentication. This uses a session cookie on the client
-side (so it goes away when the user closes their window) and does
-server-side expiration.
-
-Following is a very simple example where a form is presented asking for
-a user name (no actual checking), and dummy session identifier (perhaps
-corresponding to a database session id) is stored in the cookie.
-
-::
-
- >>> from paste.httpserver import serve
- >>> from paste.fileapp import DataApp
- >>> from paste.httpexceptions import *
- >>> from paste.auth.cookie import AuthCookieHandler
- >>> from paste.wsgilib import parse_querystring
- >>> def testapp(environ, start_response):
- ... user = dict(parse_querystring(environ)).get('user','')
- ... if user:
- ... environ['REMOTE_USER'] = user
- ... environ['REMOTE_SESSION'] = 'a-session-id'
- ... if environ.get('REMOTE_USER'):
- ... page = 'Welcome %s (%s)'
- ... page %= (environ['REMOTE_USER'], environ['REMOTE_SESSION'])
- ... else:
- ... page = ('')
- ... return DataApp(page, content_type="text/html")(
- ... environ, start_response)
- >>> serve(AuthCookieHandler(testapp))
- serving on...
-
-"""
-
-import hmac, base64, random, time, warnings
-try:
- from hashlib import sha1
-except ImportError:
- # NOTE: We have to use the callable with hashlib (hashlib.sha1),
- # otherwise hmac only accepts the sha module object itself
- import sha as sha1
-from paste.request import get_cookies
-
-def make_time(value):
- return time.strftime("%Y%m%d%H%M", time.gmtime(value))
-_signature_size = len(hmac.new('x', 'x', sha1).digest())
-_header_size = _signature_size + len(make_time(time.time()))
-
-# @@: Should this be using urllib.quote?
-# build encode/decode functions to safely pack away values
-_encode = [('\\', '\\x5c'), ('"', '\\x22'),
- ('=', '\\x3d'), (';', '\\x3b')]
-_decode = [(v, k) for (k, v) in _encode]
-_decode.reverse()
-def encode(s, sublist = _encode):
- return reduce((lambda a, (b, c): a.replace(b, c)), sublist, str(s))
-decode = lambda s: encode(s, _decode)
-
-class CookieTooLarge(RuntimeError):
- def __init__(self, content, cookie):
- RuntimeError.__init__("Signed cookie exceeds maximum size of 4096")
- self.content = content
- self.cookie = cookie
-
-_all_chars = ''.join([chr(x) for x in range(0, 255)])
-def new_secret():
- """ returns a 64 byte secret """
- return ''.join(random.sample(_all_chars, 64))
-
-class AuthCookieSigner(object):
- """
- save/restore ``environ`` entries via digially signed cookie
-
- This class converts content into a timed and digitally signed
- cookie, as well as having the facility to reverse this procedure.
- If the cookie, after the content is encoded and signed exceeds the
- maximum length (4096), then CookieTooLarge exception is raised.
-
- The timeout of the cookie is handled on the server side for a few
- reasons. First, if a 'Expires' directive is added to a cookie, then
- the cookie becomes persistent (lasting even after the browser window
- has closed). Second, the user's clock may be wrong (perhaps
- intentionally). The timeout is specified in minutes; and expiration
- date returned is rounded to one second.
-
- Constructor Arguments:
-
- ``secret``
-
- This is a secret key if you want to syncronize your keys so
- that the cookie will be good across a cluster of computers.
- It is recommended via the HMAC specification (RFC 2104) that
- the secret key be 64 bytes since this is the block size of
- the hashing. If you do not provide a secret key, a random
- one is generated each time you create the handler; this
- should be sufficient for most cases.
-
- ``timeout``
-
- This is the time (in minutes) from which the cookie is set
- to expire. Note that on each request a new (replacement)
- cookie is sent, hence this is effectively a session timeout
- parameter for your entire cluster. If you do not provide a
- timeout, it is set at 30 minutes.
-
- ``maxlen``
-
- This is the maximum size of the *signed* cookie; hence the
- actual content signed will be somewhat less. If the cookie
- goes over this size, a ``CookieTooLarge`` exception is
- raised so that unexpected handling of cookies on the client
- side are avoided. By default this is set at 4k (4096 bytes),
- which is the standard cookie size limit.
-
- """
- def __init__(self, secret = None, timeout = None, maxlen = None):
- self.timeout = timeout or 30
- if isinstance(timeout, basestring):
- raise ValueError(
- "Timeout must be a number (minutes), not a string (%r)"
- % timeout)
- self.maxlen = maxlen or 4096
- self.secret = secret or new_secret()
-
- def sign(self, content):
- """
- Sign the content returning a valid cookie (that does not
- need to be escaped and quoted). The expiration of this
- cookie is handled server-side in the auth() function.
- """
- cookie = base64.encodestring(
- hmac.new(self.secret, content, sha1).digest() +
- make_time(time.time() + 60*self.timeout) +
- content)
- cookie = cookie.replace("/", "_").replace("=", "~")
- cookie = cookie.replace('\n', '').replace('\r', '')
- if len(cookie) > self.maxlen:
- raise CookieTooLarge(content, cookie)
- return cookie
-
- def auth(self, cookie):
- """
- Authenticate the cooke using the signature, verify that it
- has not expired; and return the cookie's content
- """
- decode = base64.decodestring(
- cookie.replace("_", "/").replace("~", "="))
- signature = decode[:_signature_size]
- expires = decode[_signature_size:_header_size]
- content = decode[_header_size:]
- if signature == hmac.new(self.secret, content, sha1).digest():
- if int(expires) > int(make_time(time.time())):
- return content
- else:
- # This is the normal case of an expired cookie; just
- # don't bother doing anything here.
- pass
- else:
- # This case can happen if the server is restarted with a
- # different secret; or if the user's IP address changed
- # due to a proxy. However, it could also be a break-in
- # attempt -- so should it be reported?
- pass
-
-class AuthCookieEnviron(list):
- """
- a list of environment keys to be saved via cookie
-
- An instance of this object, found at ``environ['paste.auth.cookie']``
- lists the `environ` keys that were restored from or will be added
- to the digially signed cookie. This object can be accessed from an
- `environ` variable by using this module's name.
- """
- def __init__(self, handler, scanlist):
- list.__init__(self, scanlist)
- self.handler = handler
- def append(self, value):
- if value in self:
- return
- list.append(self, str(value))
-
-class AuthCookieHandler(object):
- """
- the actual handler that should be put in your middleware stack
-
- This middleware uses cookies to stash-away a previously authenticated
- user (and perhaps other variables) so that re-authentication is not
- needed. This does not implement sessions; and therefore N servers
- can be syncronized to accept the same saved authentication if they
- all use the same cookie_name and secret.
-
- By default, this handler scans the `environ` for the REMOTE_USER
- and REMOTE_SESSION key; if found, it is stored. It can be
- configured to scan other `environ` keys as well -- but be careful
- not to exceed 2-3k (so that the encoded and signed cookie does not
- exceed 4k). You can ask it to handle other environment variables
- by doing:
-
- ``environ['paste.auth.cookie'].append('your.environ.variable')``
-
-
- Constructor Arguments:
-
- ``application``
-
- This is the wrapped application which will have access to
- the ``environ['REMOTE_USER']`` restored by this middleware.
-
- ``cookie_name``
-
- The name of the cookie used to store this content, by default
- it is ``PASTE_AUTH_COOKIE``.
-
- ``scanlist``
-
- This is the initial set of ``environ`` keys to
- save/restore to the signed cookie. By default is consists
- only of ``REMOTE_USER`` and ``REMOTE_SESSION``; any tuple
- or list of environment keys will work. However, be
- careful, as the total saved size is limited to around 3k.
-
- ``signer``
-
- This is the signer object used to create the actual cookie
- values, by default, it is ``AuthCookieSigner`` and is passed
- the remaining arguments to this function: ``secret``,
- ``timeout``, and ``maxlen``.
-
- At this time, each cookie is individually signed. To store more
- than the 4k of data; it is possible to sub-class this object to
- provide different ``environ_name`` and ``cookie_name``
- """
- environ_name = 'paste.auth.cookie'
- cookie_name = 'PASTE_AUTH_COOKIE'
- signer_class = AuthCookieSigner
- environ_class = AuthCookieEnviron
-
- def __init__(self, application, cookie_name=None, scanlist=None,
- signer=None, secret=None, timeout=None, maxlen=None):
- if not signer:
- signer = self.signer_class(secret, timeout, maxlen)
- self.signer = signer
- self.scanlist = scanlist or ('REMOTE_USER','REMOTE_SESSION')
- self.application = application
- self.cookie_name = cookie_name or self.cookie_name
-
- def __call__(self, environ, start_response):
- if self.environ_name in environ:
- raise AssertionError("AuthCookie already installed!")
- scanlist = self.environ_class(self, self.scanlist)
- jar = get_cookies(environ)
- if jar.has_key(self.cookie_name):
- content = self.signer.auth(jar[self.cookie_name].value)
- if content:
- for pair in content.split(";"):
- (k, v) = pair.split("=")
- k = decode(k)
- if k not in scanlist:
- scanlist.append(k)
- if k in environ:
- continue
- environ[k] = decode(v)
- if 'REMOTE_USER' == k:
- environ['AUTH_TYPE'] = 'cookie'
- environ[self.environ_name] = scanlist
- if "paste.httpexceptions" in environ:
- warnings.warn("Since paste.httpexceptions is hooked in your "
- "processing chain before paste.auth.cookie, if an "
- "HTTPRedirection is raised, the cookies this module sets "
- "will not be included in your response.\n")
-
- def response_hook(status, response_headers, exc_info=None):
- """
- Scan the environment for keys specified in the scanlist,
- pack up their values, signs the content and issues a cookie.
- """
- scanlist = environ.get(self.environ_name)
- assert scanlist and isinstance(scanlist, self.environ_class)
- content = []
- for k in scanlist:
- v = environ.get(k)
- if v is not None:
- if type(v) is not str:
- raise ValueError(
- "The value of the environmental variable %r "
- "is not a str (only str is allowed; got %r)"
- % (k, v))
- content.append("%s=%s" % (encode(k), encode(v)))
- if content:
- content = ";".join(content)
- content = self.signer.sign(content)
- cookie = '%s=%s; Path=/;' % (self.cookie_name, content)
- if 'https' == environ['wsgi.url_scheme']:
- cookie += ' secure;'
- response_headers.append(('Set-Cookie', cookie))
- return start_response(status, response_headers, exc_info)
- return self.application(environ, response_hook)
-
-middleware = AuthCookieHandler
-
-# Paste Deploy entry point:
-def make_auth_cookie(
- app, global_conf,
- # Should this get picked up from global_conf somehow?:
- cookie_name='PASTE_AUTH_COOKIE',
- scanlist=('REMOTE_USER', 'REMOTE_SESSION'),
- # signer cannot be set
- secret=None,
- timeout=30,
- maxlen=4096):
- """
- This middleware uses cookies to stash-away a previously
- authenticated user (and perhaps other variables) so that
- re-authentication is not needed. This does not implement
- sessions; and therefore N servers can be syncronized to accept the
- same saved authentication if they all use the same cookie_name and
- secret.
-
- By default, this handler scans the `environ` for the REMOTE_USER
- and REMOTE_SESSION key; if found, it is stored. It can be
- configured to scan other `environ` keys as well -- but be careful
- not to exceed 2-3k (so that the encoded and signed cookie does not
- exceed 4k). You can ask it to handle other environment variables
- by doing:
-
- ``environ['paste.auth.cookie'].append('your.environ.variable')``
-
- Configuration:
-
- ``cookie_name``
-
- The name of the cookie used to store this content, by
- default it is ``PASTE_AUTH_COOKIE``.
-
- ``scanlist``
-
- This is the initial set of ``environ`` keys to
- save/restore to the signed cookie. By default is consists
- only of ``REMOTE_USER`` and ``REMOTE_SESSION``; any
- space-separated list of environment keys will work.
- However, be careful, as the total saved size is limited to
- around 3k.
-
- ``secret``
-
- The secret that will be used to sign the cookies. If you
- don't provide one (and none is set globally) then a random
- secret will be created. Each time the server is restarted
- a new secret will then be created and all cookies will
- become invalid! This can be any string value.
-
- ``timeout``
-
- The time to keep the cookie, expressed in minutes. This
- is handled server-side, so a new cookie with a new timeout
- is added to every response.
-
- ``maxlen``
-
- The maximum length of the cookie that is sent (default 4k,
- which is a typical browser maximum)
-
- """
- if isinstance(scanlist, basestring):
- scanlist = scanlist.split()
- if secret is None and global_conf.get('secret'):
- secret = global_conf['secret']
- try:
- timeout = int(timeout)
- except ValueError:
- raise ValueError('Bad value for timeout (must be int): %r'
- % timeout)
- try:
- maxlen = int(maxlen)
- except ValueError:
- raise ValueError('Bad value for maxlen (must be int): %r'
- % maxlen)
- return AuthCookieHandler(
- app, cookie_name=cookie_name, scanlist=scanlist,
- secret=secret, timeout=timeout, maxlen=maxlen)
-
-__all__ = ['AuthCookieHandler', 'AuthCookieSigner', 'AuthCookieEnviron']
-
-if "__main__" == __name__:
- import doctest
- doctest.testmod(optionflags=doctest.ELLIPSIS)
-
diff --git a/kcdc3/paste/auth/digest.py b/kcdc3/paste/auth/digest.py
deleted file mode 100644
index 1b5ba84b..00000000
--- a/kcdc3/paste/auth/digest.py
+++ /dev/null
@@ -1,214 +0,0 @@
-# (c) 2005 Clark C. Evans
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-# This code was written with funding by http://prometheusresearch.com
-"""
-Digest HTTP/1.1 Authentication
-
-This module implements ``Digest`` authentication as described by
-RFC 2617 [1]_ .
-
-Basically, you just put this module before your application, and it
-takes care of requesting and handling authentication requests. This
-module has been tested with several common browsers "out-in-the-wild".
-
->>> from paste.wsgilib import dump_environ
->>> from paste.httpserver import serve
->>> # from paste.auth.digest import digest_password, AuthDigestHandler
->>> realm = 'Test Realm'
->>> def authfunc(environ, realm, username):
-... return digest_password(realm, username, username)
->>> serve(AuthDigestHandler(dump_environ, realm, authfunc))
-serving on...
-
-This code has not been audited by a security expert, please use with
-caution (or better yet, report security holes). At this time, this
-implementation does not provide for further challenges, nor does it
-support Authentication-Info header. It also uses md5, and an option
-to use sha would be a good thing.
-
-.. [1] http://www.faqs.org/rfcs/rfc2617.html
-"""
-from paste.httpexceptions import HTTPUnauthorized
-from paste.httpheaders import *
-try:
- from hashlib import md5
-except ImportError:
- from md5 import md5
-import time, random
-from urllib import quote as url_quote
-
-def digest_password(realm, username, password):
- """ construct the appropriate hashcode needed for HTTP digest """
- return md5("%s:%s:%s" % (username, realm, password)).hexdigest()
-
-class AuthDigestAuthenticator(object):
- """ implementation of RFC 2617 - HTTP Digest Authentication """
- def __init__(self, realm, authfunc):
- self.nonce = {} # list to prevent replay attacks
- self.authfunc = authfunc
- self.realm = realm
-
- def build_authentication(self, stale = ''):
- """ builds the authentication error """
- nonce = md5(
- "%s:%s" % (time.time(), random.random())).hexdigest()
- opaque = md5(
- "%s:%s" % (time.time(), random.random())).hexdigest()
- self.nonce[nonce] = None
- parts = {'realm': self.realm, 'qop': 'auth',
- 'nonce': nonce, 'opaque': opaque }
- if stale:
- parts['stale'] = 'true'
- head = ", ".join(['%s="%s"' % (k, v) for (k, v) in parts.items()])
- head = [("WWW-Authenticate", 'Digest %s' % head)]
- return HTTPUnauthorized(headers=head)
-
- def compute(self, ha1, username, response, method,
- path, nonce, nc, cnonce, qop):
- """ computes the authentication, raises error if unsuccessful """
- if not ha1:
- return self.build_authentication()
- ha2 = md5('%s:%s' % (method, path)).hexdigest()
- if qop:
- chk = "%s:%s:%s:%s:%s:%s" % (ha1, nonce, nc, cnonce, qop, ha2)
- else:
- chk = "%s:%s:%s" % (ha1, nonce, ha2)
- if response != md5(chk).hexdigest():
- if nonce in self.nonce:
- del self.nonce[nonce]
- return self.build_authentication()
- pnc = self.nonce.get(nonce,'00000000')
- if nc <= pnc:
- if nonce in self.nonce:
- del self.nonce[nonce]
- return self.build_authentication(stale = True)
- self.nonce[nonce] = nc
- return username
-
- def authenticate(self, environ):
- """ This function takes a WSGI environment and authenticates
- the request returning authenticated user or error.
- """
- method = REQUEST_METHOD(environ)
- fullpath = url_quote(SCRIPT_NAME(environ)) + url_quote(PATH_INFO(environ))
- authorization = AUTHORIZATION(environ)
- if not authorization:
- return self.build_authentication()
- (authmeth, auth) = authorization.split(" ", 1)
- if 'digest' != authmeth.lower():
- return self.build_authentication()
- amap = {}
- for itm in auth.split(", "):
- (k,v) = [s.strip() for s in itm.split("=", 1)]
- amap[k] = v.replace('"', '')
- try:
- username = amap['username']
- authpath = amap['uri']
- nonce = amap['nonce']
- realm = amap['realm']
- response = amap['response']
- assert authpath.split("?", 1)[0] in fullpath
- assert realm == self.realm
- qop = amap.get('qop', '')
- cnonce = amap.get('cnonce', '')
- nc = amap.get('nc', '00000000')
- if qop:
- assert 'auth' == qop
- assert nonce and nc
- except:
- return self.build_authentication()
- ha1 = self.authfunc(environ, realm, username)
- return self.compute(ha1, username, response, method, authpath,
- nonce, nc, cnonce, qop)
-
- __call__ = authenticate
-
-class AuthDigestHandler(object):
- """
- middleware for HTTP Digest authentication (RFC 2617)
-
- This component follows the procedure below:
-
- 0. If the REMOTE_USER environment variable is already populated;
- then this middleware is a no-op, and the request is passed
- along to the application.
-
- 1. If the HTTP_AUTHORIZATION header was not provided or specifies
- an algorithem other than ``digest``, then a HTTPUnauthorized
- response is generated with the challenge.
-
- 2. If the response is malformed or or if the user's credientials
- do not pass muster, another HTTPUnauthorized is raised.
-
- 3. If all goes well, and the user's credintials pass; then
- REMOTE_USER environment variable is filled in and the
- AUTH_TYPE is listed as 'digest'.
-
- Parameters:
-
- ``application``
-
- The application object is called only upon successful
- authentication, and can assume ``environ['REMOTE_USER']``
- is set. If the ``REMOTE_USER`` is already set, this
- middleware is simply pass-through.
-
- ``realm``
-
- This is a identifier for the authority that is requesting
- authorization. It is shown to the user and should be unique
- within the domain it is being used.
-
- ``authfunc``
-
- This is a callback function which performs the actual
- authentication; the signature of this callback is:
-
- authfunc(environ, realm, username) -> hashcode
-
- This module provides a 'digest_password' helper function
- which can help construct the hashcode; it is recommended
- that the hashcode is stored in a database, not the user's
- actual password (since you only need the hashcode).
- """
- def __init__(self, application, realm, authfunc):
- self.authenticate = AuthDigestAuthenticator(realm, authfunc)
- self.application = application
-
- def __call__(self, environ, start_response):
- username = REMOTE_USER(environ)
- if not username:
- result = self.authenticate(environ)
- if isinstance(result, str):
- AUTH_TYPE.update(environ,'digest')
- REMOTE_USER.update(environ, result)
- else:
- return result.wsgi_application(environ, start_response)
- return self.application(environ, start_response)
-
-middleware = AuthDigestHandler
-
-__all__ = ['digest_password', 'AuthDigestHandler' ]
-
-def make_digest(app, global_conf, realm, authfunc, **kw):
- """
- Grant access via digest authentication
-
- Config looks like this::
-
- [filter:grant]
- use = egg:Paste#auth_digest
- realm=myrealm
- authfunc=somepackage.somemodule:somefunction
-
- """
- from paste.util.import_string import eval_import
- import types
- authfunc = eval_import(authfunc)
- assert isinstance(authfunc, types.FunctionType), "authfunc must resolve to a function"
- return AuthDigestHandler(app, realm, authfunc)
-
-if "__main__" == __name__:
- import doctest
- doctest.testmod(optionflags=doctest.ELLIPSIS)
diff --git a/kcdc3/paste/auth/form.py b/kcdc3/paste/auth/form.py
deleted file mode 100644
index 4e6aa49a..00000000
--- a/kcdc3/paste/auth/form.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# (c) 2005 Clark C. Evans
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-# This code was written with funding by http://prometheusresearch.com
-"""
-Authentication via HTML Form
-
-This is a very simple HTML form login screen that asks for the username
-and password. This middleware component requires that an authorization
-function taking the name and passsword and that it be placed in your
-application stack. This class does not include any session management
-code or way to save the user's authorization; however, it is easy enough
-to put ``paste.auth.cookie`` in your application stack.
-
->>> from paste.wsgilib import dump_environ
->>> from paste.httpserver import serve
->>> from paste.auth.cookie import AuthCookieHandler
->>> from paste.auth.form import AuthFormHandler
->>> def authfunc(environ, username, password):
-... return username == password
->>> serve(AuthCookieHandler(
-... AuthFormHandler(dump_environ, authfunc)))
-serving on...
-
-"""
-from paste.request import construct_url, parse_formvars
-
-TEMPLATE = """\
-
- Please Login!
-
- `_ can parse. Simple IP
- addresses, IP/mask, ip<->ip ranges, and hostnames are allowed.
- """
-
- def __init__(self, app, ip_map, clobber_username=True):
- self.app = app
- self.ip_map = []
- for key, value in ip_map.items():
- self.ip_map.append((ip4.IP4Range(key),
- self._convert_user_role(value[0], value[1])))
- self.clobber_username = clobber_username
-
- def _convert_user_role(self, username, roles):
- if roles and isinstance(roles, basestring):
- roles = roles.split(',')
- return (username, roles)
-
- def __call__(self, environ, start_response):
- addr = ip4.ip2int(environ['REMOTE_ADDR'], False)
- remove_user = False
- add_roles = []
- for range, (username, roles) in self.ip_map:
- if addr in range:
- if roles:
- add_roles.extend(roles)
- if username == '__remove__':
- remove_user = True
- elif username:
- if (not environ.get('REMOTE_USER')
- or self.clobber_username):
- environ['REMOTE_USER'] = username
- if (remove_user and 'REMOTE_USER' in environ):
- del environ['REMOTE_USER']
- if roles:
- self._set_roles(environ, add_roles)
- return self.app(environ, start_response)
-
- def _set_roles(self, environ, roles):
- cur_roles = environ.get('REMOTE_USER_TOKENS', '').split(',')
- # Get rid of empty roles:
- cur_roles = filter(None, cur_roles)
- remove_roles = []
- for role in roles:
- if role.startswith('-'):
- remove_roles.append(role[1:])
- else:
- if role not in cur_roles:
- cur_roles.append(role)
- for role in remove_roles:
- if role in cur_roles:
- cur_roles.remove(role)
- environ['REMOTE_USER_TOKENS'] = ','.join(cur_roles)
-
-
-def make_grantip(app, global_conf, clobber_username=False, **kw):
- """
- Grant roles or usernames based on IP addresses.
-
- Config looks like this::
-
- [filter:grant]
- use = egg:Paste#grantip
- clobber_username = true
- # Give localhost system role (no username):
- 127.0.0.1 = -:system
- # Give everyone in 192.168.0.* editor role:
- 192.168.0.0/24 = -:editor
- # Give one IP the username joe:
- 192.168.0.7 = joe
- # And one IP is should not be logged in:
- 192.168.0.10 = __remove__:-editor
-
- """
- from paste.deploy.converters import asbool
- clobber_username = asbool(clobber_username)
- ip_map = {}
- for key, value in kw.items():
- if ':' in value:
- username, role = value.split(':', 1)
- else:
- username = value
- role = ''
- if username == '-':
- username = ''
- if role == '-':
- role = ''
- ip_map[key] = value
- return GrantIPMiddleware(app, ip_map, clobber_username)
-
-
diff --git a/kcdc3/paste/auth/multi.py b/kcdc3/paste/auth/multi.py
deleted file mode 100644
index b378fa6c..00000000
--- a/kcdc3/paste/auth/multi.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# (c) 2005 Clark C. Evans
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-# This code was written with funding by http://prometheusresearch.com
-"""
-Authentication via Multiple Methods
-
-In some environments, the choice of authentication method to be used
-depends upon the environment and is not "fixed". This middleware allows
-N authentication methods to be registered along with a goodness function
-which determines which method should be used. The following example
-demonstrates how to use both form and digest authentication in a server
-stack; by default it uses form-based authentication unless
-``*authmeth=digest`` is specified as a query argument.
-
->>> from paste.auth import form, cookie, digest, multi
->>> from paste.wsgilib import dump_environ
->>> from paste.httpserver import serve
->>>
->>> multi = multi.MultiHandler(dump_environ)
->>> def authfunc(environ, realm, user):
-... return digest.digest_password(realm, user, user)
->>> multi.add_method('digest', digest.middleware, "Test Realm", authfunc)
->>> multi.set_query_argument('digest')
->>>
->>> def authfunc(environ, username, password):
-... return username == password
->>> multi.add_method('form', form.middleware, authfunc)
->>> multi.set_default('form')
->>> serve(cookie.middleware(multi))
-serving on...
-
-"""
-
-class MultiHandler(object):
- """
- Multiple Authentication Handler
-
- This middleware provides two othogonal facilities:
-
- - a manner to register any number of authentication middlewares
-
- - a mechanism to register predicates which cause one of the
- registered middlewares to be used depending upon the request
-
- If none of the predicates returns True, then the application is
- invoked directly without middleware
- """
- def __init__(self, application):
- self.application = application
- self.default = application
- self.binding = {}
- self.predicate = []
- def add_method(self, name, factory, *args, **kwargs):
- self.binding[name] = factory(self.application, *args, **kwargs)
- def add_predicate(self, name, checker):
- self.predicate.append((checker, self.binding[name]))
- def set_default(self, name):
- """ set default authentication method """
- self.default = self.binding[name]
- def set_query_argument(self, name, key = '*authmeth', value = None):
- """ choose authentication method based on a query argument """
- lookfor = "%s=%s" % (key, value or name)
- self.add_predicate(name,
- lambda environ: lookfor in environ.get('QUERY_STRING',''))
- def __call__(self, environ, start_response):
- for (checker, binding) in self.predicate:
- if checker(environ):
- return binding(environ, start_response)
- return self.default(environ, start_response)
-
-middleware = MultiHandler
-
-__all__ = ['MultiHandler']
-
-if "__main__" == __name__:
- import doctest
- doctest.testmod(optionflags=doctest.ELLIPSIS)
-
diff --git a/kcdc3/paste/auth/open_id.py b/kcdc3/paste/auth/open_id.py
deleted file mode 100644
index f6efe61a..00000000
--- a/kcdc3/paste/auth/open_id.py
+++ /dev/null
@@ -1,412 +0,0 @@
-# (c) 2005 Ben Bangert
-# This module is part of the Python Paste Project and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-"""
-OpenID Authentication (Consumer)
-
-OpenID is a distributed authentication system for single sign-on originally
-developed at/for LiveJournal.com.
-
- http://openid.net/
-
-URL. You can have multiple identities in the same way you can have multiple
-URLs. All OpenID does is provide a way to prove that you own a URL (identity).
-And it does this without passing around your password, your email address, or
-anything you don't want it to. There's no profile exchange component at all:
-your profiile is your identity URL, but recipients of your identity can then
-learn more about you from any public, semantically interesting documents
-linked thereunder (FOAF, RSS, Atom, vCARD, etc.).
-
-``Note``: paste.auth.openid requires installation of the Python-OpenID
-libraries::
-
- http://www.openidenabled.com/
-
-This module is based highly off the consumer.py that Python OpenID comes with.
-
-Using the OpenID Middleware
-===========================
-
-Using the OpenID middleware is fairly easy, the most minimal example using the
-basic login form thats included::
-
- # Add to your wsgi app creation
- from paste.auth import open_id
-
- wsgi_app = open_id.middleware(wsgi_app, '/somewhere/to/store/openid/data')
-
-You will now have the OpenID form available at /oid on your site. Logging in will
-verify that the login worked.
-
-A more complete login should involve having the OpenID middleware load your own
-login page after verifying the OpenID URL so that you can retain the login
-information in your webapp (session, cookies, etc.)::
-
- wsgi_app = open_id.middleware(wsgi_app, '/somewhere/to/store/openid/data',
- login_redirect='/your/login/code')
-
-Your login code should then be configured to retrieve 'paste.auth.open_id' for
-the users OpenID URL. If this key does not exist, the user has not logged in.
-
-Once the login is retrieved, it should be saved in your webapp, and the user
-should be redirected to wherever they would normally go after a successful
-login.
-"""
-
-__all__ = ['AuthOpenIDHandler']
-
-import cgi
-import urlparse
-import re
-
-import paste.request
-from paste import httpexceptions
-
-def quoteattr(s):
- qs = cgi.escape(s, 1)
- return '"%s"' % (qs,)
-
-# You may need to manually add the openid package into your
-# python path if you don't have it installed with your system python.
-# If so, uncomment the line below, and change the path where you have
-# Python-OpenID.
-# sys.path.append('/path/to/openid/')
-
-from openid.store import filestore
-from openid.consumer import consumer
-from openid.oidutil import appendArgs
-
-class AuthOpenIDHandler(object):
- """
- This middleware implements OpenID Consumer behavior to authenticate a
- URL against an OpenID Server.
- """
-
- def __init__(self, app, data_store_path, auth_prefix='/oid',
- login_redirect=None, catch_401=False,
- url_to_username=None):
- """
- Initialize the OpenID middleware
-
- ``app``
- Your WSGI app to call
-
- ``data_store_path``
- Directory to store crypto data in for use with OpenID servers.
-
- ``auth_prefix``
- Location for authentication process/verification
-
- ``login_redirect``
- Location to load after successful process of login
-
- ``catch_401``
- If true, then any 401 responses will turn into open ID login
- requirements.
-
- ``url_to_username``
- A function called like ``url_to_username(environ, url)``, which should
- return a string username. If not given, the URL will be the username.
- """
- store = filestore.FileOpenIDStore(data_store_path)
- self.oidconsumer = consumer.OpenIDConsumer(store)
-
- self.app = app
- self.auth_prefix = auth_prefix
- self.data_store_path = data_store_path
- self.login_redirect = login_redirect
- self.catch_401 = catch_401
- self.url_to_username = url_to_username
-
- def __call__(self, environ, start_response):
- if environ['PATH_INFO'].startswith(self.auth_prefix):
- # Let's load everything into a request dict to pass around easier
- request = dict(environ=environ, start=start_response, body=[])
- request['base_url'] = paste.request.construct_url(environ, with_path_info=False,
- with_query_string=False)
-
- path = re.sub(self.auth_prefix, '', environ['PATH_INFO'])
- request['parsed_uri'] = urlparse.urlparse(path)
- request['query'] = dict(paste.request.parse_querystring(environ))
-
- path = request['parsed_uri'][2]
- if path == '/' or not path:
- return self.render(request)
- elif path == '/verify':
- return self.do_verify(request)
- elif path == '/process':
- return self.do_process(request)
- else:
- return self.not_found(request)
- else:
- if self.catch_401:
- return self.catch_401_app_call(environ, start_response)
- return self.app(environ, start_response)
-
- def catch_401_app_call(self, environ, start_response):
- """
- Call the application, and redirect if the app returns a 401 response
- """
- was_401 = []
- def replacement_start_response(status, headers, exc_info=None):
- if int(status.split(None, 1)) == 401:
- # @@: Do I need to append something to go back to where we
- # came from?
- was_401.append(1)
- def dummy_writer(v):
- pass
- return dummy_writer
- else:
- return start_response(status, headers, exc_info)
- app_iter = self.app(environ, replacement_start_response)
- if was_401:
- try:
- list(app_iter)
- finally:
- if hasattr(app_iter, 'close'):
- app_iter.close()
- redir_url = paste.request.construct_url(environ, with_path_info=False,
- with_query_string=False)
- exc = httpexceptions.HTTPTemporaryRedirect(redir_url)
- return exc.wsgi_application(environ, start_response)
- else:
- return app_iter
-
- def do_verify(self, request):
- """Process the form submission, initating OpenID verification.
- """
-
- # First, make sure that the user entered something
- openid_url = request['query'].get('openid_url')
- if not openid_url:
- return self.render(request, 'Enter an identity URL to verify.',
- css_class='error', form_contents=openid_url)
-
- oidconsumer = self.oidconsumer
-
- # Then, ask the library to begin the authorization.
- # Here we find out the identity server that will verify the
- # user's identity, and get a token that allows us to
- # communicate securely with the identity server.
- status, info = oidconsumer.beginAuth(openid_url)
-
- # If the URL was unusable (either because of network
- # conditions, a server error, or that the response returned
- # was not an OpenID identity page), the library will return
- # an error code. Let the user know that that URL is unusable.
- if status in [consumer.HTTP_FAILURE, consumer.PARSE_ERROR]:
- if status == consumer.HTTP_FAILURE:
- fmt = 'Failed to retrieve %s
-
-
- `_
-for more.
-"""
-
-import cgitb
-from cStringIO import StringIO
-import sys
-
-from paste.util import converters
-
-class NoDefault(object):
- pass
-
-class CgitbMiddleware(object):
-
- def __init__(self, app,
- global_conf=None,
- display=NoDefault,
- logdir=None,
- context=5,
- format="html"):
- self.app = app
- if global_conf is None:
- global_conf = {}
- if display is NoDefault:
- display = global_conf.get('debug')
- if isinstance(display, basestring):
- display = converters.asbool(display)
- self.display = display
- self.logdir = logdir
- self.context = int(context)
- self.format = format
-
- def __call__(self, environ, start_response):
- try:
- app_iter = self.app(environ, start_response)
- return self.catching_iter(app_iter, environ)
- except:
- exc_info = sys.exc_info()
- start_response('500 Internal Server Error',
- [('content-type', 'text/html')],
- exc_info)
- response = self.exception_handler(exc_info, environ)
- return [response]
-
- def catching_iter(self, app_iter, environ):
- if not app_iter:
- raise StopIteration
- error_on_close = False
- try:
- for v in app_iter:
- yield v
- if hasattr(app_iter, 'close'):
- error_on_close = True
- app_iter.close()
- except:
- response = self.exception_handler(sys.exc_info(), environ)
- if not error_on_close and hasattr(app_iter, 'close'):
- try:
- app_iter.close()
- except:
- close_response = self.exception_handler(
- sys.exc_info(), environ)
- response += (
- '
Error in .close():
%s' - % close_response) - yield response - - def exception_handler(self, exc_info, environ): - dummy_file = StringIO() - hook = cgitb.Hook(file=dummy_file, - display=self.display, - logdir=self.logdir, - context=self.context, - format=self.format) - hook(*exc_info) - return dummy_file.getvalue() - -def make_cgitb_middleware(app, global_conf, - display=NoDefault, - logdir=None, - context=5, - format='html'): - """ - Wraps the application in the ``cgitb`` (standard library) - error catcher. - - display: - If true (or debug is set in the global configuration) - then the traceback will be displayed in the browser - - logdir: - Writes logs of all errors in that directory - - context: - Number of lines of context to show around each line of - source code - """ - from paste.deploy.converters import asbool - if display is not NoDefault: - display = asbool(display) - if 'debug' in global_conf: - global_conf['debug'] = asbool(global_conf['debug']) - return CgitbMiddleware( - app, global_conf=global_conf, - display=display, - logdir=logdir, - context=context, - format=format) diff --git a/kcdc3/paste/config.py b/kcdc3/paste/config.py deleted file mode 100644 index c5315797..00000000 --- a/kcdc3/paste/config.py +++ /dev/null @@ -1,120 +0,0 @@ -# (c) 2006 Ian Bicking, Philip Jenvey and contributors -# Written for Paste (http://pythonpaste.org) -# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php -"""Paste Configuration Middleware and Objects""" -from paste.registry import RegistryManager, StackedObjectProxy - -__all__ = ['DispatchingConfig', 'CONFIG', 'ConfigMiddleware'] - -class DispatchingConfig(StackedObjectProxy): - """ - This is a configuration object that can be used globally, - imported, have references held onto. The configuration may differ - by thread (or may not). - - Specific configurations are registered (and deregistered) either - for the process or for threads. - """ - # @@: What should happen when someone tries to add this - # configuration to itself? Probably the conf should become - # resolved, and get rid of this delegation wrapper - - def __init__(self, name='DispatchingConfig'): - super(DispatchingConfig, self).__init__(name=name) - self.__dict__['_process_configs'] = [] - - def push_thread_config(self, conf): - """ - Make ``conf`` the active configuration for this thread. - Thread-local configuration always overrides process-wide - configuration. - - This should be used like:: - - conf = make_conf() - dispatching_config.push_thread_config(conf) - try: - ... do stuff ... - finally: - dispatching_config.pop_thread_config(conf) - """ - self._push_object(conf) - - def pop_thread_config(self, conf=None): - """ - Remove a thread-local configuration. If ``conf`` is given, - it is checked against the popped configuration and an error - is emitted if they don't match. - """ - self._pop_object(conf) - - def push_process_config(self, conf): - """ - Like push_thread_config, but applies the configuration to - the entire process. - """ - self._process_configs.append(conf) - - def pop_process_config(self, conf=None): - self._pop_from(self._process_configs, conf) - - def _pop_from(self, lst, conf): - popped = lst.pop() - if conf is not None and popped is not conf: - raise AssertionError( - "The config popped (%s) is not the same as the config " - "expected (%s)" - % (popped, conf)) - - def _current_obj(self): - try: - return super(DispatchingConfig, self)._current_obj() - except TypeError: - if self._process_configs: - return self._process_configs[-1] - raise AttributeError( - "No configuration has been registered for this process " - "or thread") - current = current_conf = _current_obj - -CONFIG = DispatchingConfig() - -no_config = object() -class ConfigMiddleware(RegistryManager): - """ - A WSGI middleware that adds a ``paste.config`` key (by default) - to the request environment, as well as registering the - configuration temporarily (for the length of the request) with - ``paste.config.CONFIG`` (or any other ``DispatchingConfig`` - object). - """ - - def __init__(self, application, config, dispatching_config=CONFIG, - environ_key='paste.config'): - """ - This delegates all requests to `application`, adding a *copy* - of the configuration `config`. - """ - def register_config(environ, start_response): - popped_config = environ.get(environ_key, no_config) - current_config = environ[environ_key] = config.copy() - environ['paste.registry'].register(dispatching_config, - current_config) - - try: - app_iter = application(environ, start_response) - finally: - if popped_config is no_config: - environ.pop(environ_key, None) - else: - environ[environ_key] = popped_config - return app_iter - - super(self.__class__, self).__init__(register_config) - -def make_config_filter(app, global_conf, **local_conf): - conf = global_conf.copy() - conf.update(local_conf) - return ConfigMiddleware(app, conf) - -make_config_middleware = ConfigMiddleware.__doc__ diff --git a/kcdc3/paste/cowbell/__init__.py b/kcdc3/paste/cowbell/__init__.py deleted file mode 100644 index 43b7097b..00000000 --- a/kcdc3/paste/cowbell/__init__.py +++ /dev/null @@ -1,104 +0,0 @@ -# Cowbell images: http://commons.wikimedia.org/wiki/Image:Cowbell-1.jpg -import os -import re -from paste.fileapp import FileApp -from paste.response import header_value, remove_header - -SOUND = "http://www.c-eye.net/eyeon/WalkenWAVS/explorestudiospace.wav" - -class MoreCowbell(object): - def __init__(self, app): - self.app = app - def __call__(self, environ, start_response): - path_info = environ.get('PATH_INFO', '') - script_name = environ.get('SCRIPT_NAME', '') - for filename in ['bell-ascending.png', 'bell-descending.png']: - if path_info == '/.cowbell/'+ filename: - app = FileApp(os.path.join(os.path.dirname(__file__), filename)) - return app(environ, start_response) - type = [] - body = [] - def repl_start_response(status, headers, exc_info=None): - ct = header_value(headers, 'content-type') - if ct and ct.startswith('text/html'): - type.append(ct) - remove_header(headers, 'content-length') - start_response(status, headers, exc_info) - return body.append - return start_response(status, headers, exc_info) - app_iter = self.app(environ, repl_start_response) - if type: - # Got text/html - body.extend(app_iter) - body = ''.join(body) - body = insert_head(body, self.javascript.replace('__SCRIPT_NAME__', script_name)) - body = insert_body(body, self.resources.replace('__SCRIPT_NAME__', script_name)) - return [body] - else: - return app_iter - - javascript = '''\ - -''' - - resources = '''\ - - -''' - -def insert_head(body, text): - end_head = re.search(r'', body, re.I) - if end_head: - return body[:end_head.start()] + text + body[end_head.end():] - else: - return text + body - -def insert_body(body, text): - end_body = re.search(r'
Upcoming classes
{% endifchanged %} -- - {{ event.title }} + {% if event.type == "EXTERNAL" %}Partner Event:{% endif %} + {{ event.title | smartquotes | safe }}
+ + {% if event.thumbnail %}{% endif %}
+
{{ event.summary|safe }}
+
user Instructor{{ event.num_teachers|pluralize }}: {% for bio in event.teacher_bios.all %}{% if not forloop.first %}, {% endif %}{{ bio.name }}{% endfor %}
@@ -102,21 +120,30 @@Recent classes
{% endifchanged %} {% endifchanged %} -- - {{ event.title }} + {% if event.type == "EXTERNAL" %}Partner Event:{% endif %} + {{ event.title | smartquotes | safe }}
+ {% if event.thumbnail %}{% endif %}
{{ event.summary|safe }}
user Instructor{{ event.num_teachers|pluralize }}: {% for bio in event.teacher_bios.all %}{% if not forloop.first %}, {% endif %}{{ bio.name }}{% endfor %} + {% if event.teacher_text %}{{ event.teacher_text|safe }}{% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/kcdc3/templates/classes/event_session.html b/kcdc3/apps/classes/templates/classes/event_session.html
similarity index 100%
rename from kcdc3/templates/classes/event_session.html
rename to kcdc3/apps/classes/templates/classes/event_session.html
diff --git a/kcdc3/templates/classes/facilitator_event_detail.html b/kcdc3/apps/classes/templates/classes/facilitator_event_detail.html
similarity index 89%
rename from kcdc3/templates/classes/facilitator_event_detail.html
rename to kcdc3/apps/classes/templates/classes/facilitator_event_detail.html
index 47ea948c..c140c5cb 100644
--- a/kcdc3/templates/classes/facilitator_event_detail.html
+++ b/kcdc3/apps/classes/templates/classes/facilitator_event_detail.html
@@ -16,6 +16,9 @@ Registered students ({{ registration_count }})
email
+
+ phone
+
date registered
@@ -34,6 +37,9 @@ Registered students ({{ registration_count }})
{{ registration.student.email }}
+
+ {{ registration.student.extendedprofile.phone_number }}
+
{{ registration.date_registered }}
@@ -65,6 +71,9 @@ Waitlisted students ({{ waitlist_count }})
email
+
+ phone
+
date registered
@@ -80,6 +89,9 @@ Waitlisted students ({{ waitlist_count }})
{{ registration.student.email }}
+
+ {{ registration.student.extendedprofile.phone_number }}
+
{{ registration.date_registered }}
diff --git a/kcdc3/templates/classes/registration_list.html b/kcdc3/apps/classes/templates/classes/registration_list.html
similarity index 100%
rename from kcdc3/templates/classes/registration_list.html
rename to kcdc3/apps/classes/templates/classes/registration_list.html
diff --git a/kcdc3/templates/classes/response.html b/kcdc3/apps/classes/templates/classes/response.html
similarity index 100%
rename from kcdc3/templates/classes/response.html
rename to kcdc3/apps/classes/templates/classes/response.html
diff --git a/kcdc3/apps/classes/templates/classes/staff.html b/kcdc3/apps/classes/templates/classes/staff.html
new file mode 100644
index 00000000..d68f02d2
--- /dev/null
+++ b/kcdc3/apps/classes/templates/classes/staff.html
@@ -0,0 +1,92 @@
+
+
+
+
+
+ Knowledge Commons DC {% block title %}{% endblock %}
+
+
+
+
+
+
+
+
+
+
+
+ Knowledge Commons DC
+ skip to content
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {% block pre_content %}{% endblock %}
+
+ {% block content_shell %}
+
+
+ {% block content %}{% endblock %}
+ {% block sidebar %}{% endblock %}
+
+
+ {% endblock %}
+
+ {% block post_content %}{% endblock %}
+
+ {% comment %}
+
+ {% endcomment %}
+
+
+
+
+
+
+
+
+ {% block local_scripts %}{% endblock %}
+
+
+
diff --git a/kcdc3/apps/classes/templates/classes/staff_registration_list.html b/kcdc3/apps/classes/templates/classes/staff_registration_list.html
new file mode 100644
index 00000000..315d5d5b
--- /dev/null
+++ b/kcdc3/apps/classes/templates/classes/staff_registration_list.html
@@ -0,0 +1,77 @@
+
+
+{% block content %}
+
+ Registrations
+
Knowledge Commons DC
+ skip to content +
+
+
+
+
+
+
+ | + name + | ++ username + | ++ email + | ++ class + | ++ class date + | ++ date registered + | ++ date cancelled + | ++ date promoted + | ++ late promotion + | ++ attended + | +
| + {{ registration.student.first_name }} {{ registration.student.last_name }} + | ++ {{ registration.student.username }} + | ++ {{ registration.student.email }} + | ++ {{ registration.event }} + | ++ {{ registration.event.date }} + | ++ {{ registration.date_registered }} + | ++ {{ registration.date_cancelled }} + | ++ {{ registration.date_promoted }} + | ++ {{ registration.late_promotion }} + | ++ {{ registration.attended }} + | +
+ +
Sessions
+| + | ++ Session + | ++ Status + | ++ Regular classes + | ++ Registrations + | ++ Attended + | ++ Reports + | +|
| + Edit + | ++ {{ session.long_title }} + | ++ {{ session.status }} + | ++ {{ session.get_live_classes.count }} + | ++ {{ session.get_registrations.count }} + | ++ {{ session.get_attended_registrations.count }} + | ++ Teachers + | ++ Registrations + | +
+ + + + +{% endblock %} + diff --git a/kcdc3/apps/classes/templates/classes/staff_teacher_list.html b/kcdc3/apps/classes/templates/classes/staff_teacher_list.html new file mode 100644 index 00000000..c6ddabce --- /dev/null +++ b/kcdc3/apps/classes/templates/classes/staff_teacher_list.html @@ -0,0 +1,72 @@ + + +{% block content %} + +
Teachers
+| + | ++ | ++ name + | ++ email + | ++ rating + | ++ comments + | ++ total + | ++ classes + | +
| + Edit + | ++ {{ forloop.counter }} + | ++ {{ bio.name }} + | ++ {{ bio.get_email }} + | ++ {% if bio.rating %}{{ bio.rating }}{% endif %} + | ++ {% if bio.comments %}{{ bio.comments }}{% endif %} + | ++ {{ bio.get_classes.count }} + | ++ {% for event in bio.get_classes.all %} + {{ event.title }} + {% endfor %} + | +
+ + {% for bio in teacher_list %} + {{ bio.get_email }}, + {% endfor %} + + + +{% endblock %} + diff --git a/kcdc3/classes/tests.py b/kcdc3/apps/classes/tests.py similarity index 100% rename from kcdc3/classes/tests.py rename to kcdc3/apps/classes/tests.py diff --git a/kcdc3/apps/classes/urls.py b/kcdc3/apps/classes/urls.py new file mode 100644 index 00000000..d1c5491d --- /dev/null +++ b/kcdc3/apps/classes/urls.py @@ -0,0 +1,20 @@ +from django.conf.urls import patterns, include, url +from models import Event, Registration +from views import EventListView, EventDetailView, ResponseTemplateView, EventArchiveView, SessionView, RegistrationListView, SessionAdminListView, TeacherAdminListView, FilteredTeacherAdminListView + +urlpatterns = patterns('kcdc3.apps.classes.views', + + url(r'^$', EventListView.as_view()), + url(r'^staff/$', SessionAdminListView.as_view()), + url(r'^staff/teachers/$', TeacherAdminListView.as_view()), + url(r'^staff/teachers/session/(?P
+ {% if post.department_label %}
+
+ {{ post.department_label }}
{% endif %} +{{ post.title }}
+ +
+
+ {{ post.main_text|safe }}
+
+ {% if post.author.count > 0 %}
+
+ {% for bio in post.author.all %} + {{ bio.get_staff_description|safe }} + {% endfor %} + {% endif %} + +
+
+{% endblock %}
+
+
diff --git a/kcdc3/apps/pigeon/templates/pigeon/post_list.html b/kcdc3/apps/pigeon/templates/pigeon/post_list.html
new file mode 100644
index 00000000..6fecbb43
--- /dev/null
+++ b/kcdc3/apps/pigeon/templates/pigeon/post_list.html
@@ -0,0 +1,61 @@
+{% extends "pigeon/base.html" %}
+
+
+
+{% block title %}
+ / Blog
+{% endblock %}
+
+
+
+{% block content %}
+
+ + {% for bio in post.author.all %} + {{ bio.get_staff_description|safe }} + {% endfor %} + {% endif %} + +
+
+
+ Blog
+
+
+
+
+{% endblock %}
+
diff --git a/kcdc3/apps/pigeon/urls.py b/kcdc3/apps/pigeon/urls.py
new file mode 100644
index 00000000..fea880cc
--- /dev/null
+++ b/kcdc3/apps/pigeon/urls.py
@@ -0,0 +1,12 @@
+from django.conf.urls import patterns, include, url
+from models import Post
+from views import PostListView, PostArchiveView, PostDetailView, BlogFeed
+
+urlpatterns = patterns('pigeon.views',
+
+ url(r'^$', PostListView.as_view()),
+ url(r'^rss/$', BlogFeed()),
+ url(r'^(?P-
+
+ {% for post in recent_posts %}
+
+ {% ifchanged %}
+
- + {{ post.date|date:"j F Y" }} + + {% endifchanged %} + +
-
+
+
+
+ {% if post.department_label %}{{ post.department_label }}: {% endif %} + {{ post.title }} +
+ + {% if post.author.count > 0 %} +By + {% for bio in post.author.all %} + {% if forloop.last %}{% if forloop.counter > 1 %} and {% endif %}{% endif %} + {{ bio.name }}{% if not forloop.last %}{% if post.author.all|length > 2 %}, {% endif %}{% endif %} + {% endfor %} +
+ {% endif %} + + {{ post.teaser|safe }} + + +
+
+
+ {% endfor %}
+
+
+
+
+
+
+ + Knowledge Commons DC is a free school for thinkers, doers, and tinkerers – taught anywhere, by anyone, for everyone. +
+ +
+
+
+{% endblock %}
+
+
+
+{% block content %}
+
+
+
+
+
+ -
+ {% for slide in slides %}
+ {% if slide.image %}
+
- {{ slide.main_text | smartquotes | safe }} + {% endif %} + {% endfor %} +
+ {% for notice in notices %}
+ {{ notice.main_text | smartquotes | safe }}
+ {% endfor %}
+
+
+
+ {% for event in events %}
+
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+{% endblock %}
+
+
+
+
+{% block local_scripts %}
+
+
+
+
+{% endblock %}
+
+
+
diff --git a/kcdc3/apps/pinata/templates/pinata/page.html b/kcdc3/apps/pinata/templates/pinata/page.html
new file mode 100644
index 00000000..19a5b753
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/page.html
@@ -0,0 +1,44 @@
+{% extends "pinata/base.html" %}
+
+
+
+{% block title %}
+ / {{ short_title }}
+{% endblock %}
+
+
+
+
+{% block content %}
+
+ Blog
+ + {% for post in posts %} + + {% endfor %} +
+
+
+ {{ title }}
+
+ {{ main_text|safe }}
+
+
+{% endblock %}
+
+
+
+{% block sidebar_content %}
+ {{ sidebar_text|safe }}
+{% endblock %}
+
+
+{% if siblings or children %}
+ {% block sidebar_nav %}
+
+
+ {% endblock %}
+{% endif %}
\ No newline at end of file
diff --git a/kcdc3/apps/pinata/templates/pinata/page_nosidebar.html b/kcdc3/apps/pinata/templates/pinata/page_nosidebar.html
new file mode 100644
index 00000000..36024310
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/page_nosidebar.html
@@ -0,0 +1,8 @@
+{% extends "pinata/page.html" %}
+
+
+{% block sidebar %}
+
+
+
+{% endblock %}
diff --git a/kcdc3/apps/pinata/templates/pinata/page_wide.html b/kcdc3/apps/pinata/templates/pinata/page_wide.html
new file mode 100644
index 00000000..003acad7
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/page_wide.html
@@ -0,0 +1,49 @@
+{% extends "pinata/base.html" %}
+
+
+
+{% block title %}
+ / {{ short_title }}
+{% endblock %}
+
+
+
+
+{% block content_shell %}
+
+ -
+ {% for page in siblings %}
+
- ▻{{ page.short_title }} + {% endfor %} + {% for page in children %} +
- ▻{{ page.short_title }} + {% endfor %} +
+
+ {% if siblings or children %}
+ {% block local_nav_wide %}
+
+
+{% endblock %}
+
+
+
diff --git a/kcdc3/apps/pinata/templates/pinata/partners.html b/kcdc3/apps/pinata/templates/pinata/partners.html
new file mode 100644
index 00000000..7d1bcc75
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/partners.html
@@ -0,0 +1,49 @@
+{% extends "pinata/page.html" %}
+
+
+
+
+{% block content %}
+
+
+
+ {% endblock %}
+ {% endif %}
+
+ {% block content %}
+
+ -
+ {% for page in siblings %}
+
- {{ page.short_title }} + {% endfor %} + {% for page in children %} +
- {{ page.short_title }} + {% endfor %} +
+
+
+ {{ title }}
+
+ {{ main_text|safe }}
+
+
+ {% endblock %}
+ {% block sidebar %}{% endblock %}
+
+
+
+
+ {{ title }}
+
+
+ {{ main_text|safe }}
+
+
+
+{% endblock %}
+
diff --git a/kcdc3/apps/pinata/templates/pinata/pressclippings.html b/kcdc3/apps/pinata/templates/pinata/pressclippings.html
new file mode 100644
index 00000000..17867bcb
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/pressclippings.html
@@ -0,0 +1,54 @@
+{% extends "pinata/page.html" %}
+
+
+{% block body_class %}s_press p_press{% endblock %}
+
+
+{% block content %}
+
+
+ {% for sponsor in sponsors_A %}
+
+
+
+ {% if sponsor.destination_url %}{% endif %}
+ 
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% endfor %}
+
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% for sponsor in sponsors_S %}
+
+
+
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% endfor %}
+
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% for sponsor in sponsors_B %}
+
+
+
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% if sponsor.destination_url %}{% endif %}
+
+ {% endfor %}
+
+ {% if sponsor.destination_url %}{% endif %}
+
+
+
+ {{ short_title }}
+
+
+
+
+{% endblock %}
+
diff --git a/kcdc3/apps/pinata/templates/pinata/proposal.html b/kcdc3/apps/pinata/templates/pinata/proposal.html
new file mode 100644
index 00000000..b96e7b93
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/proposal.html
@@ -0,0 +1,38 @@
+{% extends "pinata/page.html" %}
+
+
+{% block content %}
+
+
+
+ {% for pressclipping in pressclippings reversed %}
+
+
+
+
+
+ {% if pressclipping.destination_url %}
+
+ {% endif %}
+
+ {% if pressclipping.image %}
+ 
+ {% else %}
+
+
+
+ {% endfor %}
+
+
+ {% else %}
+ {{ pressclipping.publication }}
+ {% endif %} + +
+ {% if pressclipping.title %}{{ pressclipping.title }}
{% endif %}
+ {{ pressclipping.date|date:"j F Y" }}
+
“{{ pressclipping.excerpt }}”
+ {% endif %} + + {% if pressclipping.destination_url %} + + {% endif %} + +
+
+
+ {{ title }}
+
+
+ {{ main_text|safe }}
+
+
+
+
+{% endblock %}
+
+
+
diff --git a/kcdc3/apps/pinata/templates/pinata/staff.html b/kcdc3/apps/pinata/templates/pinata/staff.html
new file mode 100644
index 00000000..dfaeda6a
--- /dev/null
+++ b/kcdc3/apps/pinata/templates/pinata/staff.html
@@ -0,0 +1,89 @@
+{% extends "pinata/page.html" %}
+
+
+
+{% block title %}
+ / {{ short_title }}
+{% endblock %}
+
+
+
+{% block content %}
+
+
+ Fill out the proposal form.
+
+
+
+
+
+
+ {{ title }}
+
+
+ {{ main_text|safe }}
+
+
+
+{% endblock %}
+
+
+
+{% block sidebar_text %}
+ {{ sidebar_text|safe }}
+{% endblock %}
+
diff --git a/kcdc3/apps/pinata/templatetags/__init__.py b/kcdc3/apps/pinata/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/kcdc3/apps/pinata/templatetags/pinata_filters.py b/kcdc3/apps/pinata/templatetags/pinata_filters.py
new file mode 100644
index 00000000..d1ed5457
--- /dev/null
+++ b/kcdc3/apps/pinata/templatetags/pinata_filters.py
@@ -0,0 +1,8 @@
+from django import template
+from smartypants import smartypants
+
+register = template.Library()
+
+@register.filter
+def smartquotes(text):
+ return smartypants(text)
diff --git a/kcdc3/apps/pinata/urls.py b/kcdc3/apps/pinata/urls.py
new file mode 100644
index 00000000..96b2b8ab
--- /dev/null
+++ b/kcdc3/apps/pinata/urls.py
@@ -0,0 +1,9 @@
+from django.conf.urls import patterns, include, url
+from models import Page
+
+urlpatterns = patterns('kcdc3.apps.pinata.views',
+
+ url(r'^$', 'page_view'),
+ url(r'^[0-9a-zA-Z_-]+/$', 'page_view'),
+
+)
diff --git a/kcdc3/apps/pinata/views.py b/kcdc3/apps/pinata/views.py
new file mode 100644
index 00000000..d572eb34
--- /dev/null
+++ b/kcdc3/apps/pinata/views.py
@@ -0,0 +1,204 @@
+from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, Http404
+from django.shortcuts import render_to_response
+from datetime import datetime
+from django.template import Context
+from django.views.generic import DetailView, TemplateView, ListView
+from django.db.models import Q
+from models import Page, Notice, Slide, Sponsor, PressClipping
+from kcdc3.apps.classes.models import Bio, Role, Event, Session
+from kcdc3.apps.pigeon.models import Post
+
+
+def page_view(request):
+ """ Handle requests for pages. """
+
+ context = Context()
+ context['user'] = request.user
+
+ # debug
+ # print('path: "'+request.path+'"')
+
+ # Remove trailing slashes from incoming path.
+ # Probably best handled in urls.py,
+ # and there is probably a more future-proof way of doing this.
+ search_path = request.path.rstrip('/')
+
+ # debug
+ # print('search path: "'+search_path+'"')
+
+ e = Page.objects.get(path=search_path)
+
+ context['title'] = e.title
+ context['short_title'] = e.short_title
+ context['id'] = e.id
+ context['path'] = e.path
+ context['teaser'] = e.teaser
+ context['main_text'] = e.main_text
+ context['sidebar_text'] = e.sidebar_text
+ context['parent'] = e.parent
+
+ # get all other pages with the same parent
+ if e.parent:
+ context['siblings'] = Page.objects.filter(Q(parent=e.parent)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ # get all children
+ context['children'] = Page.objects.filter(Q(parent=e)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ # set up templates
+ template_path = 'pinata/' + e.template
+
+ if e.status == 'PUBLISHED' or e.status == 'HIDDEN':
+ return render_to_response(template_path, context)
+ else:
+ raise Http404
+
+
+
+def staff(request):
+ """ Front page of the About section.
+ Includes staff and volunteer listings. """
+
+ """ TODO: This really ought to be a class-based view """
+
+ context = Context()
+ context['user'] = request.user
+
+ e = Page.objects.get(path='/about')
+ print(e.main_text)
+ context['main_text'] = e.main_text
+ context['short_title'] = e.short_title
+ context['title'] = e.title
+
+ context['dojo'] = Bio.objects.filter(role__name='Dojo')
+ context['volunteers'] = Bio.objects.filter(role__name='Volunteers')
+ context['dojo_at_large'] = Bio.objects.filter(role__name='Dojo-at-Large')
+ context['dojo_emeritus'] = Bio.objects.filter(role__name='Dojo Emeritus')
+
+ context['dojo_role'] = Role.objects.get(name='Dojo')
+ context['volunteers_role'] = Role.objects.get(name='Volunteers')
+ context['dojo_at_large_role'] = Role.objects.get(name='Dojo-at-Large')
+ context['dojo_emeritus_role'] = Role.objects.get(name='Dojo Emeritus')
+
+ # get all other pages with the same parent
+ if e.parent:
+ context['siblings'] = Page.objects.filter(Q(parent=e.parent)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ # todo: rewrite this so it returns section home and subpages
+ # todo: write new function that returns children only for non-section-homes
+
+ # get all children
+ context['children'] = Page.objects.filter(Q(parent=e)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ return render_to_response('pinata/staff.html',context)
+
+
+
+def home(request):
+ """ Sitewide home page """
+
+ context = Context()
+ context['user'] = request.user
+
+ # Get information for front page content
+ context['notices'] = Notice.objects.filter(live=True)
+ context['slides'] = Slide.objects.filter(live=True)
+
+ # Pull content from elsewhere in the site
+ context['events'] = Event.objects.filter(status='PUBLISHED', session__status="CURRENT", featured=True).order_by('date')[:4]
+ context['posts'] = Post.objects.filter(status='PUBLISHED').filter(featured=True).exclude(date__gte=datetime.now())[:4]
+
+ return render_to_response('pinata/home.html',context)
+
+
+
+
+def proposal(request):
+ """ Course proposal page """
+
+ """ TODO: The observant reader may note that this method
+ is identical to contribute(), except for the template name.
+ Really, though, it would be best to modify page_view() and
+ Page so that admins could choose a template on the backend. """
+
+ context = Context()
+ context['user'] = request.user
+
+ e = Page.objects.get(path='/teach/proposal')
+ print(e.main_text)
+ context['main_text'] = e.main_text
+ context['short_title'] = e.short_title
+ context['title'] = e.title
+ context['id'] = e.id
+
+ # get all other pages with the same parent
+ if e.parent:
+ context['siblings'] = Page.objects.filter(Q(parent=e.parent)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ # get all children
+ context['children'] = Page.objects.filter(Q(parent=e)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ return render_to_response('pinata/proposal.html',context)
+
+
+
+
+
+def partners(request):
+ """ List of sponsors. """
+
+ """ TODO: This really ought to be a class-based view """
+
+ context = Context()
+ context['user'] = request.user
+
+ e = Page.objects.get(path='/about/partners')
+ print(e.main_text)
+ context['main_text'] = e.main_text
+ context['short_title'] = e.short_title
+ context['title'] = e.title
+ context['id'] = e.id
+
+ context['sponsors_A'] = Sponsor.objects.filter(group='A').filter(status='PUBLISHED')
+ context['sponsors_B'] = Sponsor.objects.filter(group='B').filter(status='PUBLISHED')
+ context['sponsors_S'] = Sponsor.objects.filter(group='S').filter(status='PUBLISHED')
+
+ # get all other pages with the same parent
+ if e.parent:
+ context['siblings'] = Page.objects.filter(Q(parent=e.parent)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ # get all children
+ context['children'] = Page.objects.filter(Q(parent=e)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ return render_to_response('pinata/partners.html',context)
+
+
+
+
+def pressclippings(request):
+ """ List of press clippings. """
+
+ """ TODO: This really ought to class-based view """
+
+ context = Context()
+ context['user'] = request.user
+
+ e = Page.objects.get(path='/press')
+ print(e.main_text)
+ context['main_text'] = e.main_text
+ context['short_title'] = e.short_title
+ context['title'] = e.title
+ context['id'] = e.id
+
+ context['pressclippings'] = PressClipping.objects.filter(status='PUBLISHED')
+
+ # get all other pages with the same parent
+ if e.parent:
+ context['siblings'] = Page.objects.filter(Q(parent=e.parent)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ # get all children
+ context['children'] = Page.objects.filter(Q(parent=e)&Q(status='PUBLISHED')).order_by('sort_order', 'path',)
+
+ return render_to_response('pinata/pressclippings.html',context)
+
+
+
diff --git a/kcdc3/classes/urls.py b/kcdc3/classes/urls.py
deleted file mode 100644
index 596df79c..00000000
--- a/kcdc3/classes/urls.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from django.conf.urls import patterns, include, url
-from classes.models import Event, Registration
-from classes.views import EventListView, EventDetailView, ResponseTemplateView, EventArchiveView, SessionView, RegistrationListView
-
-urlpatterns = patterns('classes.views',
-
- url(r'^$', EventListView.as_view()),
- url(r'^dashboard/registrations/(?PThe Wonder Dojo
+ {{ dojo_role.description|safe }} +
+ {% for bio in dojo %}
+
+ {{ dojo_role.extended_description|safe }}
+
+
+ {% if bio.website %}{% endif %}
+
+ {% endfor %}
+
+ {% if bio.image %}
+ 
+ {% endif %}
+
+
+ {% endif %}
+ {{ bio.name }}
+{{ bio.title }}
+ {% if bio.website %}{% endif %} +Volunteers
+ {{ volunteers_role.description|safe }} + {% if volunteers %} +
+ {% for bio in volunteers %}
+
+ {% endif %}
+ {{ volunteers_role.extended_description|safe }}
+
+
+
+ {% endfor %}
+ {{ bio.name }}
+{{ bio.title }}
+Dojo-at-Large and Emeritus
+ + {#Dojo-at-Large
#} + {# {{ dojo_at_large_role.description|safe }} #} + {% if dojo_at_large %} ++ At-Large: + {% for bio in dojo_at_large %} + {{ bio.name }}{% if bio.title %} ({{ bio.title }}){% endif %}{% if not forloop.last %}, {% endif %} + {% endfor %} +
+ {% endif %} + {{ dojo_at_large_role.extended_description|safe }} + + {#Dojo Emeritus
#} + {# {{ dojo_emeritus_role.description|safe }} #} + {% if dojo_emeritus %} ++ Emeritus: + {% for bio in dojo_emeritus %} + {{ bio.name }}{% if bio.title %} ({{ bio.title }}){% endif %}{% if not forloop.last %}, {% endif %} + {% endfor %} +
+ {% endif %} + {{ dojo_emeritus_role.extended_description|safe }} + +Please Login
- - - -""" - -class AuthFormHandler(object): - """ - HTML-based login middleware - - This causes a HTML form to be returned if ``REMOTE_USER`` is - not found in the ``environ``. If the form is returned, the - ``username`` and ``password`` combination are given to a - user-supplied authentication function, ``authfunc``. If this - is successful, then application processing continues. - - Parameters: - - ``application`` - - The application object is called only upon successful - authentication, and can assume ``environ['REMOTE_USER']`` - is set. If the ``REMOTE_USER`` is already set, this - middleware is simply pass-through. - - ``authfunc`` - - This is a mandatory user-defined function which takes a - ``environ``, ``username`` and ``password`` for its first - three arguments. It should return ``True`` if the user is - authenticated. - - ``template`` - - This is an optional (a default is provided) HTML - fragment that takes exactly one ``%s`` substution - argument; which *must* be used for the form's ``action`` - to ensure that this middleware component does not alter - the current path. The HTML form must use ``POST`` and - have two input names: ``username`` and ``password``. - - Since the authentication form is submitted (via ``POST``) - neither the ``PATH_INFO`` nor the ``QUERY_STRING`` are accessed, - and hence the current path remains _unaltered_ through the - entire authentication process. If authentication succeeds, the - ``REQUEST_METHOD`` is converted from a ``POST`` to a ``GET``, - so that a redirect is unnecessary (unlike most form auth - implementations) - """ - - def __init__(self, application, authfunc, template=None): - self.application = application - self.authfunc = authfunc - self.template = template or TEMPLATE - - def __call__(self, environ, start_response): - username = environ.get('REMOTE_USER','') - if username: - return self.application(environ, start_response) - - if 'POST' == environ['REQUEST_METHOD']: - formvars = parse_formvars(environ, include_get_vars=False) - username = formvars.get('username') - password = formvars.get('password') - if username and password: - if self.authfunc(environ, username, password): - environ['AUTH_TYPE'] = 'form' - environ['REMOTE_USER'] = username - environ['REQUEST_METHOD'] = 'GET' - environ['CONTENT_LENGTH'] = '' - environ['CONTENT_TYPE'] = '' - del environ['paste.parsed_formvars'] - return self.application(environ, start_response) - - content = self.template % construct_url(environ) - start_response("200 OK", [('Content-Type', 'text/html'), - ('Content-Length', str(len(content)))]) - return [content] - -middleware = AuthFormHandler - -__all__ = ['AuthFormHandler'] - -def make_form(app, global_conf, realm, authfunc, **kw): - """ - Grant access via form authentication - - Config looks like this:: - - [filter:grant] - use = egg:Paste#auth_form - realm=myrealm - authfunc=somepackage.somemodule:somefunction - - """ - from paste.util.import_string import eval_import - import types - authfunc = eval_import(authfunc) - assert isinstance(authfunc, types.FunctionType), "authfunc must resolve to a function" - template = kw.get('template') - if template is not None: - template = eval_import(template) - assert isinstance(template, str), "template must resolve to a string" - - return AuthFormHandler(app, authfunc, template) - -if "__main__" == __name__: - import doctest - doctest.testmod(optionflags=doctest.ELLIPSIS) diff --git a/kcdc3/paste/auth/grantip.py b/kcdc3/paste/auth/grantip.py deleted file mode 100644 index 94b39000..00000000 --- a/kcdc3/paste/auth/grantip.py +++ /dev/null @@ -1,113 +0,0 @@ -# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org) -# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php -""" -Grant roles and logins based on IP address. -""" -from paste.util import ip4 - -class GrantIPMiddleware(object): - - """ - On each request, ``ip_map`` is checked against ``REMOTE_ADDR`` - and logins and roles are assigned based on that. - - ``ip_map`` is a map of {ip_mask: (username, roles)}. Either - ``username`` or ``roles`` may be None. Roles may also be prefixed - with ``-``, like ``'-system'`` meaning that role should be - revoked. ``'__remove__'`` for a username will remove the username. - - If ``clobber_username`` is true (default) then any user - specification will override the current value of ``REMOTE_USER``. - ``'__remove__'`` will always clobber the username. - - ``ip_mask`` is something that `paste.util.ip4:IP4Range -%s' - else: - fmt = 'Could not find OpenID information in
%s' - - message = fmt % (cgi.escape(openid_url),) - return self.render(request, message, css_class='error', form_contents=openid_url) - elif status == consumer.SUCCESS: - # The URL was a valid identity URL. Now we construct a URL - # that will get us to process the server response. We will - # need the token from the beginAuth call when processing - # the response. A cookie or a session object could be used - # to accomplish this, but for simplicity here we just add - # it as a query parameter of the return-to URL. - return_to = self.build_url(request, 'process', token=info.token) - - # Now ask the library for the URL to redirect the user to - # his OpenID server. It is required for security that the - # return_to URL must be under the specified trust_root. We - # just use the base_url for this server as a trust root. - redirect_url = oidconsumer.constructRedirect( - info, return_to, trust_root=request['base_url']) - - # Send the redirect response - return self.redirect(request, redirect_url) - else: - assert False, 'Not reached' - - def do_process(self, request): - """Handle the redirect from the OpenID server. - """ - oidconsumer = self.oidconsumer - - # retrieve the token from the environment (in this case, the URL) - token = request['query'].get('token', '') - - # Ask the library to check the response that the server sent - # us. Status is a code indicating the response type. info is - # either None or a string containing more information about - # the return type. - status, info = oidconsumer.completeAuth(token, request['query']) - - css_class = 'error' - openid_url = None - if status == consumer.FAILURE and info: - # In the case of failure, if info is non-None, it is the - # URL that we were verifying. We include it in the error - # message to help the user figure out what happened. - openid_url = info - fmt = "Verification of %s failed." - message = fmt % (cgi.escape(openid_url),) - elif status == consumer.SUCCESS: - # Success means that the transaction completed without - # error. If info is None, it means that the user cancelled - # the verification. - css_class = 'alert' - if info: - # This is a successful verification attempt. If this - # was a real application, we would do our login, - # comment posting, etc. here. - openid_url = info - if self.url_to_username: - username = self.url_to_username(request['environ'], openid_url) - else: - username = openid_url - if 'paste.auth_tkt.set_user' in request['environ']: - request['environ']['paste.auth_tkt.set_user'](username) - if not self.login_redirect: - fmt = ("If you had supplied a login redirect path, you would have " - "been redirected there. " - "You have successfully verified %s as your identity.") - message = fmt % (cgi.escape(openid_url),) - else: - # @@: This stuff doesn't make sense to me; why not a remote redirect? - request['environ']['paste.auth.open_id'] = openid_url - request['environ']['PATH_INFO'] = self.login_redirect - return self.app(request['environ'], request['start']) - #exc = httpexceptions.HTTPTemporaryRedirect(self.login_redirect) - #return exc.wsgi_application(request['environ'], request['start']) - else: - # cancelled - message = 'Verification cancelled' - else: - # Either we don't understand the code or there is no - # openid_url included with the error. Give a generic - # failure message. The library should supply debug - # information in a log. - message = 'Verification failed.' - - return self.render(request, message, css_class, openid_url) - - def build_url(self, request, action, **query): - """Build a URL relative to the server base_url, with the given - query parameters added.""" - base = urlparse.urljoin(request['base_url'], self.auth_prefix + '/' + action) - return appendArgs(base, query) - - def redirect(self, request, redirect_url): - """Send a redirect response to the given URL to the browser.""" - response_headers = [('Content-type', 'text/plain'), - ('Location', redirect_url)] - request['start']('302 REDIRECT', response_headers) - return ["Redirecting to %s" % redirect_url] - - def not_found(self, request): - """Render a page with a 404 return code and a message.""" - fmt = 'The path
%swas not understood by this server.' - msg = fmt % (request['parsed_uri'],) - openid_url = request['query'].get('openid_url') - return self.render(request, msg, 'error', openid_url, status='404 Not Found') - - def render(self, request, message=None, css_class='alert', form_contents=None, - status='200 OK', title="Python OpenID Consumer"): - """Render a page.""" - response_headers = [('Content-type', 'text/html')] - request['start'](str(status), response_headers) - - self.page_header(request, title) - if message: - request['body'].append("
" % (css_class,))
- request['body'].append(message)
- request['body'].append("
")
- self.page_footer(request, form_contents)
- return request['body']
-
- def page_header(self, request, title):
- """Render the page header"""
- request['body'].append('''\
-
- %s
-- This example consumer uses the Python OpenID library. It - just verifies that the URL that you enter is your identity URL. -
-''' % (title, title)) - - def page_footer(self, request, form_contents): - """Render the page footer""" - if not form_contents: - form_contents = '' - - request['body'].append('''\ -
-
-
-
-
-''' % (quoteattr(self.build_url(request, 'verify')), quoteattr(form_contents)))
-
-
-middleware = AuthOpenIDHandler
-
-def make_open_id_middleware(
- app,
- global_conf,
- # Should this default to something, or inherit something from global_conf?:
- data_store_path,
- auth_prefix='/oid',
- login_redirect=None,
- catch_401=False,
- url_to_username=None,
- apply_auth_tkt=False,
- auth_tkt_logout_path=None):
- from paste.deploy.converters import asbool
- from paste.util import import_string
- catch_401 = asbool(catch_401)
- if url_to_username and isinstance(url_to_username, basestring):
- url_to_username = import_string.eval_import(url_to_username)
- apply_auth_tkt = asbool(apply_auth_tkt)
- new_app = AuthOpenIDHandler(
- app, data_store_path=data_store_path, auth_prefix=auth_prefix,
- login_redirect=login_redirect, catch_401=catch_401,
- url_to_username=url_to_username or None)
- if apply_auth_tkt:
- from paste.auth import auth_tkt
- new_app = auth_tkt.make_auth_tkt_middleware(
- new_app, global_conf, logout_path=auth_tkt_logout_path)
- return new_app
diff --git a/kcdc3/paste/cascade.py b/kcdc3/paste/cascade.py
deleted file mode 100644
index 1c4acfb5..00000000
--- a/kcdc3/paste/cascade.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-
-"""
-Cascades through several applications, so long as applications
-return ``404 Not Found``.
-"""
-from paste import httpexceptions
-from paste.util import converters
-import tempfile
-from cStringIO import StringIO
-
-__all__ = ['Cascade']
-
-def make_cascade(loader, global_conf, catch='404', **local_conf):
- """
- Entry point for Paste Deploy configuration
-
- Expects configuration like::
-
- [composit:cascade]
- use = egg:Paste#cascade
- # all start with 'app' and are sorted alphabetically
- app1 = foo
- app2 = bar
- ...
- catch = 404 500 ...
- """
- catch = map(int, converters.aslist(catch))
- apps = []
- for name, value in local_conf.items():
- if not name.startswith('app'):
- raise ValueError(
- "Bad configuration key %r (=%r); all configuration keys "
- "must start with 'app'"
- % (name, value))
- app = loader.get_app(value, global_conf=global_conf)
- apps.append((name, app))
- apps.sort()
- apps = [app for name, app in apps]
- return Cascade(apps, catch=catch)
-
-class Cascade(object):
-
- """
- Passed a list of applications, ``Cascade`` will try each of them
- in turn. If one returns a status code listed in ``catch`` (by
- default just ``404 Not Found``) then the next application is
- tried.
-
- If all applications fail, then the last application's failure
- response is used.
-
- Instances of this class are WSGI applications.
- """
-
- def __init__(self, applications, catch=(404,)):
- self.apps = applications
- self.catch_codes = {}
- self.catch_exceptions = []
- for error in catch:
- if isinstance(error, str):
- error = int(error.split(None, 1)[0])
- if isinstance(error, httpexceptions.HTTPException):
- exc = error
- code = error.code
- else:
- exc = httpexceptions.get_exception(error)
- code = error
- self.catch_codes[code] = exc
- self.catch_exceptions.append(exc)
- self.catch_exceptions = tuple(self.catch_exceptions)
-
- def __call__(self, environ, start_response):
- """
- WSGI application interface
- """
- failed = []
- def repl_start_response(status, headers, exc_info=None):
- code = int(status.split(None, 1)[0])
- if code in self.catch_codes:
- failed.append(None)
- return _consuming_writer
- return start_response(status, headers, exc_info)
-
- try:
- length = int(environ.get('CONTENT_LENGTH', 0) or 0)
- except ValueError:
- length = 0
- if length > 0:
- # We have to copy wsgi.input
- copy_wsgi_input = True
- if length > 4096 or length < 0:
- f = tempfile.TemporaryFile()
- if length < 0:
- f.write(environ['wsgi.input'].read())
- else:
- copy_len = length
- while copy_len > 0:
- chunk = environ['wsgi.input'].read(min(copy_len, 4096))
- if not chunk:
- raise IOError("Request body truncated")
- f.write(chunk)
- copy_len -= len(chunk)
- f.seek(0)
- else:
- f = StringIO(environ['wsgi.input'].read(length))
- environ['wsgi.input'] = f
- else:
- copy_wsgi_input = False
- for app in self.apps[:-1]:
- environ_copy = environ.copy()
- if copy_wsgi_input:
- environ_copy['wsgi.input'].seek(0)
- failed = []
- try:
- v = app(environ_copy, repl_start_response)
- if not failed:
- return v
- else:
- if hasattr(v, 'close'):
- # Exhaust the iterator first:
- list(v)
- # then close:
- v.close()
- except self.catch_exceptions, e:
- pass
- if copy_wsgi_input:
- environ['wsgi.input'].seek(0)
- return self.apps[-1](environ, start_response)
-
-def _consuming_writer(s):
- pass
diff --git a/kcdc3/paste/cgiapp.py b/kcdc3/paste/cgiapp.py
deleted file mode 100644
index 2e5ae691..00000000
--- a/kcdc3/paste/cgiapp.py
+++ /dev/null
@@ -1,276 +0,0 @@
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-
-"""
-Application that runs a CGI script.
-"""
-import os
-import sys
-import subprocess
-import urllib
-try:
- import select
-except ImportError:
- select = None
-
-from paste.util import converters
-
-__all__ = ['CGIError', 'CGIApplication']
-
-class CGIError(Exception):
- """
- Raised when the CGI script can't be found or doesn't
- act like a proper CGI script.
- """
-
-class CGIApplication(object):
-
- """
- This object acts as a proxy to a CGI application. You pass in the
- script path (``script``), an optional path to search for the
- script (if the name isn't absolute) (``path``). If you don't give
- a path, then ``$PATH`` will be used.
- """
-
- def __init__(self,
- global_conf,
- script,
- path=None,
- include_os_environ=True,
- query_string=None):
- if global_conf:
- raise NotImplemented(
- "global_conf is no longer supported for CGIApplication "
- "(use make_cgi_application); please pass None instead")
- self.script_filename = script
- if path is None:
- path = os.environ.get('PATH', '').split(':')
- self.path = path
- if '?' in script:
- assert query_string is None, (
- "You cannot have '?' in your script name (%r) and also "
- "give a query_string (%r)" % (script, query_string))
- script, query_string = script.split('?', 1)
- if os.path.abspath(script) != script:
- # relative path
- for path_dir in self.path:
- if os.path.exists(os.path.join(path_dir, script)):
- self.script = os.path.join(path_dir, script)
- break
- else:
- raise CGIError(
- "Script %r not found in path %r"
- % (script, self.path))
- else:
- self.script = script
- self.include_os_environ = include_os_environ
- self.query_string = query_string
-
- def __call__(self, environ, start_response):
- if 'REQUEST_URI' not in environ:
- environ['REQUEST_URI'] = (
- urllib.quote(environ.get('SCRIPT_NAME', ''))
- + urllib.quote(environ.get('PATH_INFO', '')))
- if self.include_os_environ:
- cgi_environ = os.environ.copy()
- else:
- cgi_environ = {}
- for name in environ:
- # Should unicode values be encoded?
- if (name.upper() == name
- and isinstance(environ[name], str)):
- cgi_environ[name] = environ[name]
- if self.query_string is not None:
- old = cgi_environ.get('QUERY_STRING', '')
- if old:
- old += '&'
- cgi_environ['QUERY_STRING'] = old + self.query_string
- cgi_environ['SCRIPT_FILENAME'] = self.script
- proc = subprocess.Popen(
- [self.script],
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- env=cgi_environ,
- cwd=os.path.dirname(self.script),
- )
- writer = CGIWriter(environ, start_response)
- if select and sys.platform != 'win32':
- proc_communicate(
- proc,
- stdin=StdinReader.from_environ(environ),
- stdout=writer,
- stderr=environ['wsgi.errors'])
- else:
- stdout, stderr = proc.communicate(StdinReader.from_environ(environ).read())
- if stderr:
- environ['wsgi.errors'].write(stderr)
- writer.write(stdout)
- if not writer.headers_finished:
- start_response(writer.status, writer.headers)
- return []
-
-class CGIWriter(object):
-
- def __init__(self, environ, start_response):
- self.environ = environ
- self.start_response = start_response
- self.status = '200 OK'
- self.headers = []
- self.headers_finished = False
- self.writer = None
- self.buffer = ''
-
- def write(self, data):
- if self.headers_finished:
- self.writer(data)
- return
- self.buffer += data
- while '\n' in self.buffer:
- if '\r\n' in self.buffer and self.buffer.find('\r\n') < self.buffer.find('\n'):
- line1, self.buffer = self.buffer.split('\r\n', 1)
- else:
- line1, self.buffer = self.buffer.split('\n', 1)
- if not line1:
- self.headers_finished = True
- self.writer = self.start_response(
- self.status, self.headers)
- self.writer(self.buffer)
- del self.buffer
- del self.headers
- del self.status
- break
- elif ':' not in line1:
- raise CGIError(
- "Bad header line: %r" % line1)
- else:
- name, value = line1.split(':', 1)
- value = value.lstrip()
- name = name.strip()
- if name.lower() == 'status':
- if ' ' not in value:
- # WSGI requires this space, sometimes CGI scripts don't set it:
- value = '%s General' % value
- self.status = value
- else:
- self.headers.append((name, value))
-
-class StdinReader(object):
-
- def __init__(self, stdin, content_length):
- self.stdin = stdin
- self.content_length = content_length
-
- def from_environ(cls, environ):
- length = environ.get('CONTENT_LENGTH')
- if length:
- length = int(length)
- else:
- length = 0
- return cls(environ['wsgi.input'], length)
-
- from_environ = classmethod(from_environ)
-
- def read(self, size=None):
- if not self.content_length:
- return ''
- if size is None:
- text = self.stdin.read(self.content_length)
- else:
- text = self.stdin.read(min(self.content_length, size))
- self.content_length -= len(text)
- return text
-
-def proc_communicate(proc, stdin=None, stdout=None, stderr=None):
- """
- Run the given process, piping input/output/errors to the given
- file-like objects (which need not be actual file objects, unlike
- the arguments passed to Popen). Wait for process to terminate.
-
- Note: this is taken from the posix version of
- subprocess.Popen.communicate, but made more general through the
- use of file-like objects.
- """
- read_set = []
- write_set = []
- input_buffer = ''
- trans_nl = proc.universal_newlines and hasattr(open, 'newlines')
-
- if proc.stdin:
- # Flush stdio buffer. This might block, if the user has
- # been writing to .stdin in an uncontrolled fashion.
- proc.stdin.flush()
- if input:
- write_set.append(proc.stdin)
- else:
- proc.stdin.close()
- else:
- assert stdin is None
- if proc.stdout:
- read_set.append(proc.stdout)
- else:
- assert stdout is None
- if proc.stderr:
- read_set.append(proc.stderr)
- else:
- assert stderr is None
-
- while read_set or write_set:
- rlist, wlist, xlist = select.select(read_set, write_set, [])
-
- if proc.stdin in wlist:
- # When select has indicated that the file is writable,
- # we can write up to PIPE_BUF bytes without risk
- # blocking. POSIX defines PIPE_BUF >= 512
- next, input_buffer = input_buffer, ''
- next_len = 512-len(next)
- if next_len:
- next += stdin.read(next_len)
- if not next:
- proc.stdin.close()
- write_set.remove(proc.stdin)
- else:
- bytes_written = os.write(proc.stdin.fileno(), next)
- if bytes_written < len(next):
- input_buffer = next[bytes_written:]
-
- if proc.stdout in rlist:
- data = os.read(proc.stdout.fileno(), 1024)
- if data == "":
- proc.stdout.close()
- read_set.remove(proc.stdout)
- if trans_nl:
- data = proc._translate_newlines(data)
- stdout.write(data)
-
- if proc.stderr in rlist:
- data = os.read(proc.stderr.fileno(), 1024)
- if data == "":
- proc.stderr.close()
- read_set.remove(proc.stderr)
- if trans_nl:
- data = proc._translate_newlines(data)
- stderr.write(data)
-
- try:
- proc.wait()
- except OSError, e:
- if e.errno != 10:
- raise
-
-def make_cgi_application(global_conf, script, path=None, include_os_environ=None,
- query_string=None):
- """
- Paste Deploy interface for :class:`CGIApplication`
-
- This object acts as a proxy to a CGI application. You pass in the
- script path (``script``), an optional path to search for the
- script (if the name isn't absolute) (``path``). If you don't give
- a path, then ``$PATH`` will be used.
- """
- if path is None:
- path = global_conf.get('path') or global_conf.get('PATH')
- include_os_environ = converters.asbool(include_os_environ)
- return CGIApplication(
- script, path=path, include_os_environ=include_os_environ,
- query_string=query_string)
diff --git a/kcdc3/paste/cgitb_catcher.py b/kcdc3/paste/cgitb_catcher.py
deleted file mode 100644
index 1c815b74..00000000
--- a/kcdc3/paste/cgitb_catcher.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
-
-"""
-WSGI middleware
-
-Captures any exceptions and prints a pretty report. See the `cgitb
-documentation Error in .close():
%s' - % close_response) - yield response - - def exception_handler(self, exc_info, environ): - dummy_file = StringIO() - hook = cgitb.Hook(file=dummy_file, - display=self.display, - logdir=self.logdir, - context=self.context, - format=self.format) - hook(*exc_info) - return dummy_file.getvalue() - -def make_cgitb_middleware(app, global_conf, - display=NoDefault, - logdir=None, - context=5, - format='html'): - """ - Wraps the application in the ``cgitb`` (standard library) - error catcher. - - display: - If true (or debug is set in the global configuration) - then the traceback will be displayed in the browser - - logdir: - Writes logs of all errors in that directory - - context: - Number of lines of context to show around each line of - source code - """ - from paste.deploy.converters import asbool - if display is not NoDefault: - display = asbool(display) - if 'debug' in global_conf: - global_conf['debug'] = asbool(global_conf['debug']) - return CgitbMiddleware( - app, global_conf=global_conf, - display=display, - logdir=logdir, - context=context, - format=format) diff --git a/kcdc3/paste/config.py b/kcdc3/paste/config.py deleted file mode 100644 index c5315797..00000000 --- a/kcdc3/paste/config.py +++ /dev/null @@ -1,120 +0,0 @@ -# (c) 2006 Ian Bicking, Philip Jenvey and contributors -# Written for Paste (http://pythonpaste.org) -# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php -"""Paste Configuration Middleware and Objects""" -from paste.registry import RegistryManager, StackedObjectProxy - -__all__ = ['DispatchingConfig', 'CONFIG', 'ConfigMiddleware'] - -class DispatchingConfig(StackedObjectProxy): - """ - This is a configuration object that can be used globally, - imported, have references held onto. The configuration may differ - by thread (or may not). - - Specific configurations are registered (and deregistered) either - for the process or for threads. - """ - # @@: What should happen when someone tries to add this - # configuration to itself? Probably the conf should become - # resolved, and get rid of this delegation wrapper - - def __init__(self, name='DispatchingConfig'): - super(DispatchingConfig, self).__init__(name=name) - self.__dict__['_process_configs'] = [] - - def push_thread_config(self, conf): - """ - Make ``conf`` the active configuration for this thread. - Thread-local configuration always overrides process-wide - configuration. - - This should be used like:: - - conf = make_conf() - dispatching_config.push_thread_config(conf) - try: - ... do stuff ... - finally: - dispatching_config.pop_thread_config(conf) - """ - self._push_object(conf) - - def pop_thread_config(self, conf=None): - """ - Remove a thread-local configuration. If ``conf`` is given, - it is checked against the popped configuration and an error - is emitted if they don't match. - """ - self._pop_object(conf) - - def push_process_config(self, conf): - """ - Like push_thread_config, but applies the configuration to - the entire process. - """ - self._process_configs.append(conf) - - def pop_process_config(self, conf=None): - self._pop_from(self._process_configs, conf) - - def _pop_from(self, lst, conf): - popped = lst.pop() - if conf is not None and popped is not conf: - raise AssertionError( - "The config popped (%s) is not the same as the config " - "expected (%s)" - % (popped, conf)) - - def _current_obj(self): - try: - return super(DispatchingConfig, self)._current_obj() - except TypeError: - if self._process_configs: - return self._process_configs[-1] - raise AttributeError( - "No configuration has been registered for this process " - "or thread") - current = current_conf = _current_obj - -CONFIG = DispatchingConfig() - -no_config = object() -class ConfigMiddleware(RegistryManager): - """ - A WSGI middleware that adds a ``paste.config`` key (by default) - to the request environment, as well as registering the - configuration temporarily (for the length of the request) with - ``paste.config.CONFIG`` (or any other ``DispatchingConfig`` - object). - """ - - def __init__(self, application, config, dispatching_config=CONFIG, - environ_key='paste.config'): - """ - This delegates all requests to `application`, adding a *copy* - of the configuration `config`. - """ - def register_config(environ, start_response): - popped_config = environ.get(environ_key, no_config) - current_config = environ[environ_key] = config.copy() - environ['paste.registry'].register(dispatching_config, - current_config) - - try: - app_iter = application(environ, start_response) - finally: - if popped_config is no_config: - environ.pop(environ_key, None) - else: - environ[environ_key] = popped_config - return app_iter - - super(self.__class__, self).__init__(register_config) - -def make_config_filter(app, global_conf, **local_conf): - conf = global_conf.copy() - conf.update(local_conf) - return ConfigMiddleware(app, conf) - -make_config_middleware = ConfigMiddleware.__doc__ diff --git a/kcdc3/paste/cowbell/__init__.py b/kcdc3/paste/cowbell/__init__.py deleted file mode 100644 index 43b7097b..00000000 --- a/kcdc3/paste/cowbell/__init__.py +++ /dev/null @@ -1,104 +0,0 @@ -# Cowbell images: http://commons.wikimedia.org/wiki/Image:Cowbell-1.jpg -import os -import re -from paste.fileapp import FileApp -from paste.response import header_value, remove_header - -SOUND = "http://www.c-eye.net/eyeon/WalkenWAVS/explorestudiospace.wav" - -class MoreCowbell(object): - def __init__(self, app): - self.app = app - def __call__(self, environ, start_response): - path_info = environ.get('PATH_INFO', '') - script_name = environ.get('SCRIPT_NAME', '') - for filename in ['bell-ascending.png', 'bell-descending.png']: - if path_info == '/.cowbell/'+ filename: - app = FileApp(os.path.join(os.path.dirname(__file__), filename)) - return app(environ, start_response) - type = [] - body = [] - def repl_start_response(status, headers, exc_info=None): - ct = header_value(headers, 'content-type') - if ct and ct.startswith('text/html'): - type.append(ct) - remove_header(headers, 'content-length') - start_response(status, headers, exc_info) - return body.append - return start_response(status, headers, exc_info) - app_iter = self.app(environ, repl_start_response) - if type: - # Got text/html - body.extend(app_iter) - body = ''.join(body) - body = insert_head(body, self.javascript.replace('__SCRIPT_NAME__', script_name)) - body = insert_body(body, self.resources.replace('__SCRIPT_NAME__', script_name)) - return [body] - else: - return app_iter - - javascript = '''\ - -''' - - resources = '''\ - - -''' - -def insert_head(body, text): - end_head = re.search(r'', body, re.I) - if end_head: - return body[:end_head.start()] + text + body[end_head.end():] - else: - return text + body - -def insert_body(body, text): - end_body = re.search(r'
-
-