diff --git a/openslides/account/templates/account/personal_info_widget.html b/openslides/account/templates/account/personal_info_widget.html
index 8d7f3f0d2..33907f019 100644
--- a/openslides/account/templates/account/personal_info_widget.html
+++ b/openslides/account/templates/account/personal_info_widget.html
@@ -15,13 +15,14 @@
{% trans 'I submitted the following motions:' %}
{% for motion in submitted_motions %}
{% else %}
{% trans 'The list of speakers is empty.' %}
{% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 793a31be7..0ac81d5ef 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -96,7 +96,9 @@
{% else %}
{% trans 'The list of speakers is empty.' %}
{% endif %}
+
{% endblock %}
diff --git a/openslides/agenda/urls.py b/openslides/agenda/urls.py
index 2d7ad1e9f..d1cf912dd 100644
--- a/openslides/agenda/urls.py
+++ b/openslides/agenda/urls.py
@@ -60,7 +60,7 @@ urlpatterns = patterns(
name='print_agenda',
),
- # Speaker List
+ # List of speakers
url(r'^(?P\d+)/speaker/$',
SpeakerAppendView.as_view(),
name='agenda_speaker_append',
@@ -101,8 +101,14 @@ urlpatterns = patterns(
name='agenda_speaker_change_order',
),
+ url(r'^list_of_speakers/add/$',
+ CurrentListOfSpeakersView.as_view(set_speaker=True),
+ name='agenda_add_to_current_list_of_speakers',
+ ),
+
url(r'^list_of_speakers/$',
CurrentListOfSpeakersView.as_view(),
name='agenda_current_list_of_speakers',
),
+
)
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index b050aacb5..bf61c0876 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -18,6 +18,7 @@ from django.core.urlresolvers import reverse
from django.contrib import messages
from django.db import transaction
from django.db.models import Model
+from django.template import RequestContext
from django.utils.translation import ugettext as _, ugettext_lazy
from django.views.generic.detail import SingleObjectMixin
@@ -81,7 +82,8 @@ class Overview(TemplateView):
'active_sid': get_active_slide(only_sid=True),
'duration': duration,
'start': start,
- 'end': end})
+ 'end': end,
+ 'show_list': config['presentation_argument'] == 'show_list_of_speakers'})
return context
@transaction.commit_manually
@@ -436,6 +438,8 @@ class CurrentListOfSpeakersView(RedirectView):
"""
Redirect to the current list of speakers and set the request.user on it.
"""
+ set_speaker = False
+
def get_item(self):
"""
Returns the current Item, or None, if the current Slide is not an Agenda Item.
@@ -467,19 +471,18 @@ class CurrentListOfSpeakersView(RedirectView):
'Please choose the agenda item manually from the agenda.'))
return reverse('dashboard')
- if item.speaker_list_closed:
- messages.error(request, _('The list of speakers is closed.'))
- return reverse('dashboard')
+ if self.set_speaker:
+ if item.speaker_list_closed:
+ messages.error(request, _('The list of speakers is closed.'))
+ return reverse('dashboard')
- if self.request.user.has_perm('agenda.can_be_speaker'):
- try:
- Speaker.objects.add(self.request.user, item)
- except OpenSlidesError:
- messages.error(request, _('You are already on the list of speakers.'))
+ if self.request.user.has_perm('agenda.can_be_speaker'):
+ try:
+ Speaker.objects.add(self.request.user, item)
+ except OpenSlidesError:
+ messages.error(request, _('You are already on the list of speakers.'))
else:
- messages.success(request, _('You are now on the list of speakers.'))
- else:
- messages.error(request, _('You can not put yourself on the list of speakers.'))
+ messages.error(request, _('You can not put yourself on the list of speakers.'))
if not self.request.user.has_perm('agenda.can_see_agenda'):
return reverse('dashboard')
@@ -519,7 +522,7 @@ def get_widgets(request):
Widget(
name='append_to_list_of_speakers',
- display_name=_('To the current list of speakers'),
+ display_name=_('List of speakers'),
template='agenda/speaker_widget.html',
- context={},
+ context=RequestContext(request, {}),
permission_required='agenda.can_be_speaker')]
diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 83d2975bd..8287f2b2b 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -217,7 +217,7 @@ msgid ""
"There is no list of speakers for the current slide. Please choose the agenda "
"item manually from the agenda."
msgstr ""
-"Es existiert keine Rednerliste für die aktuelle Folie. Bitte wähle den "
+"Es existiert keine Rednerliste für die aktuelle Folie. Bitte wählen Sie den "
"Tagesordnungseintrag manuell von der Tagesordnung."
#: agenda/views.py:451
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 17d2bff82..4488741f1 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -145,9 +145,11 @@
{% if perms.motion.can_manage_motion %}
+
+
{% for message in motion.log_messages.all %}
@@ -188,10 +190,6 @@
{{ motion.state }}
{% endif %}
- {% for note in motion.notes %}
- {{ note }}
- {% if not forloop.last %} {% endif %}
- {% endfor %}
{% trans "Vote results" %}:
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html
index cffe8b759..4b7828c06 100644
--- a/openslides/motion/templates/motion/motion_list.html
+++ b/openslides/motion/templates/motion/motion_list.html
@@ -22,6 +22,8 @@
+{% comment %}
+ TODO: remove this filter and add client side filtering with DataTables