applied smartquote filter to event titles in details and list page

.gitignore

@@ -8,8 +8,8 @@ kcdc3/kcdc3/settings.py
 
 kcdc3/kcdc3/settings.py
 
-kcdc3/public/media/event_images
-kcdc3/public/media/mugshots
+
+venv_kcdc
 
 codekit-config.json
 .sass-cache
@@ -29,4 +29,28 @@ kcdc3/public/static/fonts/ss-standard/ss-standard.eot
 kcdc3/public/static/fonts/ss-standard/ss-standard.js
 kcdc3/public/static/fonts/ss-standard/ss-standard.svg
 kcdc3/public/static/fonts/ss-standard/ss-standard.ttf
-kcdc3/public/static/fonts/ss-standard/ss-standard.woff
+kcdc3/public/static/fonts/ss-standard/ss-standard.woff
+
+kcdc3/public/media/bio
+kcdc3/public/media/blog
+kcdc3/public/media/event_images
+kcdc3/public/media/front_slides
+kcdc3/public/media/mugshots
+kcdc3/public/media/press
+kcdc3/public/media/uploads
+
+kcdc3/public/media/csv/export_2013-02-24.csv
+
+kcdc3/public/static/tmp/index.html
+
+kcdc3/kcdc3/settings/prod.py
+kcdc3/kcdc3/settings/prod.py
+
+kcdc3/apps/pinata/.views.py.swp
+kcdc3/settings/prod.py
+kcdc3/tmp/
+
+
+kcdc3/public/static/fonts/ss-social/ss-social.min.js
+
+kcdc3/public/static/fonts/ss-standard/ss-standard.min.js

config.rb

@@ -5,6 +5,6 @@
 sass_dir = "kcdc3/public/static/sass"
 images_dir = "kcdc3/public/static/images"
 javascripts_dir = "kcdc3/public/static/assets/js"
-output_style = :expanded
+output_style = :compressed
 css_dir = "kcdc3/public/static/css"
 

kcdc3/apps/accounts/templates/disabled.html

@@ -0,0 +1,17 @@
+{% extends 'userena/base_userena.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Disabled account" %}{% endblock %}
+{% block content_title %}<h2>{% trans "Your account has been disabled" %}</h2>{% endblock %}
+{% block content %}
+
+	<p>Your account is currently disabled.</p>
+	<p>If you just signed up, you still need to active your account.
+		Please check your email and find the activation message that we sent you. (Your mail provider may have wrongly marked it as spam.)
+		You'll need to click on the link in that message to activate your account.</p>
+	<p><strong>Check your spam folder</strong>; your mail provider may have wrongly marked the message as spam.</p>
+	<p>If you're still having problems, please email us at
+		<a href="mailto:[email protected]">[email protected]</a>.
+	</p>
+
+{% endblock %} 

kcdc3/apps/accounts/templates/profile_detail.html

@@ -0,0 +1,60 @@
+{% extends 'userena/base_userena.html' %}
+{% load i18n %}
+{% load url from future %}
+
+{% block title %}{% blocktrans with profile.user.username as username %}{{ username }}'s profile.{% endblocktrans %}{% endblock %}
+{% block content_title %}<h2>{{ profile.user.username }} {% if profile.user.get_full_name %}({{ profile.user.get_full_name }}){% endif %}</h2>{% endblock %}
+
+{% block content %}
+  <div class="white-box">
+    {% block profile_navigation %}
+      {% comment %}Dirty hack. Will use django-guardian in the future.{% endcomment %}
+      {% if user.username == profile.user.username %}
+        <ul id="box-nav">
+          {% block profile_navigation_items %}
+            <li><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit details" %}</a></li>
+            <li><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
+            <li><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
+          {% endblock %}
+        </ul>
+      {% endif %}
+    {% endblock %}
+
+    <div id="details">
+
+	{% comment %}
+      {% block profile_details %}
+        <img class="mugshot" src="{{ profile.get_mugshot_url }}" alt="{% trans "Your mugshot" %}" />
+        <dl>
+          {% block profile_definition_list %}
+            {% if profile.user.get_full_name %}
+              <dt>{% trans "Name" %}</dt>
+              <dd>{{ profile.user.get_full_name }}</dd>
+            {% endif %}
+            {% if profile.user.email and not hide_email %}
+              <dt>{% trans "Email" %}</dt>
+              <dd>{{ profile.user.email }}</dd>
+            {% endif %}
+            {% if profile.age %}
+              <dt>{% trans "Age" %}</dt>
+              <dd>{{ profile.age }}</dd>
+            {% endif %}
+            {% if profile.website %}
+              <dt>{% trans "Website" %}</dt>
+              <dd>{{ profile.website|urlize }}</dd>
+            {% endif %}
+            {% if profile.location %}
+              <dt>{% trans "Location" %}</dt>
+              <dd>{{ profile.location }}</dd>
+            {% endif %}
+            {% if profile.about_me %}
+              <dt>{% trans "About me" %}</dt>
+              <dd>{{ profile.about_me }}</dd>
+            {% endif %}
+          {% endblock %}
+        </dl>
+      {% endblock %}
+	{% endcomment %}
+    </div>
+  </div>
+{% endblock %}

kcdc3/apps/accounts/templates/signin_form.html

@@ -0,0 +1,45 @@
+{% extends 'userena/base_userena.html' %}
+{% load i18n %}
+{% load url from future %}
+
+{% block title %}{% trans "Signin" %}{% endblock %}
+
+{% block content %}
+
+<h1>Log in</h1>
+
+<p>
+	We've moved to a new registration system.
+	If you created your account before August 24, 2012, we'll need you
+	to <a href="/accounts/signup/">register a new account</a>.
+</p>
+
+<p>Our new registration system lets us: give you more information about 
+	class locations, makes it easier for you to update your class signups, 
+	and features real-time, automatic waitlists.</p>
+
+<form action="" method="post">
+  {% csrf_token %}
+  <fieldset>
+    <legend>{% trans "Signin" %}</legend>
+    {{ form.non_field_errors }}
+    {% for field in form %}
+    {{ field.errors }}
+    {% comment %} Displaying checkboxes differently {% endcomment %}
+    {% if field.name == 'remember_me' %}
+    <p class="checkbox">
+    <label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
+    </p>
+    {% else %}
+    <p>
+    {{ field.label_tag }}
+    {{ field }}
+    </p>
+    {% endif %}
+    {% endfor %}
+  </fieldset>
+  <input type="submit" value="{% trans "Signin" %}" />
+  <p class="forgot-password"><a href="{% url 'userena_password_reset' %}" title="{% trans 'Forgot your password?' %}">{% trans "Forgot your password?" %}</a></p>
+  {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
+</form>
+{% endblock %}

kcdc3/apps/accounts/templates/signup_complete.html

@@ -0,0 +1,16 @@
+{% extends 'userena/base_userena.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Signup almost done!" %}{% endblock %}
+
+{% block content_title %}<h2>{% trans "Signup" %}</h2>{% endblock %}
+
+{% block content %}
+<p>{% trans "Thank you for signing up with us!" %}</p>
+
+{% if userena_activation_required %}
+<p>{% blocktrans %}Next, you need to active your account. We've just sent you an email message with an activation link. <strong>Check your spam folder for the message.</strong>{% endblocktrans %}</p>
+{% else  %}
+<p>{% blocktrans %}You can now use the supplied credentials to signin.{% endblocktrans %}</p>
+{% endif %}
+{% endblock %}

kcdc3/apps/accounts/templates/signup_form.html

@@ -0,0 +1,36 @@
+{% extends 'userena/base_userena.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Signup" %}{% endblock %}
+
+{% block content %}
+
+<h1>Create a new account</h1>
+
+<form action="" method="post">
+	{% csrf_token %}
+
+	<fieldset>
+		{% comment %}<legend>{% trans "Signup" %}</legend>{% endcomment %}
+		{{ form.non_field_errors }}
+		{% for field in form %}
+		{{ field.errors }}
+		{% comment %} Displaying checkboxes differently {% endcomment %}
+		{% if field.name == 'tos' %}
+		<p class="checkbox">
+		<label for="id_{{ field.name }}">{{ field }} {{ field.label }}</label>
+		</p>
+		{% else %}
+		<p>
+		{{ field.label_tag }} 
+		{{ field }}
+		</p>
+		{% endif %}
+		{% endfor %}
+	</fieldset>
+
+	<p>When you create an account, we will add you to the Knowledge Commons DC mailing list. (That takes time, though, so if you want to receive updates immediately, sign up for the list yourself &ndash; the form is in the footer.)</p>
+
+	<input type="submit" value="{% trans "Signup"%}" />
+</form>
+{% endblock %}

kcdc3/accounts/views.py → kcdc3/apps/accounts/views.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from userena.forms import SignupForm
-from accounts.models import ExtendedProfile
+from models import ExtendedProfile
 
 class SignupFormExtra(SignupForm):
 	"""

kcdc3/classes/admin.py → kcdc3/apps/classes/admin.py

@@ -1,4 +1,4 @@
-from classes.models import Event, Location, Bio, Registration, Session
+from kcdc3.apps.classes.models import Event, Location, Bio, Registration, Session, Role
 from django import forms
 from django.contrib import admin
 from django.contrib.admin.sites import site
@@ -9,6 +9,7 @@
 from django.contrib.auth.models import User
 
 
+
 # displays registrations as a list in the Event Admin screen
 class RegistrationInline(admin.TabularInline):
 	model = Registration
@@ -23,22 +24,67 @@ class RegistrationInline(admin.TabularInline):
 	    'fk': ['student'],
 	}
 
+
+
 class LocationAdmin(admin.ModelAdmin):
 	model = Location
 	list_display = ('name','neighborhood','show_exact',)
 
 admin.site.register(Location, LocationAdmin)
 
+
+
+class RoleAdmin(admin.ModelAdmin):
+
+	model = Role
+	list_display = ('name', 'sort_order',)
+	fieldsets = [
+		(None, {'fields': ['name','description', 'extended_description', 'sort_order',]}),
+	]
+
+	class Media:
+		js = [
+			'tiny_mce/tiny_mce.js',
+			'tinymce_setup.js',
+		]
+
+admin.site.register(Role, RoleAdmin)
+
+
+
 class BioAdmin(admin.ModelAdmin):
+
 	model = Bio
-	list_display = ('name','user',)
+	list_display = ('name', 'user', 'role', 'title',)
 	fieldsets = [
-		(None,			{'fields': ['name','description','website','user',]}),
+		(None, {'fields': ['name','user','image',]}),
+		('Teacher bio', {
+			'classes': ('grp-collapse grp-open',), 
+			'fields': [
+				'description', 'website','bio_email',
+			]
+		}),
+		('Staff bio', {
+			'classes': ('grp-collapse grp-open',), 
+			'fields': [
+				'role', 'title', 'staff_description', 
+			],
+		}),
+		('Admin', {
+			'classes': ('grp-collapse grp-open',), 
+			'fields': [
+				'rating', 'comments', 
+			],
+		}),
 	]
 	raw_id_fields = ['user']
 	related_lookup_fields = {
 	    'fk': ['user'],
 	}
+
+	list_filter = ('role',)
+	search_fields = ('name',)
+
 	class Media:
 		js = [
 			'tiny_mce/tiny_mce.js',
@@ -47,6 +93,8 @@ class Media:
 
 admin.site.register(Bio, BioAdmin)
 
+
+
 # lets someone create/edit a Event
 class EventAdmin(admin.ModelAdmin):
 	fieldsets = [
@@ -58,22 +106,27 @@ class EventAdmin(admin.ModelAdmin):
 				'summary', 'description', ('thumbnail', 'main_image'), 
 			]
 		}),
-		('More pre-class details and additional dates', {
+		('Registration',	{'fields': [('registration_status', 'registration_opens',), ('max_students', 'waitlist_status', 'registration_count','waitlist_count'),]}),
+		('More details', {
 			'classes': ('grp-collapse grp-closed',), 
 			'fields': [
 				'details',
 				'additional_dates_text',
+				'bio_text',
 			]
 		}),
 		('Automatic email messages', {
-			'classes': ('grp-collapse grp-closed',), 
+			'classes': ('grp-collapse grp-open',), 
 			'fields': ['email_welcome_text',]
 		}),
-		('Post-class documentation', {
+		('Documentation', {
 			'classes': ('grp-collapse grp-closed',), 
 			'fields': ['documentation']
 		}),
-		('Registration',	{'fields': [('max_students', 'registration_status', 'waitlist_status','registration_count','waitlist_count')]}),
+		('Legacy data', {
+			'classes': ('grp-collapse grp-closed',), 
+			'fields': ['teacher_text','location_text']
+		}),
 	]
 	readonly_fields = ('registration_count','waitlist_count')
 	prepopulated_fields = {"slug": ("title",)}
@@ -88,14 +141,15 @@ class Media:
 			'tinymce_setup.js',
 		]
 
-	list_display = ('title', 'status','date','session', 'registration_status','waitlist_status','max_students', 'registration_count', 'waitlist_count',)
-	list_editable = ('registration_status',)
-	list_filter = ('session', 'status', 'registration_status')
+	list_display = ('title', 'status','date','session', 'featured', 'registration_status', 'registration_opens', 'waitlist_status','max_students', 'registration_count', 'waitlist_count',)
+	list_editable = ('registration_status', 'featured', 'registration_opens',)
+	list_filter = ('session', 'status', 'registration_status','type',)
 	search_fields = ('title',)
 
 admin.site.register(Event, EventAdmin)
 
 
+
 # create/edit a Session
 class SessionAdmin(admin.ModelAdmin):
 	fieldsets = [
@@ -111,8 +165,10 @@ class SessionAdmin(admin.ModelAdmin):
 		('Text', {
 			'classes': ('grp-collapse grp-open',),
 			'fields': [
+			'kicker',
 			'description',
 			'sidebar_text',
+			'show_sidebar_text',
 			]}),
 		('Extended Text', {
 			'classes': ('grp-collapse grp-open',),