Merge lp:~ronnie.vd.c/ubuntu-elections/2-council into lp:ubuntu-elections

[Ronnie]

Limited to 2 council members for ubuntu-nl intermediate elections. Also disables chair.

[lp:~ronnie.vd.c/ubuntu-elections/2-council]

29. By Sense Egbert Hofstede on 2011-09-21

Merging Ronnies changes, updating translation template.

=== modified file 'INSTALL'
--- INSTALL	2011-04-02 15:41:46 +0000
+++ INSTALL	2011-09-21 17:35:26 +0000
@@ -10,7 +10,7 @@
 
 Generally:
  - sudo apt-get install python-django python-django-openid-auth python-django-south python-django-tinymce python-launchpadlib
- - cd voting
+ - cd ubuntu_voting
 
 Manual:
  - cp local_settings.py.sample local_settings.py

=== modified file 'ubuntu_voting/elections/forms.py'
--- ubuntu_voting/elections/forms.py	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/elections/forms.py	2011-09-21 17:35:26 +0000
@@ -47,39 +47,43 @@
 class ApplyForElectionForm(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Candidate
-        fields = ('chair_desired', 'council_desired', 'motivation')
+        fields = ('council_desired', 'motivation')#'chair_desired', 
+        
+    def __init__(self, *args, **kwargs):
+        super(ApplyForElectionForm, self).__init__(*args, **kwargs)
+        self.initial['council_desired'] = True
         
 
 class VoteForm(forms.Form, RenderableMixin):
-    chair = forms.ModelChoiceField(label='Voorzitter', queryset=Candidate.objects.all())
+    #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())
+    #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)
+        #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['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.fields['council3'].queryset = council_choices
+        #self.fields['council4'].queryset = council_choices
+        #self.fields['council5'].queryset = council_choices
+        #self.fields['council6'].queryset = council_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')]
+                   cleaned_data.get('council2'),]
+                   #cleaned_data.get('council3'),
+                   #cleaned_data.get('council4'),
+                   #cleaned_data.get('council5'),
+                   #cleaned_data.get('council6')]
         council.reverse()
         
         for candidate in council:
@@ -97,23 +101,23 @@
         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')]
+                 cleaned_data.get('council2'),]
+                 #cleaned_data.get('council3'),
+                 #cleaned_data.get('council4'),
+                 #cleaned_data.get('council5'),
+                 #cleaned_data.get('council6')]
         
         for c in range(len(votes)):
             candidate = votes[c]
             candidate.council_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()
+        #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
         

=== modified file 'ubuntu_voting/elections/management/commands/bootstrap.py'
--- ubuntu_voting/elections/management/commands/bootstrap.py	2011-02-14 17:43:22 +0000
+++ ubuntu_voting/elections/management/commands/bootstrap.py	2011-09-21 17:35:26 +0000
@@ -13,7 +13,7 @@
         print '\nEdit local_settings.py, then press Return to continue'
         raw_input('\n')
         print 'getting ubuntu website theme'
-        subprocess.call(['bzr', 'branch', 'lp:ubuntu-website/light-django-theme', 'ubuntu_light_theme'])
+        subprocess.call(['bzr', 'branch', 'lp:ubuntu-community-webthemes/light-django-theme', 'ubuntu_light_theme'])
         print 'setting up database'
         subprocess.call(['./manage.py', 'syncdb', '--noinput'])
         print 'doing migrations'

=== modified file 'ubuntu_voting/elections/models.py'
--- ubuntu_voting/elections/models.py	2011-04-02 17:11:31 +0000
+++ ubuntu_voting/elections/models.py	2011-09-21 17:35:26 +0000
@@ -119,7 +119,7 @@
             return 0
         
     def is_council(self):
-        sixth_chair_results = Candidate.objects.filter(election=self.election, council_desired=True).order_by('-council_votes')[5].council_votes
+        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

=== modified file 'ubuntu_voting/elections/views.py'
--- ubuntu_voting/elections/views.py	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/elections/views.py	2011-09-21 17:35:26 +0000
@@ -94,13 +94,13 @@
     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)
-    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)) < 6:
+    #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)
-
+    
     # Do some extensive hashing of the voter's OpenID to prevent easy decryption
     openid = UserOpenID.objects.get(user=request.user)    
     user_hash = hashlib.sha256(openid.claimed_id)
@@ -122,7 +122,7 @@
     
     if request.POST and form.is_valid():
         form.save()
-        Voter.objects.create(election=election, voter=user_hash)
+        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)
         
@@ -143,9 +143,9 @@
         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)
     
-    top_chairs = Candidate.objects.filter(election=election, chair_desired=True).order_by('-chair_votes')[:5]
+    #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,
+    return direct_to_template(request, 'election/election_results.html', {#'chairs': top_chairs,
                                                                           'council': top_council,
                                                                           'election': election,})
     

=== modified file 'ubuntu_voting/settings.py'
--- ubuntu_voting/settings.py	2011-04-02 17:11:31 +0000
+++ ubuntu_voting/settings.py	2011-09-21 17:35:26 +0000
@@ -89,7 +89,8 @@
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.auth',
+    #'django.core.context_processors.auth',
+    'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',

=== modified file 'ubuntu_voting/templates/election/election_detail.html'
--- ubuntu_voting/templates/election/election_detail.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_detail.html	2011-09-21 17:35:26 +0000
@@ -28,6 +28,7 @@
         {% endif %}
     </div>
     {% if election.is_candidature_start %}
+    {% comment %}
     <div class="minor-content alone">
         <h3>Voorzitterskandidaten</h3>
         {% if election.get_chair_candidates %}
@@ -40,6 +41,7 @@
         <strong>{% trans 'There are no candidates yet' %}</strong>
         {% endif %}
     </div>
+    {% endcomment %}
     <div class="minor-content alone">
         <h3>Gemeenschapsraadskandidaten</h3>
         {% if election.get_council_candidates %}

=== modified file 'ubuntu_voting/templates/election/election_list.html'
--- ubuntu_voting/templates/election/election_list.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_list.html	2011-09-21 17:35:26 +0000
@@ -40,6 +40,7 @@
             {% endif %}
             
             {% if election.is_candidature_start %}
+            {% comment %}
             <div class="sub-content">
                 <p>
                     Voorzitterskandidaten:
@@ -52,9 +53,10 @@
                     {% endif %}
                 </p>
             </div>
+            {% endcomment %}
             <div class="sub-content">
                 <p>
-                    Gemeenschapsraadskandidaten:
+                    {% 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/>

=== modified file 'ubuntu_voting/templates/election/election_results.html'
--- ubuntu_voting/templates/election/election_results.html	2011-04-02 15:41:46 +0000
+++ ubuntu_voting/templates/election/election_results.html	2011-09-21 17:35:26 +0000
@@ -6,6 +6,7 @@
 {% endblock %}
 
 {% block content %}
+    {% comment %}
     <section class="minor-content alone">
         <h3>{% trans 'Results Chair' %}</h3>
         <div id="council-results">
@@ -17,6 +18,7 @@
         {% endfor %}
         </div>
     </section>
+    {% endcomment %}
     <section class="minor-content alone">
         <h3>{% trans 'Results Community Council' %}</h3>
         <div id="council-results">