diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css index 611d19646..2f9c3d6ab 100644 --- a/openslides/agenda/static/styles/agenda.css +++ b/openslides/agenda/static/styles/agenda.css @@ -18,7 +18,3 @@ .close_link.closed span { background-image: url(../images/icons/close.png); } - -table#menu-overview { - white-space: nowrap; -} diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html index c91176fe4..39b319c96 100644 --- a/openslides/agenda/templates/agenda/edit.html +++ b/openslides/agenda/templates/agenda/edit.html @@ -1,4 +1,4 @@ -{% extends "agenda/base_agenda.html" %} +{% extends "base.html" %} {% load i18n %} @@ -12,26 +12,42 @@ {% endblock %} {% block content %} +

{% if item %} -

{% trans "Edit item" %}

+ {% trans "Edit item" %} {% else %} -

{% trans "New item" %}

+ {% trans "New item" %} {% endif %} + + {% trans "Back to overview" %} + +
{% csrf_token %} - {{ form.as_p }} -

- - - - - -

+ {% for field in form %} +
+ + {{ field }} + {% if field.errors %} + {{ field.errors }} + {% endif %} + {% if field.help_text %} + {{ field.help_text }}) + {% endif %} +
+ {% endfor %} +
+ + + + + +
* {% trans "required" %}
{% endblock %} diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index a198f6bae..4846b62e5 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -49,7 +49,7 @@ {% endif %} {% if perms.agenda.can_manage_agenda %} - + {% with form=item.weight_form %} {{ form.weight }} {{ form.self }} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index f847d9704..f529f693b 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -1,4 +1,4 @@ -{% extends "agenda/base_agenda.html" %} +{% extends "base.html" %} {% load tags %} {% load i18n %} @@ -10,6 +10,9 @@ {% block header %} +{% endblock %} + +{% block javascript %} {% if perms.agenda.can_manage_agenda %} @@ -37,29 +40,38 @@ {% endif %} {% endblock %} - {% block content %}
{% csrf_token %} {% if perms.agenda.can_manage_agenda %} -