diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 4827f9efb..4fb13a570 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -24,21 +24,6 @@ class UserCreateForm(forms.ModelForm, CssClassMixin):
groups = forms.ModelMultipleChoiceField(
queryset=Group.objects.exclude(name__iexact='anonymous'),
label=_("User groups"), required=False)
- is_active = forms.BooleanField(label=_("Active"), required=False,
- initial=True)
-
- class Meta:
- model = User
- exclude = ('username', 'password', 'is_staff', 'is_superuser',
- 'last_login', 'date_joined', 'user_permissions')
-
-
-class UserEditForm(forms.ModelForm, CssClassMixin):
- first_name = forms.CharField(label=_("First name"))
- last_name = forms.CharField(label=_("Last name"))
- groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),
- label=_("User groups"), required=False)
- is_active = forms.BooleanField(label=_("Active"), required=False)
class Meta:
model = User
@@ -111,6 +96,7 @@ class UsersettingsForm(forms.ModelForm, CssClassMixin):
model = User
fields = ('username', 'first_name', 'last_name', 'email')
+
class UserImportForm(forms.Form, CssClassMixin):
csvfile = forms.FileField(widget=forms.FileInput(attrs={'size': '50'}),
label=_("CSV File"))
diff --git a/openslides/projector/models.py b/openslides/projector/models.py
index 0d108d282..e6e51716a 100644
--- a/openslides/projector/models.py
+++ b/openslides/projector/models.py
@@ -50,7 +50,8 @@ class ProjectorSlide(models.Model, SlideMixin):
class Meta:
permissions = (
('can_manage_projector', ugettext_noop("Can manage the projector")),
- ('can_see_projector', ugettext_noop("Can see projector")),
+ ('can_see_projector', ugettext_noop("Can see the projector")),
+ ('can_see_dashboard', ugettext_noop("Can see the dashboard")),
)
diff --git a/openslides/projector/projector.py b/openslides/projector/projector.py
index 4d2e2d326..140592698 100644
--- a/openslides/projector/projector.py
+++ b/openslides/projector/projector.py
@@ -105,12 +105,14 @@ class Widget(object):
"""
Class for a Widget for the Projector-Tab.
"""
- def __init__(self, name, html=None, template=None, context={}):
+ def __init__(self, name, html=None, template=None, context={},
+ permission_required=None):
self.name = name
if html is not None:
self.html = html
elif template is not None:
self.html = render_to_string(template, context)
+ self.permission_required = permission_required
def get_name(self):
return self.name.lower()
diff --git a/openslides/projector/templates/projector/base_projector.html b/openslides/projector/templates/projector/base_projector.html
index be2a1e811..4d4e545df 100644
--- a/openslides/projector/templates/projector/base_projector.html
+++ b/openslides/projector/templates/projector/base_projector.html
@@ -7,18 +7,18 @@
{% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %}
{% block submenu %}
- {% url projector_control as url_projectoroverview %}
+ {% url dashboard as url_dashboard %}
{% trans "Projector" %}
{% endblock %}
diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/dashboard.html
similarity index 99%
rename from openslides/projector/templates/projector/control.html
rename to openslides/projector/templates/projector/dashboard.html
index de71aa244..2057e010a 100644
--- a/openslides/projector/templates/projector/control.html
+++ b/openslides/projector/templates/projector/dashboard.html
@@ -14,7 +14,7 @@
{% endblock %}
{% block content %}
- {% trans 'Projector' %}
+ {% trans 'Dashboard' %}
{% trans "Adjust projector view" %}:
diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html
index 0f77d64b9..c63e5e0ac 100644
--- a/openslides/projector/templates/projector/new.html
+++ b/openslides/projector/templates/projector/new.html
@@ -15,8 +15,8 @@
-
-