Merge pull request #47 from emanuelschuetze/master

Some polishing work

openslides/assignment/models.py

@@ -85,7 +85,7 @@ class Assignment(models.Model, SlideMixin):
             raise NameError(_('<b>%s</b> is already a candidate.') % candidate)
         if not person.has_perm("assignment.can_manage_assignment") and self.status != 'sea':
             raise NameError(_('The candidate list is already closed.'))
-        candidation = self.assignment_candidats.filter(person=candidate)
+        candidation = self.assignment_candidates.filter(person=candidate)
         if candidation and candidate != person and \
                 not person.has_perm("assignment.can_manage_assignment"):
             # if the candidation is blocked and anotherone tries to run the
@@ -103,9 +103,8 @@ class Assignment(models.Model, SlideMixin):
         stop running for a vote
         """
         try:
-            candidation = self.assignment_candidats.get(person=candidate)
+            candidation = self.assignment_candidates.get(person=candidate)
         except AssignmentCandidate.DoesNotExist:
-            # TODO: Use an OpenSlides Error
             raise Exception(_('%s is no candidate') % candidate)
 
         if not candidation.blocked:
@@ -123,7 +122,7 @@ class Assignment(models.Model, SlideMixin):
         return True, if person is a candidate.
         """
         try:
-            return self.assignment_candidats.filter(person=person) \
+            return self.assignment_candidates.filter(person=person) \
                    .exclude(blocked=True).exists()
         except AttributeError:
             return False
@@ -132,11 +131,11 @@ class Assignment(models.Model, SlideMixin):
         """
         return True, if the person is blockt for candidation.
         """
-        return self.assignment_candidats.filter(person=person) \
+        return self.assignment_candidates.filter(person=person) \
                    .filter(blocked=True).exists()
 
     @property
-    def assignment_candidats(self):
+    def assignment_candidates(self):
         return AssignmentCandidate.objects.filter(assignment=self)
 
     @property
@@ -148,7 +147,7 @@ class Assignment(models.Model, SlideMixin):
         return self.get_participants(only_elected=True)
 
     def get_participants(self, only_elected=False, only_candidate=False):
-        candidates = self.assignment_candidats.exclude(blocked=True)
+        candidates = self.assignment_candidates.exclude(blocked=True)
 
         assert not (only_elected and only_candidate)
 
@@ -166,7 +165,7 @@ class Assignment(models.Model, SlideMixin):
 
 
     def set_elected(self, person, value=True):
-        candidate = self.assignment_candidats.get(person=person)
+        candidate = self.assignment_candidates.get(person=person)
         candidate.elected = value
         candidate.save()
 

openslides/assignment/templates/assignment/view.html

@@ -111,7 +111,7 @@
     </ul>
 {% endif %}
 
-{% if assignment.status != "sea" %}
+{% if assignment.status != "sea" or polls.exists %}
     <h3>{% trans "Election results" %}</h3>
 
     {% if polls.exists %}

openslides/assignment/views.py

@@ -101,7 +101,7 @@ def view(request, assignment_id=None):
         vote_results = assignment.vote_results(only_published=False)
 
     blocked_candidates = [candidate.person for candidate in \
-        assignment.assignment_candidats.filter(blocked=True)]
+        assignment.assignment_candidates.filter(blocked=True)]
     return {
         'assignment': assignment,
         'blocked_candidates': blocked_candidates,
@@ -170,6 +170,8 @@ def set_status(request, assignment_id=None, status=None):
             messages.success(request, _('Election status was set to: <b>%s</b>.') % assignment.get_status_display())
     except Assignment.DoesNotExist:
         pass
+    except NameError, e:
+        messages.error(request, e)
     return redirect(reverse('assignment_view', args=[assignment_id]))
 
 

openslides/participant/templates/projector/UserSlide.html

@@ -6,38 +6,16 @@
 {% block title %}{{ block.super }} - {{ title }}{% endblock %}
 
 {% block content %}
-
-    <div id='sidebar'>
-    <div class='box'>
-        <p><strong>{% trans "Groups" %}</strong><br />
+    <div class="item_fullscreen">{{ shown_user }}
+        <span>
+        {% if shown_user.committee %}
+            <p>{{ shown_user.committee }}</p>
+        {% endif %}
+        <p>
             {% if shown_user.groups.all %}
                 {{ shown_user.groups.all|join:", " }}
-            {% else %}
-                {% trans "The participant is not member of any group." %}
             {% endif %}
         </p>
-        {% if shown_user.get_gender_display %}
-            <p><strong>{% trans "Gender" %}</strong><br />{{ shown_user.get_gender_display }}</p>
-        {% endif %}
-
-        {% if shown_user.get_type_display %}
-            <p><strong>{% trans "Type" %}</strong><br />{{ shown_user.get_type_display }}</p>
-        {% endif %}
-
-        {% if shown_user.committee %}
-            <p><strong>{% trans "Committee" %}</strong><br />{{ shown_user.committee }}</p>
-        {% endif %}
+        </span>
     </div>
-    </div>
-
-    <h1>{{ shown_user }}</h1>
-    <p>{{ shown_user.email }}</p>
-
-{% endblock %}
-
-{% block scrollcontent %}
-    <p>
-        <div class="text">{{ shown_user.about_me|linebreaks }}</div>
-    </p>
-
 {% endblock %}

openslides/projector/static/styles/projector.css

@@ -155,6 +155,10 @@ body{
     font-weight:bold;
     text-align: center;
 }
+.item_fullscreen span
+{
+    font-size: 50%; font-weight:normal;
+}
 
 /* items in a list*/
 .itemlist li