From 7fde53a09e1ba9c7ba01f61f39fbddae1c685a65 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 5 Sep 2012 00:20:28 +0200 Subject: [PATCH 01/88] Updated template with twitter bootstrap. Step 1: agenda and application. --- openslides/agenda/static/styles/agenda.css | 4 - openslides/agenda/templates/agenda/edit.html | 50 +- .../agenda/templates/agenda/item_row.html | 2 +- .../agenda/templates/agenda/overview.html | 42 +- openslides/agenda/templates/agenda/view.html | 2 +- openslides/agenda/views.py | 1 + .../application/base_application.html | 66 - .../templates/application/edit.html | 41 +- .../templates/application/import.html | 37 +- .../templates/application/overview.html | 31 +- .../templates/application/poll_view.html | 77 +- .../templates/application/view.html | 587 +- openslides/application/views.py | 1 + .../templates/assignment/overview.html | 2 +- openslides/assignment/views.py | 1 + openslides/config/views.py | 1 + openslides/locale/de/LC_MESSAGES/django.mo | Bin 35724 -> 32910 bytes openslides/locale/de/LC_MESSAGES/django.po | 932 ++- .../templates/participant/login.html | 15 +- .../templates/participant/overview.html | 2 +- openslides/participant/views.py | 1 + openslides/projector/views.py | 1 + openslides/static/img/favicon.png | Bin 0 -> 1060 bytes .../static/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../static/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes openslides/static/img/logo.png | Bin 0 -> 7273 bytes openslides/static/javascript/bootstrap.min.js | 6 + openslides/static/javascript/utils.js | 112 + openslides/static/styles/base.css | 727 +-- .../static/styles/bootstrap-responsive.css | 1040 +++ openslides/static/styles/bootstrap.css | 5624 +++++++++++++++++ openslides/static/styles/tabledrag.css | 2 - openslides/templates/base.html | 178 +- openslides/utils/template.py | 3 +- openslides/utils/utils.py | 4 +- openslides/utils/views.py | 2 +- 36 files changed, 7987 insertions(+), 1607 deletions(-) delete mode 100644 openslides/application/templates/application/base_application.html create mode 100644 openslides/static/img/favicon.png create mode 100644 openslides/static/img/glyphicons-halflings-white.png create mode 100644 openslides/static/img/glyphicons-halflings.png create mode 100644 openslides/static/img/logo.png create mode 100644 openslides/static/javascript/bootstrap.min.js create mode 100644 openslides/static/styles/bootstrap-responsive.css create mode 100644 openslides/static/styles/bootstrap.css 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 %} -