Merge lp:~ronnie.vd.c/ubuntu-elections/new-interface into lp:ubuntu-elections

[Ronnie]

Loads of changes:
 - Url has now slugs instead of name. the pk is not included because slug is set to unique
 - Page layout updated
 - language is forced to the LANGUAGES list in settings.py

=== modified file 'media/css/voting.css'
--- media/css/voting.css	2011-03-05 13:55:34 +0000
+++ media/css/voting.css	2011-11-19 16:23:22 +0000
@@ -1,13 +1,142 @@
+body {
+    font-family: 'Ubuntu','Ubuntubeta','Bitstream Vera Sans','DejaVu Sans',Tahoma,sans-serif;
+    background: url("../img/dotted.png") repeat scroll 0 0 #F7F7F7;
+}
+
+a:visited {
+    color: #DD4814;
+}
+
+#page-header {
+    background-image: none;
+    box-shadow: 0 1px 1px #C8C8C8;
+    height: 65px;
+}
+
+
+#main-nav {
+    width: auto;
+    max-width: 770px;
+    border-left: none;
+    height: 65px;
+}
+
+#main-nav:before {
+    content: url('../img/topnav_divider.png');
+    float: left;
+}
+
+#main-nav:after {
+    content: url('../img/topnav_divider.png');
+    float: left;
+}
+
+.main-nav-item, .main-nav-item:visited {
+    border-right: none;
+    line-height: 65px;
+    height: 65px;
+}
+
+#top-logo {
+    margin-top: 0;
+}
+
+#page-related {
+    width: 100%;
+    margin: 2px 0 20px 0;
+    padding: 0;
+    background-color: #F7F7F7;
+    box-shadow: 0 1px 1px #DFDFDF;
+}
+
+#sub-nav-container {
+    width: 980px;
+    padding: 0;
+    margin: 0 auto;
+    border-radius: 0;
+    box-shadow: none;
+}
+
+
 #page-footer {
     width: 980px;
-    margin: 0 auto;
+    margin: 20px auto 0;
 }
 
 #main-section .container {
-    min-height: 200px;
-}
-
-
+    background-color: transparent;
+    padding: 0;
+    width: 980px;
+}
+
+.content {
+    background-color: #FFFFFF;
+    border-radius: 4px;
+    box-shadow: 1px 1px 2px #CCCCCC;
+    margin: 10px 0;
+}
+
+.content-inner {
+    padding: 10px 10px 10px 20px;
+}
+
+.content-inner h2 {
+    margin-top: 0px;
+}
+
+.content-medium {
+    width: 650px;
+}
+
+.content-small {
+    width: 310px;
+    margin-left: 20px;
+}   
+
+.content-left {
+    float: left;
+}
+
+.content-right {
+    float: right;
+}
+
+.button {
+    background-color: #DD4814;
+    border: none;
+    color: #FFFFFF;
+    padding: 8px 10px;
+    border-radius: 4px;
+    text-shadow: 1px 1px 1px #333;
+    font-size: 16px;
+    line-height: 20px;
+}
+a.button:visited {
+    color: #FFFFFF;
+}
+
+.button-right {
+    float: right;
+}
+
+.button-bar {
+    background-color: #F7F7F7;
+    padding: 5px 5px 5px 20px;
+    border-radius: 0 0 4px 4px;
+}
+
+.button-bar:after {
+    content: "";
+    clear: both;
+    display: block;
+}
+
+.button-bar .countdown {
+    float: left;
+    font-size: 24px;
+    line-height:28px;
+    padding: 5px 0;
+}
 
 ul.messages {
     list-style-type: none;
@@ -20,72 +149,64 @@
     
 }
 
-form input[type="text"], form input[type="password"] {
-    background-color: #F0F0F0;
-    border: 1px solid #CCCCCC;
-    height: 16px;
-    padding: 3px;
-    width: 180px;
-    margin: 0 0 0 10px;
-}
-
-form input, form select {
-    margin: 0 0 0 10px;
-}
-
-form input[type="text"].small {
-    width: 80px;
-}
-
-form input.date, form input.time {
-    width: 80px;
-}
-
-.ui-widget {
+form {
+    width: 100%;
+    position: relative;
+}
+
+form fieldset {
+    background-color: transparent;
+}
+form input[type="submit"] {
+    float: right;
+    display: inline-block;  /* for IE/Mac */
+}
+form input[type="submit"]:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
+form input[type="text"].small,
+form input.date,
+form input.time {
+    width: 80px;
+}
+
+form input[type="text"].small:focus,
+form input.date:focus,
+form input.time:focus {
+    width: 78px;
+}
+
+.ui-widget,
+#ui-datepicker-div.ui-widget {
     font-size: 0.8em;
 }
 
-
-.errorlist li {
-    color: #DD4814;
-}
-
-form select {
-    height: 24px;
-    width: 180px;
-}
-
-form ul {
-    list-style: none;
-}
-
-form .form-item {
-    margin: 14px 0;
-}
-
-form .required {
-    margin: 0 8px;
-    color: #DD4814;
-}
-
-form .help img {
-    height: 16px;
-    vertical-align: middle;
-}
-
-label {
-    width: 180px;
-    display: inline-block;
-    padding-right: 10px;
-}
-
-form.small input[type="submit"] {
-    margin-right: 50px;
-    float: right;
-}
-
-form.small .help {
-    float: right;
+.login {
+    background-color: #F7F7F7;
+    border-radius: 4px 4px 0 0;
+    padding: 5px 10px 5px 20px;
+}
+
+.login-button,
+.logout-button {
+    float: right;
+}
+.login-button:hover,
+.logout-button:hover {
+    text-decoration: underline;
+}
+
+
+/* Menu right */
+
+.content-small.content-right .sub-nav-item {
+    float: none;
+    padding: 0;
 }
 
 /* Election details */
@@ -137,3 +258,177 @@
 .graph-label-1 {
     color: #DD4814;
 }
+
+
+/* Form CSS */
+form {
+    margin: 20px auto 60px;
+}
+
+form ul {
+    list-style-type: none;
+}
+
+form li.form-item {
+    clear: both;
+}
+
+form .error {
+    width: 184px; /* 224 - 30 */
+    font-size: 12px;
+    height: 20px;
+    display: inline-block;
+    padding-left: 30px;
+    background-image: url('../images/error.png');
+    background-repeat: no-repeat;
+    line-height: 1.2em;
+}
+
+form .help {
+    position: absolute;
+    z-index: 10;
+    right: 16px;
+    background-image: url('../images/help.png');
+    background-repeat: no-repeat;
+    width: 20px;
+}
+
+form .smalltext {
+    font-size: 10px;
+    line-height: 14px;
+    color: #333333;
+}
+
+label {
+    clear: both;
+    display: block;
+    font-size: 12px;
+    line-height: 16px;
+    color: #333333;
+    margin-bottom: 4px;
+}
+
+label.required:after {
+    color: #DD4814;
+    content: " *";
+}
+
+label.inline {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+legend {
+    width: 100%;
+    position: relative;
+    background-color: #aea79f;
+    font-size: 16px;
+    line-height: 16px;
+    font-weight: normal;
+    color: #ffffff;
+    padding: 8px;
+    margin: 0 -8px;
+}
+
+legend span.supporting {
+    position: absolute;
+    right: 8px;
+    font-size: 12px;
+    line-height: 16px;
+    color: #ffffff;
+}
+
+legend span.supporting:before {
+    color: #DD4814;
+    content: "* ";
+}
+
+fieldset {
+    position: relative;
+    margin-bottom: 16px;
+    padding: 8px;
+    background-color: #dfdcd9;
+}
+
+input, select, textarea, .mceEditor {
+    float: left;
+    display: block;
+}
+
+input[type="text"], input[type="password"], select, .mceEditor {
+    font-size: 12px;
+    color: #333333;
+    border: 1px solid #ccc1c1;
+    background-color: white;
+    width: 286px;
+    height: 20px;
+    margin-right: 16px;
+    margin-bottom: 8px;
+}
+
+.mceEditor {
+    border: 0;
+    height: 255px;
+    width: 400px;
+}
+
+input[type="checkbox"], input[type="radio"] {
+    margin-top: 0px;
+    margin-bottom: 8px;
+}
+
+input[type="text"]:focus, input[type="password"]:focus {
+    border: 2px solid #dd4814;
+    width: 284px;
+    height: 18px;
+    color: #333333;
+}
+
+select:focus {
+    border: 2px solid #dd4814;
+    color: #333333;
+}
+
+
+input[type="text"].small, input[type="password"].small, select.small {
+    width: 134px;
+}
+
+input[type="text"].small:focus, input[type="password"].small:focus, select.small:focus {
+    width: 132px;
+}
+
+input[type="text"].error, input[type="password"].error, select.error {
+    border: 2px solid #dd4814;
+    color: #dd4814;
+}
+
+input[type="submit"] {
+    padding: 10px 8px;
+    border-radius: 4px;
+    background: #dd4814 url('../images/gradient.png') repeat-x;
+    color: #ffffff;
+    font-size: 16px;
+    line-height: 20px;
+    border: none;
+    text-shadow: black 0px 1px 2px;
+}
+
+input[type="submit"]:hover {
+    background-color: #b83a0f;
+}
+
+input[type="submit"]:active {
+    background-color: #962d0c;
+}
+
+form ul.errorlist {
+    display: block;
+    float: left;
+    line-height: 1em;
+    vertical-align: top;
+}
+
+form ul.errorlist li {
+    color: #DD4814;
+}

=== added file 'media/img/dotted.png'
Binary files media/img/dotted.png	1970-01-01 00:00:00 +0000 and media/img/dotted.png	2011-11-19 16:23:22 +0000 differ
=== added file 'media/img/topnav_divider.png'
Binary files media/img/topnav_divider.png	1970-01-01 00:00:00 +0000 and media/img/topnav_divider.png	2011-11-19 16:23:22 +0000 differ
=== modified file 'media/js/colortip-1.0-jquery.js'
--- media/js/colortip-1.0-jquery.js	2011-02-16 21:17:38 +0000
+++ media/js/colortip-1.0-jquery.js	2011-11-19 16:23:22 +0000
@@ -55,7 +55,7 @@
 			// On mouseenter, show the tip, on mouseleave set the
 			// tip to be hidden in half a second.
 			
-			elem.hover(function(){
+			elem.click(function(){
 
 				tip.show();
 				
@@ -63,16 +63,14 @@
 				// clear the previously set event:
 				
 				scheduleEvent.clear();
-
-			},function(){
-
-				// Schedule event actualy sets a timeout (as you can
-				// see from the class definition below).
+                elem.mouseleave(function(){
+				    // Schedule event actualy sets a timeout (as you can
+				    // see from the class definition below).
 				
-				scheduleEvent.set(function(){
-					tip.hide();
-				},settings.timeout);
-
+				    scheduleEvent.set(function(){
+					    tip.hide();
+				    },settings.timeout);
+                });
 			});
 			
 			// Removing the title attribute, so the regular OS titles are

=== modified file 'ubuntu_voting/elections/forms.py'
--- ubuntu_voting/elections/forms.py	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/elections/forms.py	2011-11-19 16:23:22 +0000
@@ -1,4 +1,5 @@
 from django import forms
+from django.template.defaultfilters import slugify
 
 from common.forms import RenderableMixin
 from common.widgets import SplitDateTimeWidget
@@ -8,6 +9,7 @@
 class CreateElectionForm(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Election
+        exclude = ('slug',)
         
     def __init__(self, *args, **kwargs):
         super(CreateElectionForm, self).__init__(*args, **kwargs)
@@ -43,6 +45,13 @@
         # Always return the full collection of cleaned data.
         return cleaned_data
         
+    def save(self, *args, **kwargs):
+        election = super(CreateElectionForm, self).save(commit=False, *args, **kwargs)
+        election.slug = slugify(election.name)
+        if kwargs.get('commit', True) is True:
+            election.save()
+        return election
+        
 
 class ApplyForElectionForm(forms.ModelForm, RenderableMixin):
     class Meta:

=== added file 'ubuntu_voting/elections/migrations/0009_auto__add_office__add_field_election_slug.py'
--- ubuntu_voting/elections/migrations/0009_auto__add_office__add_field_election_slug.py	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/elections/migrations/0009_auto__add_office__add_field_election_slug.py	2011-11-19 16:23:22 +0000
@@ -0,0 +1,108 @@
+# encoding: 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 'Office'
+        db.create_table('elections_office', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('office', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('description', self.gf('tinymce.models.HTMLField')()),
+        ))
+        db.send_create_signal('elections', ['Office'])
+
+        # Adding field 'Election.slug'
+        db.add_column('elections_election', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=128, unique=True, null=True, db_index=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Office'
+        db.delete_table('elections_office')
+
+        # Deleting field 'Election.slug'
+        db.delete_column('elections_election', 'slug')
+
+
+    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'})
+        },
+        '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'})
+        },
+        'elections.candidate': {
+            'Meta': {'ordering': "['display_name']", 'unique_together': "(('user', 'election'),)", 'object_name': 'Candidate'},
+            'chair_desired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'chair_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'council_desired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'council_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['elections.Election']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lp_profile': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'motivation': ('tinymce.models.HTMLField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'elections.election': {
+            'Meta': {'ordering': "['candidature_start', 'election_start', 'election_end', 'name']", 'object_name': 'Election'},
+            'candidature_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 16, 20, 38, 41, 658622)'}),
+            'candidature_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 11, 18, 20, 38, 41, 658576)'}),
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'election_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 23, 20, 38, 41, 658706)'}),
+            'election_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 16, 20, 38, 41, 658671)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live_results': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "u'Election'", 'max_length': '128'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'unique': 'True', 'null': 'True', 'db_index': 'True'})
+        },
+        'elections.office': {
+            'Meta': {'object_name': 'Office'},
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'office': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'elections.voter': {
+            'Meta': {'unique_together': "(('voter', 'election'),)", 'object_name': 'Voter'},
+            'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['elections.Election']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'voter': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        }
+    }
+
+    complete_apps = ['elections']

=== added file 'ubuntu_voting/elections/migrations/0010_name_to_slug.py'
--- ubuntu_voting/elections/migrations/0010_name_to_slug.py	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/elections/migrations/0010_name_to_slug.py	2011-11-19 16:23:22 +0000
@@ -0,0 +1,100 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from django.template.defaultfilters import slugify
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        "Write your forwards methods here."
+        for election in orm.election.objects.all():
+            election.slug = slugify(election.name)
+            election.save()
+
+
+    def backwards(self, orm):
+        "Write your backwards methods here."
+        for election in orm.election.objects.all():
+            election.slug = ""
+            election.save()
+
+
+    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'})
+        },
+        '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'})
+        },
+        'elections.candidate': {
+            'Meta': {'ordering': "['display_name']", 'unique_together': "(('user', 'election'),)", 'object_name': 'Candidate'},
+            'chair_desired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'chair_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'council_desired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'council_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['elections.Election']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lp_profile': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'motivation': ('tinymce.models.HTMLField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'elections.election': {
+            'Meta': {'ordering': "['candidature_start', 'election_start', 'election_end', 'name']", 'object_name': 'Election'},
+            'candidature_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 16, 20, 31, 22, 541910)'}),
+            'candidature_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 11, 18, 20, 31, 22, 541866)'}),
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'election_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 23, 20, 31, 22, 541995)'}),
+            'election_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 16, 20, 31, 22, 541958)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live_results': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "u'Election'", 'max_length': '128'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '128', 'null': 'True', 'db_index': 'True'})
+        },
+        'elections.office': {
+            'Meta': {'object_name': 'Office'},
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'office': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'elections.voter': {
+            'Meta': {'unique_together': "(('voter', 'election'),)", 'object_name': 'Voter'},
+            'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['elections.Election']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'voter': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        }
+    }
+
+    complete_apps = ['elections']

=== added file 'ubuntu_voting/elections/migrations/0011_auto__chg_field_election_slug__add_unique_election_slug.py'
--- ubuntu_voting/elections/migrations/0011_auto__chg_field_election_slug__add_unique_election_slug.py	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/elections/migrations/0011_auto__chg_field_election_slug__add_unique_election_slug.py	2011-11-19 16:23:22 +0000
@@ -0,0 +1,103 @@
+# encoding: 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 'Election.slug'
+        db.alter_column('elections_election', 'slug', self.gf('django.db.models.fields.SlugField')(default='Datamigration has failed', unique=True, max_length=128))
+
+        # Adding unique constraint on 'Election', fields ['slug']
+        db.create_unique('elections_election', ['slug'])
+
+
+    def backwards(self, orm):
+        
+        # Removing unique constraint on 'Election', fields ['slug']
+        db.delete_unique('elections_election', ['slug'])
+
+        # Changing field 'Election.slug'
+        db.alter_column('elections_election', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=128, null=True))
+
+
+    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'})
+        },
+        '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'})
+        },
+        'elections.candidate': {
+            'Meta': {'ordering': "['display_name']", 'unique_together': "(('user', 'election'),)", 'object_name': 'Candidate'},
+            'chair_desired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'chair_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'council_desired': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'council_votes': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'display_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
+            'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['elections.Election']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lp_profile': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'motivation': ('tinymce.models.HTMLField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'elections.election': {
+            'Meta': {'ordering': "['candidature_start', 'election_start', 'election_end', 'name']", 'object_name': 'Election'},
+            'candidature_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 16, 20, 39, 10, 295257)'}),
+            'candidature_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 11, 18, 20, 39, 10, 295211)'}),
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'election_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 23, 20, 39, 10, 295344)'}),
+            'election_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 16, 20, 39, 10, 295308)'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'live_results': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "u'Election'", 'max_length': '128'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'})
+        },
+        'elections.office': {
+            'Meta': {'object_name': 'Office'},
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'office': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+        },
+        'elections.voter': {
+            'Meta': {'unique_together': "(('voter', 'election'),)", 'object_name': 'Voter'},
+            'election': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['elections.Election']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'voter': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        }
+    }
+
+    complete_apps = ['elections']

=== modified file 'ubuntu_voting/elections/models.py'
--- ubuntu_voting/elections/models.py	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/elections/models.py	2011-11-19 16:23:22 +0000
@@ -14,6 +14,7 @@
 
 class Election(models.Model):
     name = models.CharField(verbose_name=_('Title of the election'), max_length=128, default=_('Election'), help_text=_('The title of the election'))
+    slug = models.SlugField(verbose_name=_('Slug'), max_length=128, unique=True, help_text=_('Slug is a newspaper term. A slug is a short label for something, containing only letters, numbers, underscores or hyphens'))
     description = HTMLField(verbose_name=_('Description of the election'), help_text=_('Describe the election'))
     candidature_start = models.DateTimeField(verbose_name=_('Start candidature'), default=datetime.datetime.now(), help_text=_('On this date the candidature starts'))
     candidature_end = models.DateTimeField(verbose_name=_('End candidature'), default=datetime.datetime.now()+datetime.timedelta(days=28), help_text=_('On this date the candidature ends'))
@@ -24,8 +25,19 @@
     def __unicode__(self):
         return self.name
         
-    def name_safe(self):
-        return iri_to_uri(self.name).replace('#', '%23').replace('/', '').replace('?', '%3F')
+    def template(self, base_template='election/incl_election_item_'):
+        now = datetime.datetime.now()
+        if self.election_end < now:
+            template = 'results'
+        elif self.election_start < now:
+            template = 'election'
+        elif self.candidature_end < now:
+            template = 'pre_election'
+        elif self.candidature_start < now:
+            template = 'candidate'
+        else:
+            template = 'pre_candidate'
+        return base_template + template + '.html'
 
     def now(self):
         return datetime.datetime.now()
@@ -63,6 +75,9 @@
     def total_council_votes(self):
         return self.get_council_candidates().aggregate(models.Sum('council_votes'))['council_votes__sum']
     
+    def top_council(self):
+        return Candidate.objects.filter(election=self, council_desired=True).order_by('-council_votes')[:10]
+    
     class Meta:
         verbose_name = 'election'
         verbose_name_plural = 'elections'

=== modified file 'ubuntu_voting/elections/urls.py'
--- ubuntu_voting/elections/urls.py	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/elections/urls.py	2011-11-19 16:23:22 +0000
@@ -1,15 +1,15 @@
 from django.conf.urls.defaults import *
-
+from django.utils.translation import ugettext_lazy as _
 
 urlpatterns = patterns('',
     url(r'^$', 'elections.views.election_active', name='election-list'),
-    url(r'^new/$', 'elections.views.election_new', name='election-new'), # Create a new election (check permissions trough admin group)
-    url(r'^upcoming/$', 'elections.views.election_queue', name='election-queue'),
-    url(r'^active/$', 'elections.views.election_active', name='election-active'),
-    url(r'^ended/$', 'elections.views.election_past', name='election-past'),
-    url(r'^(?P<electionId>\d+)/(?P<electionName>[^/]+)/$', 'elections.views.election_detail', name='election-detail'),
-    url(r'^(?P<electionId>\d+)/(?P<electionName>[^/]+)/edit$', 'elections.views.election_edit', name='election-edit'),
-    url(r'^(?P<electionId>\d+)/(?P<electionName>[^/]+)/run$', 'elections.views.election_run', name='election-run'), # Check/Uncheck (before election starts) if you apply for this
-    url(r'^(?P<electionId>\d+)/(?P<electionName>[^/]+)/vote$', 'elections.views.election_vote', name='election-vote'), # Voting happens here (or view / edit? your vote, if already voted)
-    url(r'^(?P<electionId>\d+)/(?P<electionName>[^/]+)/results/$', 'elections.views.election_results', name='election-results'), # The link where the results are shown (maybe with some nice effects)
+    url(_(r'^new/$'), 'elections.views.election_new', name='election-new'), # Create a new election (check permissions trough admin group)
+    url(_(r'^upcoming/$'), 'elections.views.election_queue', name='election-queue'),
+    url(_(r'^active/$'), 'elections.views.election_active', name='election-active'),
+    url(_(r'^ended/$'), 'elections.views.election_past', name='election-past'),
+    url(r'^(?P<slug>[\w-]+)/$', 'elections.views.election_detail', name='election-detail'),
+    url(_(r'^(?P<slug>[\w-]+)/edit$'), 'elections.views.election_edit', name='election-edit'),
+    url(_(r'^(?P<slug>[\w-]+)/run$'), 'elections.views.election_run', name='election-run'), # Check/Uncheck (before election starts) if you apply for this
+    url(_(r'^(?P<slug>[\w-]+)/vote$'), 'elections.views.election_vote', name='election-vote'), # Voting happens here (or view / edit? your vote, if already voted)
+    url(_(r'^(?P<slug>[\w-]+)/results/$'), 'elections.views.election_results', name='election-results'), # The link where the results are shown (maybe with some nice effects)
 )

=== modified file 'ubuntu_voting/elections/views.py'
--- ubuntu_voting/elections/views.py	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/elections/views.py	2011-11-19 16:23:22 +0000
@@ -27,15 +27,18 @@
     return direct_to_template(request, 'election/election_list.html', {'elections': elections})
 
 def election_active(request):
-    elections = Election.objects.filter(candidature_start__lt=datetime.datetime.now(), election_end__gt=datetime.datetime.now())
+    final_active_date = datetime.datetime.now() - datetime.timedelta(days=30)
+    elections = Election.objects.filter(candidature_start__lt=datetime.datetime.now(), election_end__gt=final_active_date)
     return direct_to_template(request, 'election/election_list.html', {'elections': elections})
 
 def election_past(request):
     elections = Election.objects.filter(election_end__lt=datetime.datetime.now())
     return direct_to_template(request, 'election/election_list.html', {'elections': elections})
     
-def election_detail(request, electionId, electionName):
-    election = Election.objects.get(pk=electionId)
+def election_detail(request, slug):
+    election = Election.objects.get(slug=slug)
+    if election.is_election_end():
+        return election_results(request, slug)
     return direct_to_template(request, 'election/election_detail.html', {'election': election})
 
 @custom_permission_required('elections.add_election')
@@ -45,32 +48,32 @@
     if request.POST and form.is_valid():
         election = form.save()
         messages.success(request, _('The election has been saved'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     
     return direct_to_template(request, 'election/election_new.html', {'form': form})
     
 @custom_permission_required('elections.change_election')
-def election_edit(request, electionId, electionName):
-    election = Election.objects.get(pk=electionId)
+def election_edit(request, slug):
+    election = Election.objects.get(slug=slug)
     
     form = CreateElectionForm(data=request.POST or None, instance=election)
     
     if request.POST and form.is_valid():
         election = form.save()
         messages.success(request, _('The election has been edited'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
      
     return direct_to_template(request, 'election/election_edit.html', {'form': form, 'election': election})   
 
 @custom_permission_required('elections.can_becandidate')
-def election_run(request, electionId, electionName):
-    election = Election.objects.get(pk=electionId)
+def election_run(request, slug):
+    election = Election.objects.get(slug=slug)
     if datetime.datetime.now() < election.candidature_start:
         messages.error(request, _('The candidature period hasn\'t started yet'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     if datetime.datetime.now() > election.candidature_end:
         messages.error(request, _('The candidature period has ended already'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
 
     candidate, created = Candidate.objects.get_or_create(election=election, user=request.user)
     form = ApplyForElectionForm(data=request.POST or None, instance=candidate)
@@ -81,25 +84,25 @@
         candidate.lp_profile = u"https://launchpad.net/~" + lp.people[candidate.user.username].name
         candidate.save()
         messages.success(request, _('Your candidature has been edited successfully'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
        
     return direct_to_template(request, 'election/election_candidature.html', {'form': form, 'election': election})
 
 @custom_permission_required('elections.can_vote')
-def election_vote(request, electionId, electionName):
-    election = Election.objects.get(pk=electionId)
+def election_vote(request, slug):
+    election = Election.objects.get(slug=slug)
     if datetime.datetime.now() < election.election_start:
         messages.error(request, _('The election hasn\'t started yet'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     if datetime.datetime.now() > election.election_end:
         messages.error(request, _('The election has ended already'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     #if len(Candidate.objects.filter(election=election, chair_desired=True)) < 1:
     #    messages.error(request, _('There aren\'t enough candidates running for Chair to let the elections begin'))
     #    return redirect(election_detail, electionId=election.pk, electionName=election.name)
     if len(Candidate.objects.filter(election=election, council_desired=True)) < 2:
         messages.error(request, _('There aren\'t enough candidates running for the Community Council to let the elections begin'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     
     # Do some extensive hashing of the voter's OpenID to prevent easy decryption
     openid = UserOpenID.objects.get(user=request.user)    
@@ -116,7 +119,7 @@
         pass
     else:
         messages.error(request, _('You\'ve already voted'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     
     form = VoteForm(data=request.POST or None, election=election)
     
@@ -124,24 +127,24 @@
         form.save()
         Voter.objects.create(election=election, voter=user_hash.hexdigest())
         messages.success(request, _('You\'ve voted successfully'))
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
         
     return direct_to_template(request, 'election/election_vote.html', {'form': form,
                                                                        'election': election})
 
     
-def election_results(request, electionId, electionName):
-    election = Election.objects.get(pk=electionId)
+def election_results(request, slug):
+    election = Election.objects.get(slug=slug)
     if datetime.datetime.now() < election.election_start:
         if election.live_results:
             messages.error(request, _('The voting hasn\'t begun yet, the first results will be visible on %(date)s.') % election.election_start)
-            return redirect(election_detail, electionId=election.pk, electionName=election.name)
+            return redirect(election_detail, slug=election.slug)
         else:
             messages.error(request, _('The voting hasn\'t begun yet, the first results will be visible on %(date)s.') % election.election_end)
-            return redirect(election_detail, electionId=election.pk, electionName=election.name)
+            return redirect(election_detail, slug=election.slug)
     if datetime.datetime.now() < election.election_end and not election.live_results:
         messages.error(request, _('The results will be visible after the vote has finished, on %(date)s.') % election.election_end)
-        return redirect(election_detail, electionId=election.pk, electionName=election.name)
+        return redirect(election_detail, slug=election.slug)
     
     #top_chairs = Candidate.objects.filter(election=election, chair_desired=True).order_by('-chair_votes')[:5]
     top_council = Candidate.objects.filter(election=election, council_desired=True).order_by('-council_votes')[:10]

=== modified file 'ubuntu_voting/locale/nl/LC_MESSAGES/django.po'
--- ubuntu_voting/locale/nl/LC_MESSAGES/django.po	2011-04-02 16:34:04 +0000
+++ ubuntu_voting/locale/nl/LC_MESSAGES/django.po	2011-11-19 16:23:22 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-02 18:10+0200\n"
+"POT-Creation-Date: 2011-11-19 00:25+0000\n"
 "PO-Revision-Date: 2011-04-02 18:27+0200\n"
 "Last-Translator: Sense Hofstede <[e-mail]>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: urls.py:15
+msgid "^login/$"
+msgstr "^inloggen/$"
+
+#: urls.py:16
+msgid "^logout/$"
+msgstr "^uitloggen/$"
+
+#: urls.py:17
+msgid "^election/"
+msgstr "^verkiezing/"
+
 #: elections/models.py:16
 msgid "Title of the election"
 msgstr "Naam van de verkiezing"
@@ -30,276 +42,272 @@
 msgstr "De naam van de verkiezing"
 
 #: elections/models.py:17
+msgid "Slug"
+msgstr "Slug"
+
+#: elections/models.py:17
+msgid ""
+"Slug is a newspaper term. A slug is a short label for something, containing "
+"only letters, numbers, underscores or hyphens"
+msgstr ""
+
+#: elections/models.py:18
 msgid "Description of the election"
 msgstr "Beschrijving van de verkiezing"
 
-#: elections/models.py:17
+#: elections/models.py:18
 msgid "Describe the election"
 msgstr "Beschrijf de verkiezing"
 
-#: elections/models.py:18
+#: elections/models.py:19
 msgid "Start candidature"
 msgstr "Begin kandidaatstelling"
 
-#: elections/models.py:18
+#: elections/models.py:19
 msgid "On this date the candidature starts"
 msgstr "Op deze datum begint de kandidaatstelling"
 
-#: elections/models.py:19
+#: elections/models.py:20
 msgid "End candidature"
 msgstr "Einde kandidaatstelling"
 
-#: elections/models.py:19
+#: elections/models.py:20
 msgid "On this date the candidature ends"
 msgstr "Op deze datum eindigt de kandidaatstelling"
 
-#: elections/models.py:20
+#: elections/models.py:21
 msgid "Start election"
 msgstr "Begin verkiezing"
 
-#: elections/models.py:20
+#: elections/models.py:21
 msgid "On this date the election starts"
 msgstr "Op deze datum begint de verkiezing"
 
-#: elections/models.py:21
+#: elections/models.py:22
 msgid "End election"
 msgstr "Einde verkiezing"
 
-#: elections/models.py:21
+#: elections/models.py:22
 msgid "On this date the election ends"
 msgstr "Op deze datum eindigt de verkiezing"
 
-#: elections/models.py:22
+#: elections/models.py:23
 msgid "Live results"
 msgstr "Live-resultaten"
 
-#: elections/models.py:22
+#: elections/models.py:23
 msgid "Show results before the election has ended"
 msgstr "Laat resultaten zien voordat de verkiezing geëindigd is"
 
-#: elections/models.py:79
+#: elections/models.py:94
 msgid "Name of the candidate"
 msgstr "Naam van de kandidaat"
 
-#: elections/models.py:80
+#: elections/models.py:95
 msgid "The Launchpad profile of the candidate"
 msgstr "Het Launchpad-profiel van de kandidaat"
 
-#: elections/models.py:81
+#: elections/models.py:96
 msgid "Motivation of the candidate"
 msgstr "Motivatie van de kandidaat"
 
-#: elections/models.py:81
+#: elections/models.py:96
 msgid "Give a motivation why people should vote on you"
 msgstr "Geef een motivatie waarom mensen op u moeten stemmen"
 
-#: elections/models.py:82
+#: elections/models.py:97
 msgid "Run for Chair"
 msgstr "Kandidaatstellen voor voorzitter"
 
-#: elections/models.py:83
+#: elections/models.py:98
 msgid "Run for the Community Council"
 msgstr "Kandidaatstellen voor de gemeenschapsraad"
 
-#: elections/models.py:130
+#: elections/models.py:145
 msgid "Title of office"
 msgstr "Naam van functie"
 
-#: elections/models.py:130
+#: elections/models.py:145
 msgid "The title of an office people can run for"
 msgstr "De naam van een functie waar men zich kandidaat voor kan stellen"
 
-#: elections/models.py:131
+#: elections/models.py:146
 msgid "Description of office"
 msgstr "Beschrijving van functie"
 
-#: elections/models.py:131
+#: elections/models.py:146
 msgid "A description explaining an office people can run for"
-msgstr "Een beschrijving van een functie waar men zich kandidaat voor kan stellen"
-
-#: elections/views.py:47
+msgstr ""
+"Een beschrijving van een functie waar men zich kandidaat voor kan stellen"
+
+#: elections/urls.py:6
+msgid "^new/$"
+msgstr "nieuw"
+
+#: elections/urls.py:7
+msgid "^upcoming/$"
+msgstr "komend"
+
+#: elections/urls.py:8
+msgid "^active/$"
+msgstr "actief"
+
+#: elections/urls.py:9
+msgid "^ended/$"
+msgstr "geeindigd"
+
+#: elections/urls.py:11
+msgid "^(?P<slug>[\\w-]+)/edit$"
+msgstr "^(?P<slug>[\\w-]+)/wijzigen$"
+
+#: elections/urls.py:12
+msgid "^(?P<slug>[\\w-]+)/run$"
+msgstr "^(?P<slug>[\\w-]+)/stel-verkiesbaar$"
+
+#: elections/urls.py:13
+msgid "^(?P<slug>[\\w-]+)/vote$"
+msgstr "^(?P<slug>[\\w-]+)/stem$"
+
+#: elections/urls.py:14
+msgid "^(?P<slug>[\\w-]+)/results/$"
+msgstr "^(?P<slug>[\\w-]+)/uitslag/$"
+
+#: elections/views.py:50
 msgid "The election has been saved"
 msgstr "De verkiezing is bewaard"
 
-#: elections/views.py:60
+#: elections/views.py:63
 msgid "The election has been edited"
 msgstr "De verkiezing is aangepast"
 
-#: elections/views.py:69
+#: elections/views.py:72
 msgid "The candidature period hasn't started yet"
 msgstr "De kandidaatstelling is nog niet begonnen"
 
-#: elections/views.py:72
+#: elections/views.py:75
 msgid "The candidature period has ended already"
 msgstr "De kandidaatstelling is al afgelopen"
 
-#: elections/views.py:83
+#: elections/views.py:86
 msgid "Your candidature has been edited successfully"
 msgstr "Uw kandidaatstelling is succesvol aangepast"
 
-#: elections/views.py:92
+#: elections/views.py:95
 msgid "The election hasn't started yet"
 msgstr "De verkiezing is nog niet begonnen"
 
-#: elections/views.py:95
+#: elections/views.py:98
 msgid "The election has ended already"
 msgstr "De verkiezing is al afgelopen"
 
-#: elections/views.py:98
-msgid ""
-"There aren't enough candidates running for Chair to let the elections begin"
-msgstr "Er zijn niet genoeg kandidaten voor voorzitter om de verkiezingen te laten beginnen"
-
-#: elections/views.py:101
+#: elections/views.py:104
 msgid ""
 "There aren't enough candidates running for the Community Council to let the "
 "elections begin"
-msgstr "Er zijn niet genoeg kandidaten voor de gemeenschapsraad om de verkiezingen te laten beginnen"
+msgstr ""
+"Er zijn niet genoeg kandidaten voor de gemeenschapsraad om de verkiezingen "
+"te laten beginnen"
 
-#: elections/views.py:118
+#: elections/views.py:121
 msgid "You've already voted"
 msgstr "U heeft al gestemd"
 
-#: elections/views.py:126
+#: elections/views.py:129
 msgid "You've voted successfully"
 msgstr "U heeft succesvol gestemd"
 
-#: elections/views.py:137 elections/views.py:140
+#: elections/views.py:140 elections/views.py:143
 #, python-format
 msgid ""
 "The voting hasn't begun yet, the first results will be visible on %(date)s."
-msgstr "Het stemmen is nog niet begonnen, de eerste uitslagen zullen zichtbaar zijn op %(date)s"
+msgstr ""
+"Het stemmen is nog niet begonnen, de eerste uitslagen zullen zichtbaar zijn "
+"op %(date)s"
 
-#: elections/views.py:143
+#: elections/views.py:146
 #, python-format
 msgid "The results will be visible after the vote has finished, on %(date)s."
-msgstr "De uitslagen zullen zichtbaar zijn nadat het stemmen afgelopen is, op %(date)s"
-
-#: templates/base.html:17
-msgid "All elections"
-msgstr "Alle verkiezingen"
-
-#: templates/base.html:17
-msgid "Elections"
-msgstr "Verkiezingen"
-
-#: templates/base.html:20
+msgstr ""
+"De uitslagen zullen zichtbaar zijn nadat het stemmen afgelopen is, op "
+"%(date)s"
+
+#: templates/403.html:5
+msgid "You have no rights to view this page"
+msgstr "Je hebt geen rechten om deze pagina te bekijken"
+
+#: templates/404.html:5
+msgid "the requested page cannot be found"
+msgstr "De gevraagde pagina kan niet worden gevonden"
+
+#: templates/500.html:5
+msgid "A server error occured, try again in a few minutes"
+msgstr ""
+"Oops, er is wat mis gegaan op de server. Probeer over een aantal minuten nog "
+"eens"
+
+#: templates/base.html:59
 msgid "Log out"
 msgstr "Afmelden"
 
-#: templates/base.html:22
+#: templates/base.html:61
+msgid "Guest"
+msgstr "Gast"
+
+#: templates/base.html:61
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: templates/base.html:28
+#: templates/base.html:66
+msgid "Home"
+msgstr "Voorpagina"
+
+#: templates/base.html:69
 msgid "Overview"
 msgstr "Overzicht"
 
-#: templates/base.html:29
+#: templates/base.html:70
 msgid "Edit"
 msgstr "Aanpassen"
 
-#: templates/base.html:34
-msgid "Run for this election"
-msgstr "Kandidaatstellen voor deze verkiezing"
-
-#: templates/base.html:39 templates/election/election_vote.html:16
-msgid "Vote"
-msgstr "Stemmen"
-
-#: templates/base.html:43
-msgid "Results"
-msgstr "Resultaten"
-
-#: templates/base.html:76
-msgid "Ubuntu Website Template developed by Michael Hall"
-msgstr "Ubuntu Website Template ontwikkeld door Michael Hall"
-
-#: templates/form.html:6
-msgid "Verplicht"
+#: templates/base.html:109
+msgid "Ubuntu Elections - By Ronnie van den Crommenacker and Sense Hofstede"
+msgstr ""
+"Ubuntu Verkiezingen - Door Ronnie van den Crommenacker en Sense Hofstede"
+
+#: templates/form.html:6 ubuntu_light_theme/templates/form.html:6
+msgid "Required"
 msgstr "Verplicht"
 
-#: templates/election/election_candidature.html:16
-#: templates/election/election_edit.html:16
-#: templates/election/election_new.html:25
+#: templates/election/election_candidature.html:12
+#: templates/election/incl_election_item_candidate.html:16
+msgid "edit your candidature"
+msgstr "stel je kandidaat"
+
+#: templates/election/election_candidature.html:20
+#: templates/election/election_edit.html:19
+#: templates/election/election_new.html:29
 msgid "Save"
 msgstr "Opslaan"
 
-#: templates/election/election_detail.html:12
-#: templates/election/election_detail.html:14
-#: templates/election/election_detail.html:17
-#: templates/election/election_list.html:24
-#: templates/election/election_list.html:26
-#: templates/election/election_list.html:29
-msgid "candidature:"
-msgstr "kandidaatstelling:"
-
-#: templates/election/election_detail.html:12
-#: templates/election/election_list.html:24
-msgid "not possible anymore"
-msgstr "niet meer mogelijk"
-
-#: templates/election/election_detail.html:14
-#: templates/election/election_list.html:26
-msgid "edit your candidature"
-msgstr ""
-
-#: templates/election/election_detail.html:14
-#: templates/election/election_detail.html:24
-#: templates/election/election_list.html:26
-#: templates/election/election_list.html:36
-#, python-format
-msgid "(%(time_left)s remaining)"
-msgstr "(nog %(time_left)s)"
-
-#: templates/election/election_detail.html:17
-#: templates/election/election_list.html:29
-#, python-format
-msgid "possible in %(time_left)s"
-msgstr "mogelijk over %(time_left)s"
-
-#: templates/election/election_detail.html:22
-#: templates/election/election_detail.html:24
-#: templates/election/election_detail.html:27
-#: templates/election/election_list.html:34
-#: templates/election/election_list.html:36
-#: templates/election/election_list.html:39
-msgid "voting:"
-msgstr "stemmen:"
-
-#: templates/election/election_detail.html:22
-#: templates/election/election_list.html:34
-msgid "ended"
-msgstr "geëindigd"
-
-#: templates/election/election_detail.html:24
-#: templates/election/election_list.html:36
-msgid "cast your vote"
-msgstr "breng uw stem uit"
-
-#: templates/election/election_detail.html:27
-#: templates/election/election_list.html:39
-#, python-format
-msgid "starts in %(time_left)s"
-msgstr "begint over %(time_left)s"
-
-#: templates/election/election_detail.html:36
-#: templates/election/election_detail.html:48
-#: templates/election/election_list.html:48
-#: templates/election/election_list.html:60
+#: templates/election/election_detail.html:9
+#: templates/election/election_results.html:14
+msgid "Candidates"
+msgstr "Kandidaten"
+
+#: templates/election/election_detail.html:13
+#: templates/election/election_results.html:18
 #, python-format
 msgid "%(candidate_name)s in Launchpad"
 msgstr "%(candidate_name)s op Launchpad"
 
-#: templates/election/election_detail.html:40
-#: templates/election/election_detail.html:52
-#: templates/election/election_list.html:51
-#: templates/election/election_list.html:63
+#: templates/election/election_detail.html:17
+#: templates/election/election_results.html:22
 msgid "There are no candidates yet"
 msgstr "Er zijn nog geen kandidaten"
 
 #: templates/election/election_list.html:6
 #: templates/election/election_new.html:11
+#: templates/election/election_new.html:21
 msgid "New election"
 msgstr "Nieuwe verkiezing"
 
@@ -318,14 +326,90 @@
 msgid "Ended elections"
 msgstr "Geëindigde verkiezingen"
 
-#: templates/election/election_list.html:71
+#: templates/election/election_list.html:22
 msgid "No elections could be found"
 msgstr "Er konden geen verkiezingen gevonden worden"
 
-#: templates/election/election_results.html:10
-msgid "Results Chair"
-msgstr "Uitslagen voorzitter"
-
-#: templates/election/election_results.html:21
-msgid "Results Community Council"
-msgstr "Uitslagen gemeenschapsraad"
+#: templates/election/election_vote.html:12
+#: templates/election/incl_election_item_election.html:16
+msgid "cast your vote"
+msgstr "breng uw stem uit"
+
+#: templates/election/election_vote.html:20
+msgid "Vote"
+msgstr "Stemmen"
+
+#: templates/election/incl_election_item_candidate.html:15
+#: templates/election/incl_election_item_election.html:15
+#, python-format
+msgid "%(timeleft)s left"
+msgstr "nog %(timeleft)s"
+
+#: templates/election/incl_election_item_pre_candidate.html:15
+#, python-format
+msgid "candidature starts in%(timeleft)s"
+msgstr "kandidaatstelleing begin over %(timeleft)s"
+
+#: templates/election/incl_election_item_pre_election.html:15
+#, python-format
+msgid "election starts in%(timeleft)s"
+msgstr "verkiezing begint over %(timeleft)s"
+
+#: templates/election/incl_election_item_results.html:10
+#, python-format
+msgid "Results: %(election_name)s"
+msgstr "Uitslag: %(election_name)s"
+
+#~ msgid "Results Community Council"
+#~ msgstr "Uitslagen gemeenschapsraad"
+
+#~ msgid "Run for this election"
+#~ msgstr "Kandidaatstellen voor deze verkiezing"
+
+#~ msgid "Results"
+#~ msgstr "Resultaten"
+
+#~ msgid "not possible anymore"
+#~ msgstr "niet meer mogelijk"
+
+#~ msgid "possible in %(time_left)s"
+#~ msgstr "mogelijk over %(time_left)s"
+
+#~ msgid "voting:"
+#~ msgstr "stemmen:"
+
+#~ msgid "ended"
+#~ msgstr "geëindigd"
+
+#, fuzzy
+#~ msgid "Council Candidates"
+#~ msgstr "Uitslagen gemeenschapsraad"
+
+#~ msgid "^account/$"
+#~ msgstr "^account/$"
+
+#~ msgid "All elections"
+#~ msgstr "Alle verkiezingen"
+
+#~ msgid "Elections"
+#~ msgstr "Verkiezingen"
+
+#~ msgid "Ubuntu Website Template developed by Michael Hall"
+#~ msgstr "Ubuntu Website Template ontwikkeld door Michael Hall"
+
+#, fuzzy
+#~ msgid "Community Council candidates:"
+#~ msgstr "Uitslagen gemeenschapsraad"
+
+#~ msgid ""
+#~ "There aren't enough candidates running for Chair to let the elections "
+#~ "begin"
+#~ msgstr ""
+#~ "Er zijn niet genoeg kandidaten voor voorzitter om de verkiezingen te "
+#~ "laten beginnen"
+
+#~ msgid "Verplicht"
+#~ msgstr "Verplicht"
+
+#~ msgid "Results Chair"
+#~ msgstr "Uitslagen voorzitter"

=== modified file 'ubuntu_voting/settings.py'
--- ubuntu_voting/settings.py	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/settings.py	2011-11-19 16:23:22 +0000
@@ -95,7 +95,9 @@
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
+    'django.contrib.messages.context_processors.messages',
     'ubuntu_voting.common.template.context_processor',
+
 )
 
 INSTALLED_APPS = (
@@ -146,6 +148,8 @@
     'theme_advanced_toolbar_location' : "top",
     'theme_advanced_toolbar_align' : "left",
     'theme_advanced_resizing' : True,
+    'width': '400px',
+    'height': '250px',
 }
 TINYMCE_COMPRESSOR = False
 TINYMCE_FILEBROWSER = False

=== modified file 'ubuntu_voting/templates/403.html'
--- ubuntu_voting/templates/403.html	2011-02-24 13:01:40 +0000
+++ ubuntu_voting/templates/403.html	2011-11-19 16:23:22 +0000
@@ -2,6 +2,6 @@
 
 {% block messages %}
     <ul class="messages main-content">
-        <li>Je hebt geen rechten om deze pagina te bekijken</li>
+        <li>{% trans "You have no rights to view this page" %}</li>
     </ul>
 {% endblock %}

=== modified file 'ubuntu_voting/templates/404.html'
--- ubuntu_voting/templates/404.html	2011-02-24 13:01:40 +0000
+++ ubuntu_voting/templates/404.html	2011-11-19 16:23:22 +0000
@@ -2,6 +2,6 @@
 
 {% block messages %}
     <ul class="messages main-content">
-        <li>De opgevraagde pagina kan niet worden gevonden</li>
+        <li>{% trans "the requested page cannot be found" %}</li>
     </ul>
 {% endblock %}

=== modified file 'ubuntu_voting/templates/500.html'
--- ubuntu_voting/templates/500.html	2011-02-24 13:01:40 +0000
+++ ubuntu_voting/templates/500.html	2011-11-19 16:23:22 +0000
@@ -2,6 +2,6 @@
 
 {% block messages %}
     <ul class="messages main-content">
-        <li>Er is een server fout opgetreden, probeer over enkele minuten opnieuw</li>
+        <li>{% trans "A server error occured, try again in a few minutes" %}</li>
     </ul>
 {% endblock %}

=== modified file 'ubuntu_voting/templates/base.html'
--- ubuntu_voting/templates/base.html	2011-04-02 16:34:04 +0000
+++ ubuntu_voting/templates/base.html	2011-11-19 16:23:22 +0000
@@ -14,34 +14,27 @@
 {% endblock %}
 
 {% block main_nav_links %}
-    <a href="/election/" title="{% trans 'All elections' %}" class="main-nav-item ">{% trans 'Elections' %}</a>
-    {% if user.is_authenticated %}
-    <!-- Logout url -->
-    <a href="{% url logout %}" title="{% trans 'Log out' %}" class="main-nav-item ">{% trans 'Log out' %}</a>
-    {% else %}
-    <a href="{% url login %}?next={{ request.path }}" title="{% trans 'Log in' %}" class="main-nav-item ">{% trans 'Log in' %}</a>
-    {% endif %}
+    <a class="main-nav-item" href="/test/?q=node/1">Ubuntu</a>
+    <a class="main-nav-item" href="/test/?q=node/4">Ondersteuning</a>
+    <a class="main-nav-item current" href="/test/?q=node/5">Gemeenschap</a>
+    <a class="main-nav-item" href="/test/?q=node/24">Agenda</a>
+    <a class="main-nav-item" href="/test/?q=node/19">Nieuws</a>
+    <a class="main-nav-item" href="/test/?q=node/36">Partners</a>
 {% endblock %}
 
-{% block sub_nav_links %}
-    {% if election %}
-    <a href="{% url election-detail electionId=election.pk, electionName=election.name_safe %}" class="sub-nav-item">{% trans "Overview" %}</a>
-    <a href="{% url election-edit electionId=election.pk, electionName=election.name_safe %}" class="sub-nav-item">{% trans "Edit" %}</a>
-    {% endif %}
-    
-    <!-- TODO: Only if allowed -->
-    {% if election.is_candidature %}
-    <a href="{% url election-run electionId=election.pk, electionName=election.name_safe %}" class="sub-nav-item">{% trans "Run for this election" %}</a>
-    {% endif %}
-    
-    <!-- TODO: Only if allowed -->
-    {% if election.is_election %}
-    <a href="{% url election-vote electionId=election.pk, electionName=election.name_safe %}" class="sub-nav-item">{% trans "Vote" %}</a>
-    {% endif %}
-    
-    {% if election.is_results %}
-    <a href="{% url election-results electionId=election.pk, electionName=election.name_safe %}" class="sub-nav-item">{% trans "Results" %}</a>
-    {% endif %}
+{% block sub_nav %}
+    <div class="container" id="sub-nav-container" >
+        <nav id="sub-nav">
+            <a class="sub-nav-item" href="/test/?q=node/5">Introductie</a>
+            <a class="sub-nav-item" href="/test/?q=node/14">Meedoen</a>
+            <a class="sub-nav-item" href="/test/?q=node/26">Foto's</a>
+            <a class="sub-nav-item" href="/test/?q=node/52">Organisatie</a>
+            <a class="sub-nav-item" href="/test/?q=node/7">Teams</a>
+            <a class="sub-nav-item" href="/test/?q=node/102">Teamleden</a>
+            <a class="sub-nav-item" href="/test/?q=node/49">Contact</a>
+            <a class="sub-nav-item current" href="{% url home %}">Verkiezingen</a>
+        </nav>
+    </div>
 {% endblock %}
 
 {% block search %}
@@ -58,22 +51,60 @@
 {% endblock %}
 
 {% block content %}
+    <aside class="content content-small content-right">
+        {% block login %}
+            <div class="login">
+                {% if user.is_authenticated %}
+                <!-- Logout url -->
+                {{ request.user.username }}<a href="{% url logout %}" title="{% trans 'Log out' %}" class="login-button">{% trans 'Log out' %}</a>
+                {% else %}
+                {% trans "Guest" %}<a href="{% url login %}?next={{ request.path }}" title="{% trans 'Log in' %}" class="logout-button">{% trans 'Log in' %}</a>
+                {% endif %}
+            </div>
+        {% endblock %}
+        <div class="content-inner">
+            <a href="{% url home %}" class="sub-nav-item">{% trans "Home" %}</a>
+            {% block election_sub_nav %}
+                {% if election %}
+                    <a href="{% url election-detail slug=election.slug %}" class="sub-nav-item">{% trans "Overview" %}</a>
+                    <a href="{% url election-edit slug=election.slug %}" class="sub-nav-item">{% trans "Edit" %}</a>
+                {% endif %}
+            {% endblock %}
+        </div>
+    </aside>
+    
+    {% block election_content %}
+    {% endblock %}
 {% endblock %}
 
 {% block general %}
 {% endblock %}
 
-{% block footer_list_1 %}
-{% endblock %}
-
-{% block footer_list_2 %}
-{% endblock %}
-
-{% block footer_list_3 %}
-{% endblock %}
-
-{% block footer_note %}
-<p>{% trans "Ubuntu Website Template developed by Michael Hall" %}
-<a href="https://launchpad.net/django-ubuntu-template" target="_blank">https://launchpad.net/django-ubuntu-template</a>
-</p>
+
+{% block footer %}
+    <dl class="footer-content">
+        <dt>Legal Disclaimer</dt>
+        <dd><p>&copy; 2010 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p></dd>
+    </dl>
+    <dl class="footer-content">
+        <dt>Content license</dt>
+        <dd>
+            <ul class="footer-links" >
+                <li class="footer-item"><a class="footer-link" href="/test/?q=/node/100">Images</a></li>
+                <li class="footer-item"><a class="footer-link" href="/test/?q=/node/101">texts</a></li>
+            </ul>
+        </dd>
+    </dl>
+    <dl class="footer-content">
+        <dt>More Ubuntu</dt>
+        <dd>
+            <ul class="footer-links" >
+                <li class="footer-item"><a class="footer-link" href="http://ubuntu.com/getubuntu/download/">Get Ubuntu</a></li>
+                <li class="footer-item"><a class="footer-link" href="http://brainstorm.ubuntu.com/">Ubuntu Brainstorm</a></li>
+                <li class="footer-item"><a class="footer-link" href="http://ubuntuforums.org/">Ubuntu Forums</a></li>
+                <li class="footer-item"><a class="footer-link" href="http://spreadubuntu.neomenlo.org/">Spread Ubuntu</a></li>
+            </ul>
+        </dd>
+    </dl>
+    <details class="foot-note"><p>{% trans "Ubuntu Elections - By Ronnie van den Crommenacker and Sense Hofstede" %}</p></details>
 {% endblock %}

=== modified file 'ubuntu_voting/templates/election/election_candidature.html'
--- ubuntu_voting/templates/election/election_candidature.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_candidature.html	2011-11-19 16:23:22 +0000
@@ -6,15 +6,20 @@
     {{ form.media }}
 {% endblock %}
 
-{% block content %}
-    <section class="minor-content">
-        <form method="POST" class="small">
-            {% csrf_token %}
-            <ul>
-                {{ form.as_template }}
-            </ul>
-            <input type="submit" value="{% trans "Save" %}" />
-        </form>
+{% block election_content %}
+    <section class="content content-medium content-left">
+        <div class="content-inner">
+            <h2>{% trans "edit your candidature" %}</h2>
+            <form method="POST" class="small">
+                <fieldset>
+                    {% csrf_token %}
+                    <ul>
+                        {{ form.as_template }}
+                    </ul>
+                </fieldset>
+                <input type="submit" value="{% trans "Save" %}" />
+            </form>
+        </div>
     </section>
 {% endblock %}
 

=== modified file 'ubuntu_voting/templates/election/election_detail.html'
--- ubuntu_voting/templates/election/election_detail.html	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/templates/election/election_detail.html	2011-11-19 16:23:22 +0000
@@ -1,58 +1,22 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block content %}
-    <div class="main-content">
-        <h1><a href="{% url election-detail electionId=election.pk electionName=election.name_safe %}">{{ election.name }}</a></h1>
-        {% autoescape off %}
-            {{ election.description }}
-        {% endautoescape %}
-        {% if election.is_candidature_start %}
-            {% if election.is_candidature_end %}
-                <p><strong>{% trans 'candidature:' %}</strong> <em>{% trans 'not possible anymore' %}</em></p>
-            {% else %}
-                <p><strong>{% trans 'candidature:' %}</strong> <em><a href="{% url election-run electionId=election.pk electionName=election.name_safe %}">{% trans "edit your candidature" %}</a> {% blocktrans with election.candidature_end|timeuntil:election.now as time_left %}({{ time_left }} remaining){% endblocktrans %}</em></p>
-            {% endif %}
-        {% else %}
-            <p><strong>{% trans 'candidature:' %}</strong> <em>{% blocktrans with election.candidature_start|timeuntil:election.now as time_left %}possible in {{ time_left }}{% endblocktrans %}</em></p>
-        {% endif %}
-        
-        {% if election.is_election_start %}
-            {% if election.is_election_end %}
-                <p><strong>{% trans 'voting:' %}</strong> <em>{% trans 'ended' %}</em></p>
-            {% else %}
-                <p><strong>{% trans 'voting:' %}</strong> <em><a href="{% url election-vote electionId=election.pk electionName=election.name_safe %}">{% trans 'cast your vote' %}</a> {% blocktrans with election.election_end|timeuntil:election.now as time_left %}({{ time_left }} remaining){% endblocktrans %}</em></p>
-            {% endif %}
-        {% else %}
-            <p><strong>{% trans 'voting:' %}</strong> <em>{% blocktrans with election.election_start|timeuntil:election.now as time_left %}starts in {{ time_left }}{% endblocktrans %}</em></p>
-        {% endif %}
-    </div>
+{% block election_content %}
+    {% include election.template %}
     {% if election.is_candidature_start %}
-    {% comment %}
-    <div class="minor-content alone">
-        <h3>Voorzitterskandidaten</h3>
-        {% if election.get_chair_candidates %}
-        <ul id="chaircandidateslist">
-            {% for candidate in election.get_chair_candidates %}
-                <li><a rel="external" title="{% blocktrans with candidate.display_name as candidate_name %}{{ candidate_name }} in Launchpad{% endblocktrans %}" href="{{ candidate.lp_profile }}" style="font-size:1.3em;">{{ candidate.display_name }}</a><br/>{% autoescape off %}{{ candidate.motivation }}{% endautoescape %}</li>
-            {% endfor %}
-        </ul>
-        {% else %}
-        <strong>{% trans 'There are no candidates yet' %}</strong>
-        {% endif %}
-    </div>
-    {% endcomment %}
-    <div class="minor-content alone">
-        <h3>Gemeenschapsraadskandidaten</h3>
-        {% if election.get_council_candidates %}
-        <ul id="councilcandidateslist">
-            {% for candidate in election.get_council_candidates %}
-                <li><a rel="external" title="{% blocktrans with candidate.display_name as candidate_name %}{{ candidate_name }} in Launchpad{% endblocktrans %}" href="{{ candidate.lp_profile }}" style="font-size:1.3em;">{{ candidate.display_name }}</a><br/>{% autoescape off %}{{ candidate.motivation }}{% endautoescape %}</li>
-            {% endfor %}
-        </ul>
-        {% else %}
-        <strong>{% trans 'There are no candidates yet' %}</strong>
-        {% endif %}
-    </div>
+    <article class="content content-medium content-left">
+        <div class="content-inner">
+            <h3>{% trans 'Candidates' %}</h3>
+            {% if election.get_council_candidates %}
+            <ul id="councilcandidateslist">
+                {% for candidate in election.get_council_candidates %}
+                    <li><a rel="external" title="{% blocktrans with candidate.display_name as candidate_name %}{{ candidate_name }} in Launchpad{% endblocktrans %}" href="{{ candidate.lp_profile }}" style="font-size:1.3em;">{{ candidate.display_name }}</a><br/>{% autoescape off %}{{ candidate.motivation }}{% endautoescape %}</li>
+                {% endfor %}
+            </ul>
+            {% else %}
+            <strong>{% trans 'There are no candidates yet' %}</strong>
+            {% endif %}
+        </div>
+    </article>
     {% endif %}
 {% endblock %}

=== modified file 'ubuntu_voting/templates/election/election_edit.html'
--- ubuntu_voting/templates/election/election_edit.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_edit.html	2011-11-19 16:23:22 +0000
@@ -6,15 +6,19 @@
     {{ form.media }}
 {% endblock %}
 
-{% block content %}
-    <section class="minor-content">
-        <form method="POST" class="small">
-            {% csrf_token %}
-            <ul>
-                {{ form.as_template }}
-            </ul>
-            <input type="submit" value="{% trans 'Save' %}" />
-        </form>
+{% block election_content %}
+    <section class="content content-medium content-left">
+        <div class="content-inner">
+            <form method="POST" class="small">
+                <fieldset>
+                    {% csrf_token %}
+                    <ul>
+                        {{ form.as_template }}
+                    </ul> 
+                </fieldset>
+                <input type="submit" value="{% trans 'Save' %}" />
+            </form>
+        </div>
     </section>
 {% endblock %}
 

=== modified file 'ubuntu_voting/templates/election/election_list.html'
--- ubuntu_voting/templates/election/election_list.html	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/templates/election/election_list.html	2011-11-19 16:23:22 +0000
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block sub_nav_links %}
+{% block election_sub_nav %}
     {% if perms.elections.add_election %}
     <a href="{% url election-new %}" class="sub-nav-item">{% trans 'New election' %}</a>
     {% endif %}
@@ -11,66 +11,17 @@
 {% endblock %}
 
 
-{% block content %}
+{% block election_content %}
     {% if elections|length %}
-    {% for election in elections %}
-        <div class="minor-content alone">
-            <h3><a href="{% url election-detail electionId=election.pk electionName=election.name_safe %}">{{ election.name }}</a></h3>
-            {% autoescape off %}
-                {{ election.description }}
-            {% endautoescape %}
-            {% if election.is_candidature_start %}
-                {% if election.is_candidature_end %}
-                    <p><strong>k{% trans 'candidature:' %}</strong> <em>{% trans 'not possible anymore' %}</em></p>
-                {% else %}
-                    <p><strong>{% trans 'candidature:' %}</strong> <em><a href="{% url election-run electionId=election.pk electionName=election.name_safe %}">{% trans "edit your candidature" %}</a> {% blocktrans with election.candidature_end|timeuntil:election.now as time_left %}({{ time_left }} remaining){% endblocktrans %}</em></p>
-                {% endif %}
-            {% else %}
-                <p><strong>{% trans 'candidature:' %}</strong> <em>{% blocktrans with election.candidature_start|timeuntil:election.now as time_left %}possible in {{ time_left }}{% endblocktrans %}</em></p>
-            {% endif %}
-            
-            {% if election.is_election_start %}
-                {% if election.is_election_end %}
-                    <p><strong>{% trans 'voting:' %}</strong> <em>{% trans 'ended' %}</em></p>
-                {% else %}
-                    <p><strong>{% trans 'voting:' %}</strong> <em><a href="{% url election-vote electionId=election.pk electionName=election.name_safe %}">{% trans 'cast your vote' %}</a> {% blocktrans with election.election_end|timeuntil:election.now as time_left %}({{ time_left }} remaining){% endblocktrans %}</em></p>
-                {% endif %}
-            {% else %}
-                <p><strong>{% trans 'voting:' %}</strong> <em>{% blocktrans with election.election_start|timeuntil:election.now as time_left %}starts in {{ time_left }}{% endblocktrans %}</em></p>
-            {% endif %}
-            
-            {% if election.is_candidature_start %}
-            {% comment %}
-            <div class="sub-content">
-                <p>
-                    Voorzitterskandidaten:
-                    {% if election.get_chair_candidates %}
-                        {% for candidate in election.get_chair_candidates %}
-                            <a rel="external" title="{% blocktrans with candidate.display_name as candidate_name %}{{ candidate_name }} in Launchpad{% endblocktrans %}" href="{{ candidate.lp_profile }}">{{ candidate.display_name }}</a><br/>
-                        {% endfor %}
-                    {% else %}
-                        <em>{% trans 'There are no candidates yet' %}</em>
-                    {% endif %}
-                </p>
-            </div>
-            {% endcomment %}
-            <div class="sub-content">
-                <p>
-                    {% trans 'Community Council candidates:' %}
-                    {% if election.get_council_candidates %}
-                        {% for candidate in election.get_council_candidates %}
-                            <a rel="external" title="{% blocktrans with candidate.display_name as candidate_name %}{{ candidate_name }} in Launchpad{% endblocktrans %}" href="{{ candidate.lp_profile }}">{{ candidate.display_name }}</a><br/>
-                        {% endfor %}
-                    {% else %}
-                        <em>{% trans 'There are no candidates yet' %}/em>
-                    {% endif %}
-                </p>
-            </div>
-            {% endif %}
-        </div>
-    {% endfor %}
+        {% for election in elections %}
+            {% include election.template %}
+        {% endfor %}
     {% else %}
-        <section class="minor-content"><p>{% trans 'No elections could be found' %} </p></section>
+        <article class="content content-medium content-left">
+            <div class="content-inner">
+                <p>{% trans 'No elections could be found' %}</p>
+            </div>    
+        </article>
     {% endif %}
 {% endblock %}
 

=== modified file 'ubuntu_voting/templates/election/election_new.html'
--- ubuntu_voting/templates/election/election_new.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_new.html	2011-11-19 16:23:22 +0000
@@ -6,7 +6,7 @@
     {{ form.media }}
 {% endblock %}
 
-{% block sub_nav_links %}
+{% block election_sub_nav %}
     {% if perms.elections.add_election %}
     <a href="{% url election-new %}" class="sub-nav-item">{% trans 'New election' %}</a>
     {% endif %}
@@ -15,15 +15,20 @@
     <a href="{% url election-past %}" class="sub-nav-item">{% trans 'Ended elections' %}</a>
 {% endblock %}
 
-{% block content %}
-    <section class="minor-content">
-        <form method="POST" class="small">
-            {% csrf_token %}
-            <ul>
-                {{ form.as_template }}
-            </ul>
-            <input type="submit" value="{% trans 'Save' %}" />
-        </form>
+{% block election_content %}
+    <section class="content content-medium content-left">
+        <div class="content-inner">
+            <h2>{% trans 'New election' %}</h2>
+            <form method="post">
+                <fieldset>
+                    {% csrf_token %}
+                    <ul>
+                        {{ form.as_template }}
+                    </ul>
+                </fieldset>
+                <input type="submit" value="{% trans 'Save' %}" />
+            </form>
+        </div>
     </section>
 {% endblock %}
 

=== modified file 'ubuntu_voting/templates/election/election_results.html'
--- ubuntu_voting/templates/election/election_results.html	2011-09-21 17:18:11 +0000
+++ ubuntu_voting/templates/election/election_results.html	2011-11-19 16:23:22 +0000
@@ -5,30 +5,24 @@
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery/jquery-1.4.2.min.js"></script>
 {% endblock %}
 
-{% block content %}
-    {% comment %}
-    <section class="minor-content alone">
-        <h3>{% trans 'Results Chair' %}</h3>
-        <div id="council-results">
-        {% for candidate in chairs %} 
-            <div class="graph-item">
-                <hr class="graph-bar graph-bar-{{ candidate.is_chair }}" style="width:{{ candidate.relative_chair_percentage }}%;" />
-                <div class="graph-label graph-label-{{ candidate.is_chair }}">{{ candidate }}<span class="result"> ({{ candidate.chair_percentage }}&#37;)</span></div>
-            </div>
-        {% endfor %}
-        </div>
-    </section>
-    {% endcomment %}
-    <section class="minor-content alone">
-        <h3>{% trans 'Results Community Council' %}</h3>
-        <div id="council-results">
-        {% for candidate in council %} 
-            <div class="graph-item">
-                <hr class="graph-bar graph-bar-{{ candidate.is_council }}" style="width:{{ candidate.relative_council_percentage }}%;" />
-                <div class="graph-label graph-label-{{ candidate.is_council }}">{{ candidate }}<span class="result"> ({{ candidate.council_percentage }}&#37;)</span></div>
-            </div>
-        {% endfor %}
-        </div>
-    </section>
+{% block election_content %}
+    {% include election.template %}
+    
+    {% if election.is_candidature_start %}
+        <article class="content content-medium content-left">
+            <div class="content-inner">
+                <h3>{% trans 'Candidates' %}</h3>
+                {% if election.get_council_candidates %}
+                <ul id="councilcandidateslist">
+                    {% for candidate in election.get_council_candidates %}
+                        <li><a rel="external" title="{% blocktrans with candidate.display_name as candidate_name %}{{ candidate_name }} in Launchpad{% endblocktrans %}" href="{{ candidate.lp_profile }}" style="font-size:1.3em;">{{ candidate.display_name }}</a><br/>{% autoescape off %}{{ candidate.motivation }}{% endautoescape %}</li>
+                    {% endfor %}
+                </ul>
+                {% else %}
+                <strong>{% trans 'There are no candidates yet' %}</strong>
+                {% endif %}
+            </div>
+        </article>
+    {% endif %}
 {% endblock %}
 

=== modified file 'ubuntu_voting/templates/election/election_vote.html'
--- ubuntu_voting/templates/election/election_vote.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_vote.html	2011-11-19 16:23:22 +0000
@@ -6,15 +6,20 @@
     {{ form.media }}
 {% endblock %}
 
-{% block content %}
-    <section class="minor-content">
-        <form method="POST" class="small">
-            {% csrf_token %}
-            <ul>
-                {{ form.as_template }}
-            </ul>
-            <input type="submit" value="{% trans 'Vote' %}" />
-        </form>
+{% block election_content %}
+    <section class="content content-medium content-left">
+        <div class="content-inner">
+            <h2>{% trans 'cast your vote' %}</h2>
+            <form method="POST" class="small">
+                <fieldset>
+                    {% csrf_token %}
+                    <ul>
+                        {{ form.as_template }}
+                    </ul>
+                </fieldset>
+                <input type="submit" value="{% trans 'Vote' %}" />
+            </form>
+        </div>
     </section>
 {% endblock %}
 

=== added file 'ubuntu_voting/templates/election/incl_election_item_candidate.html'
--- ubuntu_voting/templates/election/incl_election_item_candidate.html	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/templates/election/incl_election_item_candidate.html	2011-11-19 16:23:22 +0000
@@ -0,0 +1,18 @@
+{% load i18n %}
+
+<article class="content content-medium content-left">         
+    <div class="content-inner">
+        <h2><a href="{% url election-detail slug=election.slug %}">{{ election.name }}</a></h2>
+        {% autoescape off %}
+            {{ election.description }}
+        {% endautoescape %}
+        
+        {% for candidate in election.candidates.all %}
+            {{ candidate.display_name }}
+        {% endfor %}
+    </div>
+    <div class="button-bar">
+        <div class="countdown">{% blocktrans with election.candidature_end|timeuntil:election.now as timeleft %}{{ timeleft }} left{% endblocktrans %}</div>
+        <a href="{% url election-run slug=election.slug %}" class="button button-right">{% trans "edit your candidature" %}</a>
+    </div>
+</article>

=== added file 'ubuntu_voting/templates/election/incl_election_item_election.html'
--- ubuntu_voting/templates/election/incl_election_item_election.html	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/templates/election/incl_election_item_election.html	2011-11-19 16:23:22 +0000
@@ -0,0 +1,18 @@
+{% load i18n %}
+
+<article class="content content-medium content-left">         
+    <div class="content-inner">
+        <h2><a href="{% url election-detail slug=election.slug %}">{{ election.name }}</a></h2>
+        {% autoescape off %}
+            {{ election.description }}
+        {% endautoescape %}
+        
+        {% for candidate in election.candidates.all %}
+            {{ candidate.display_name }}
+        {% endfor %}
+    </div>
+    <div class="button-bar">
+        <div class="countdown">{% blocktrans with election.election_end|timeuntil:election.now as timeleft %}{{ timeleft }} left{% endblocktrans %}</div>
+        <a href="{% url election-vote slug=election.slug %}" class="button button-right">{% trans 'cast your vote' %}</a>
+    </div>
+</article>

=== added file 'ubuntu_voting/templates/election/incl_election_item_pre_candidate.html'
--- ubuntu_voting/templates/election/incl_election_item_pre_candidate.html	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/templates/election/incl_election_item_pre_candidate.html	2011-11-19 16:23:22 +0000
@@ -0,0 +1,17 @@
+{% load i18n %}
+
+<article class="content content-medium content-left">         
+    <div class="content-inner">
+        <h2><a href="{% url election-detail slug=election.slug %}">{{ election.name }}</a></h2>
+        {% autoescape off %}
+            {{ election.description }}
+        {% endautoescape %}
+        
+        {% for candidate in election.candidates.all %}
+            {{ candidate.display_name }}
+        {% endfor %}
+    </div>
+    <div class="button-bar">
+        <div class="countdown">{% blocktrans with election.candidature_start|timeuntil:election.now as timeleft %}candidature starts in{{ timeleft }}{% endblocktrans %}</div>
+    </div>
+</article>

=== added file 'ubuntu_voting/templates/election/incl_election_item_pre_election.html'
--- ubuntu_voting/templates/election/incl_election_item_pre_election.html	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/templates/election/incl_election_item_pre_election.html	2011-11-19 16:23:22 +0000
@@ -0,0 +1,17 @@
+{% load i18n %}
+
+<article class="content content-medium content-left">         
+    <div class="content-inner">
+        <h2><a href="{% url election-detail slug=election.slug %}">{{ election.name }}</a></h2>
+        {% autoescape off %}
+            {{ election.description }}
+        {% endautoescape %}
+        
+        {% for candidate in election.candidates.all %}
+            {{ candidate.display_name }}
+        {% endfor %}
+    </div>
+    <div class="button-bar">
+        <div class="countdown">{% blocktrans with election.election_start|timeuntil:election.now as timeleft %}election starts in{{ timeleft }}{% endblocktrans %}</div>
+    </div>
+</article>

=== added file 'ubuntu_voting/templates/election/incl_election_item_results.html'
--- ubuntu_voting/templates/election/incl_election_item_results.html	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/templates/election/incl_election_item_results.html	2011-11-19 16:23:22 +0000
@@ -0,0 +1,22 @@
+{% load i18n %}
+
+{% block extrahead %}
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery/jquery-1.4.2.min.js"></script>
+{% endblock %}
+
+{% block election_content %}
+    <section class="content content-medium content-left">
+        <div class="content-inner">
+            <h2><a href="{% url election-detail slug=election.slug %}">{% blocktrans with election.name as election_name %}Results: {{ election_name }}{% endblocktrans %}<a></h2>
+            <div id="council-results">
+            {% for candidate in election.top_council %} 
+                <div class="graph-item">
+                    <hr class="graph-bar graph-bar-{{ candidate.is_council }}" style="width:{{ candidate.relative_council_percentage }}%;" />
+                    <div class="graph-label graph-label-{{ candidate.is_council }}">{{ candidate }}<span class="result"> ({{ candidate.council_percentage }}&#37;)</span></div>
+                </div>
+            {% endfor %}
+            </div>
+        </div>
+    </section>
+{% endblock %}
+

=== modified file 'ubuntu_voting/templates/form.html'
--- ubuntu_voting/templates/form.html	2011-02-16 21:17:38 +0000
+++ ubuntu_voting/templates/form.html	2011-11-19 16:23:22 +0000
@@ -1,9 +1,10 @@
 {% load i18n %}
 {% for field in form.visible_fields %}
 	<li class="form-item">
-		{% if field.field.label %}<label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}{% endif %} :</label>{% endif %}
-		{{ field }}{% if field.field.required %}<span class="required">*</span>{% endif %}
-		{% if field.help_text %}<span class="help" rel="help" title="{{ field.help_text }} {% if field.field.required %}({% trans "Verplicht" %}){% endif %}"><img src="/media/img/question.png" alt="?" /></span>{% endif %}
+		{% if field.field.label %}<label for="id_{{ field.name }}"{% if field.field.required %} class="required"{% endif %}>{{ field.label }}</label>{% endif %}
+		
+		{% if field.help_text %}<span class="help" rel="help" title="{{ field.help_text }}{% if field.field.required %} ({% trans "Required" %}){% endif %}"><img src="/media/img/question.png" width="16" height="16" alt="?" /></span>{% endif %}
+		{{ field }}
 		{{ field.errors }}
 	</li>
 {% endfor %}

=== modified file 'ubuntu_voting/urls.py'
--- ubuntu_voting/urls.py	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/urls.py	2011-11-19 16:23:22 +0000
@@ -1,4 +1,5 @@
 from django.conf.urls.defaults import *
+from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django.contrib import admin
 import ubuntu_light_theme
@@ -10,9 +11,10 @@
 urlpatterns = patterns('',
     url(r'^$', 'elections.views.election_active', name='home'),
     url(r'^account/$', 'elections.views.account', name='account'), # to fill in your Full name, because the LP name is not always the right
-    url(r'^login/$', 'django_openid_auth.views.login_begin', name='login'),
-    url(r'^logout/$', 'django.contrib.auth.views.logout', name='logout', kwargs={'next_page': '/'}),
-    url(r'^election/', include('ubuntu_voting.elections.urls')),
+
+    url(_(r'^login/$'), 'django_openid_auth.views.login_begin', name='login'),
+    url(_(r'^logout/$'), 'django.contrib.auth.views.logout', name='logout', kwargs={'next_page': '/'}),
+    url(_(r'^election/'), include('ubuntu_voting.elections.urls')),
 
     # Uncomment the admin/doc line below to enable admin documentation:
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
@@ -27,6 +29,7 @@
     (r'^tinymce/', include('tinymce.urls')),
 )
 
+
 if settings.STATIC_SERVE:
     urlpatterns += patterns('',
         (r'^media/(?P<path>.*)$', 'django.views.static.serve',