Merge lp:~ronnie.vd.c/ubuntu-elections/generic-names into lp:ubuntu-elections

[Ronnie]

Used generic names instead of chair or council.

=== modified file 'media/css/voting.css'
--- media/css/voting.css	2011-11-19 16:19:35 +0000
+++ media/css/voting.css	2011-11-20 11:21:23 +0000
@@ -209,10 +209,6 @@
     padding: 0;
 }
 
-/* Election details */
-ul#chaircandidateslist li, ul#councilcandidateslist li { list-style: none; margin-bottom: 15px; }
-ul#chaircandidateslist li li, ul#councilcandidateslist li li { list-style: disc; margin-bottom: 5px; margin-left: 15px; } 
-
 /* Tooltip CSS */
 .ubuntu .pointyTip{ border-top-color:#DD4814;}
 .ubuntu .pointyTipShadow{ border-top-color:#DD4814;}

=== modified file 'ubuntu_voting/elections/forms.py'
--- ubuntu_voting/elections/forms.py	2011-11-19 16:19:35 +0000
+++ ubuntu_voting/elections/forms.py	2011-11-20 11:21:23 +0000
@@ -1,5 +1,6 @@
 from django import forms
 from django.template.defaultfilters import slugify
+from django.utils.translation import ugettext as _
 
 from common.forms import RenderableMixin
 from common.widgets import SplitDateTimeWidget
@@ -56,51 +57,36 @@
 class ApplyForElectionForm(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Candidate
-        fields = ('council_desired', 'motivation')#'chair_desired', 
-        
-    def __init__(self, *args, **kwargs):
-        super(ApplyForElectionForm, self).__init__(*args, **kwargs)
-        self.initial['council_desired'] = True
+        fields = ('motivation',)
         
 
 class VoteForm(forms.Form, RenderableMixin):
-    #chair = forms.ModelChoiceField(label='Voorzitter', queryset=Candidate.objects.all())
-    council1 = forms.ModelChoiceField(label='Gemeenschapsraad 1e keuze', help_text='Deze persoon krijgt 6 punten', queryset=Candidate.objects.all())
-    council2 = forms.ModelChoiceField(label='Gemeenschapsraad 2e keuze', help_text='Deze persoon krijgt 5 punten', queryset=Candidate.objects.all())
-    #council3 = forms.ModelChoiceField(label='Gemeenschapsraad 3e keuze', help_text='Deze persoon krijgt 4 punten', queryset=Candidate.objects.all())
-    #council4 = forms.ModelChoiceField(label='Gemeenschapsraad 4e keuze', help_text='Deze persoon krijgt 3 punten', queryset=Candidate.objects.all())
-    #council5 = forms.ModelChoiceField(label='Gemeenschapsraad 5e keuze', help_text='Deze persoon krijgt 2 punten', queryset=Candidate.objects.all())
-    #council6 = forms.ModelChoiceField(label='Gemeenschapsraad 6e keuze', help_text='Deze persoon krijgt 1 punten', queryset=Candidate.objects.all())
-    
     def __init__(self, election, *args, **kwargs):
         super(VoteForm, self).__init__(*args, **kwargs)
-        #chair_choices = Candidate.objects.filter(election=election, chair_desired=True)
-        council_choices = Candidate.objects.filter(election=election, council_desired=True)
-        #self.fields['chair'].queryset = chair_choices
-        self.fields['council1'].queryset = council_choices
-        self.fields['council2'].queryset = council_choices
-        #self.fields['council3'].queryset = council_choices
-        #self.fields['council4'].queryset = council_choices
-        #self.fields['council5'].queryset = council_choices
-        #self.fields['council6'].queryset = council_choices
+        
+        self.election = election
+        
+        candidate_choices = Candidate.objects.filter(election=election)
+        for i in range(election.candidature_amount):
+            self.fields['candidate%d' % i] = forms.ModelChoiceField(
+                label=_('Choice %d') % (i + 1), 
+                help_text=_('This person receives %d points' % (len(candidate_choices) - i)), 
+                queryset=candidate_choices)
+        
+        
     
     def clean(self, *args, **kwargs):
         cleaned_data = self.cleaned_data
         
-        council = [cleaned_data.get('council1'),
-                   cleaned_data.get('council2'),]
-                   #cleaned_data.get('council3'),
-                   #cleaned_data.get('council4'),
-                   #cleaned_data.get('council5'),
-                   #cleaned_data.get('council6')]
-        council.reverse()
+        candidates = [cleaned_data.get('candidates%d' % i) for i in range(self.election.candidature_amount)]
+        candidates.reverse()
         
-        for candidate in council:
-            if candidate is not None and council.count(candidate) > 1:
-                for same in range(council.count(candidate) - 1):
-                    index = council.index(candidate)
-                    self._errors['council%d' % (len(council)-index)] = self.error_class(['Je hebt deze persoon al gekozen'])
-                    council.pop(index)
+        for candidate in candidates:
+            if candidate is not None and candidates.count(candidate) > 1:
+                for same in range(candidates.count(candidate) - 1):
+                    index = candidates.index(candidate)
+                    self._errors['candidate%d' % (len(candidates)-index)] = self.error_class([_('Je hebt deze persoon al gekozen')])
+                    candidates.pop(index)
         
         # Always return the full collection of cleaned data.
         return cleaned_data
@@ -109,24 +95,12 @@
     def save(self, *args, **kwargs):
         cleaned_data = self.cleaned_data
         
-        votes = [cleaned_data.get('council1'),
-                 cleaned_data.get('council2'),]
-                 #cleaned_data.get('council3'),
-                 #cleaned_data.get('council4'),
-                 #cleaned_data.get('council5'),
-                 #cleaned_data.get('council6')]
+        votes = [cleaned_data.get('candidate%d' % i) for i in range(self.election.candidature_amount)]
         
         for c in range(len(votes)):
             candidate = votes[c]
-            candidate.council_votes += len(votes) - c
+            candidate.votes += len(votes) - c
             candidate.save()
             
-        #chair = cleaned_data.get('chair')
-        #if chair in votes: # If the chair is in the votes, the new version is not stored in cleaned_data, so use the database version
-        #    chair = Candidate.objects.get(pk=cleaned_data.get('chair').pk)
-        #    
-        #chair.chair_votes += 1
-        #chair.save()
-        
         return True
         

=== added file 'ubuntu_voting/elections/migrations/0012_auto__add_field_election_candidature_amount__del_field_candidate_chair.py'
--- ubuntu_voting/elections/migrations/0012_auto__add_field_election_candidature_amount__del_field_candidate_chair.py	1970-01-01 00:00:00 +0000
+++ ubuntu_voting/elections/migrations/0012_auto__add_field_election_candidature_amount__del_field_candidate_chair.py	2011-11-20 11:21:23 +0000
@@ -0,0 +1,125 @@
+# 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 field 'Election.candidature_amount'
+        db.add_column('elections_election', 'candidature_amount', self.gf('django.db.models.fields.IntegerField')(default=1), keep_default=False)
+
+        # Deleting field 'Candidate.chair_votes'
+        db.delete_column('elections_candidate', 'chair_votes')
+
+        # Deleting field 'Candidate.council_votes'
+        db.delete_column('elections_candidate', 'council_votes')
+
+        # Deleting field 'Candidate.chair_desired'
+        db.delete_column('elections_candidate', 'chair_desired')
+
+        # Deleting field 'Candidate.council_desired'
+        db.delete_column('elections_candidate', 'council_desired')
+
+        # Adding field 'Candidate.votes'
+        db.add_column('elections_candidate', 'votes', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Election.candidature_amount'
+        db.delete_column('elections_election', 'candidature_amount')
+
+        # Adding field 'Candidate.chair_votes'
+        db.add_column('elections_candidate', 'chair_votes', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False)
+
+        # Adding field 'Candidate.council_votes'
+        db.add_column('elections_candidate', 'council_votes', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False)
+
+        # Adding field 'Candidate.chair_desired'
+        db.add_column('elections_candidate', 'chair_desired', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Candidate.council_desired'
+        db.add_column('elections_candidate', 'council_desired', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Deleting field 'Candidate.votes'
+        db.delete_column('elections_candidate', 'votes')
+
+
+    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'},
+            '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']"}),
+            'votes': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'elections.election': {
+            'Meta': {'ordering': "['candidature_start', 'election_start', 'election_end', 'name']", 'object_name': 'Election'},
+            'candidature_amount': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'candidature_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 17, 23, 6, 4, 560633)'}),
+            'candidature_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 11, 19, 23, 6, 4, 560584)'}),
+            'description': ('tinymce.models.HTMLField', [], {}),
+            'election_end': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 24, 23, 6, 4, 560723)'}),
+            'election_start': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 12, 17, 23, 6, 4, 560682)'}),
+            '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-11-19 16:19:35 +0000
+++ ubuntu_voting/elections/models.py	2011-11-20 11:21:23 +0000
@@ -16,6 +16,7 @@
     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_amount = models.IntegerField(verbose_name=_('Amount of candidates'), default=1, help_text=_('The minimum amount of candidates to start 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'))
     election_start = models.DateTimeField(verbose_name=_('Start election'), default=datetime.datetime.now()+datetime.timedelta(days=28), help_text=_('On this date the election starts'))
@@ -63,20 +64,14 @@
     def is_results(self):
         return self.is_election_end() or (self.is_election_start() and self.live_results)
 
-    def get_chair_candidates(self):
-        return Candidate.objects.filter(election=self, chair_desired=True)
-        
-    def get_council_candidates(self):
-        return Candidate.objects.filter(election=self, council_desired=True)
-        
-    def total_chair_votes(self):
-        return self.get_chair_candidates().aggregate(models.Sum('chair_votes'))['chair_votes__sum']
-    
-    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]
+    def get_candidates(self):
+        return Candidate.objects.filter(election=self)
+        
+    def total_votes(self):
+        return self.get_candidates().aggregate(models.Sum('votes'))['votes__sum']
+    
+    def top(self):
+        return Candidate.objects.filter(election=self).order_by('-votes')[:10]
     
     class Meta:
         verbose_name = 'election'
@@ -94,10 +89,7 @@
     display_name = models.CharField(verbose_name=_('Name of the candidate'),  max_length=20, editable=False)
     lp_profile = models.URLField(verbose_name=_('The Launchpad profile of the candidate'), editable=False)
     motivation = HTMLField(verbose_name=_('Motivation of the candidate'), help_text=_('Give a motivation why people should vote on you'))
-    chair_desired = models.BooleanField(verbose_name=_('Run for Chair'), default=False)
-    council_desired = models.BooleanField(verbose_name=_('Run for the Community Council'), default=False)
-    chair_votes = models.IntegerField(default=0)
-    council_votes = models.IntegerField(default=0) # 6 for first choice, 1 for 6th choice
+    votes = models.IntegerField(default=0) # 6 for first choice, 1 for 6th choice
     
     class Meta:
         verbose_name = 'candidate'
@@ -111,35 +103,15 @@
     def __unicode__(self):
         return self.user.get_full_name() or self.user.username
     
-    def relative_chair_percentage(self):
-        return self.chair_votes * 100 / Candidate.objects.filter(election=self.election, 
-                                                                 chair_desired=True).order_by('-chair_votes')[0].chair_votes
-        
-    def relative_council_percentage(self):
-        return self.council_votes * 100 / Candidate.objects.filter(election=self.election, 
-                                                                   council_desired=True).order_by('-council_votes')[0].council_votes
+    def relative_percentage(self):
+        return self.votes * 100 / Candidate.objects.filter(election=self.election).order_by('-votes')[0].votes
                                                                    
-    def chair_percentage(self):
-        return self.chair_votes * 100 / self.election.total_chair_votes()
-        
-    def council_percentage(self):
-        return self.council_votes * 100 / self.election.total_council_votes()
-        
-    def is_chair(self):
-        best_chair_results = Candidate.objects.filter(election=self.election, chair_desired=True).order_by('-chair_votes')[0].chair_votes
-        difference = best_chair_results - self.chair_votes
-        if difference <= 0:
-            return 1
-        else:
-            return 0
-        
-    def is_council(self):
-        sixth_chair_results = Candidate.objects.filter(election=self.election, council_desired=True).order_by('-council_votes')[1].council_votes
-        difference = sixth_chair_results - self.council_votes
-        if difference > 0:
-            return 0
-        else:
-            return 1
+    def percentage(self):
+        return self.votes * 100 / self.election.total_votes()
+        
+    def chosen(self):
+        last_chosen_votes = self.election.candidate_set.order_by('-votes')[self.election.candidature_amount - 1].votes
+        return int(self.votes >= last_chosen_votes)
 
 class Office(models.Model):
     office = models.CharField(verbose_name=_('Title of office'), max_length=128, help_text=_('The title of an office people can run for'))

=== modified file 'ubuntu_voting/elections/views.py'
--- ubuntu_voting/elections/views.py	2011-11-19 16:19:35 +0000
+++ ubuntu_voting/elections/views.py	2011-11-20 11:21:23 +0000
@@ -97,10 +97,7 @@
     if datetime.datetime.now() > election.election_end:
         messages.error(request, _('The election has ended already'))
         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:
+    if len(Candidate.objects.filter(election=election)) < election.candidature_amount:
         messages.error(request, _('There aren\'t enough candidates running for the Community Council to let the elections begin'))
         return redirect(election_detail, slug=election.slug)
     
@@ -122,7 +119,7 @@
         return redirect(election_detail, slug=election.slug)
     
     form = VoteForm(data=request.POST or None, election=election)
-    
+    print form.fields
     if request.POST and form.is_valid():
         form.save()
         Voter.objects.create(election=election, voter=user_hash.hexdigest())
@@ -146,10 +143,6 @@
         messages.error(request, _('The results will be visible after the vote has finished, on %(date)s.') % election.election_end)
         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]
-    return direct_to_template(request, 'election/election_results.html', {#'chairs': top_chairs,
-                                                                          'council': top_council,
-                                                                          'election': election,})
+    return direct_to_template(request, 'election/election_results.html', {'election': election,})
     
     

=== modified file 'ubuntu_voting/templates/election/election_detail.html'
--- ubuntu_voting/templates/election/election_detail.html	2011-11-19 16:19:35 +0000
+++ ubuntu_voting/templates/election/election_detail.html	2011-11-20 11:21:23 +0000
@@ -3,13 +3,18 @@
 
 {% block election_content %}
     {% include election.template %}
+    
+    {% if election.is_election_start and election.live_results %}
+        {% include 'election/incl_election_item_results.html' %}
+    {% endif %}
+    
     {% 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 %}
+            {% if election.get_candidates %}
+            <ul id="candidate-list">
+                {% for candidate in election.get_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>

=== modified file 'ubuntu_voting/templates/election/election_results.html'
--- ubuntu_voting/templates/election/election_results.html	2011-11-19 16:19:35 +0000
+++ ubuntu_voting/templates/election/election_results.html	2011-11-20 11:21:23 +0000
@@ -6,15 +6,15 @@
 {% endblock %}
 
 {% block election_content %}
-    {% include election.template %}
+    {% include 'election/incl_election_item_results.html' %}
     
     {% 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 %}
+                {% if election.get_candidates %}
+                <ul id="candidate-list">
+                    {% for candidate in election.get_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>

=== modified file 'ubuntu_voting/templates/election/incl_election_item_results.html'
--- ubuntu_voting/templates/election/incl_election_item_results.html	2011-11-19 16:19:35 +0000
+++ ubuntu_voting/templates/election/incl_election_item_results.html	2011-11-20 11:21:23 +0000
@@ -7,12 +7,20 @@
 {% 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 %} 
+            <h2>
+                <a href="{% url election-detail slug=election.slug %}">
+                    {% if election.is_election_end %}
+                        {% blocktrans with election.name as election_name %}Results: {{ election_name }}{% endblocktrans %}
+                    {% else %}
+                        {% blocktrans with election.name as election_name %}Interim results: {{ election_name }}{% endblocktrans %}
+                    {% endif %}
+                <a>
+            </h2>
+            <div id="results">
+            {% for candidate in election.top %} 
                 <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>
+                    <hr class="graph-bar graph-bar-{{ candidate.chosen }}" style="width:{{ candidate.relative_percentage }}%;" />
+                    <div class="graph-label graph-label-{{ candidate.chosen }}">{{ candidate }}<span class="result"> ({{ candidate.percentage }}&#37;)</span></div>
                 </div>
             {% endfor %}
             </div>