diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html index 6e852d1..657f423 100644 --- a/froide_govplan/templates/froide_govplan/base.html +++ b/froide_govplan/templates/froide_govplan/base.html @@ -188,17 +188,11 @@
{% if request.path == '/' %} -

Licht ins Dunkel

Mit unserem Verwaltungstracker können Sie die Arbeit der Stadtverwaltung live verfolgen: Welche Vorhaben werden umgesetzt? Wo wird gebremst? Wie sieht der Stand in einzelnen Themenbereichen aus?

- -
- Download examples -
- {% endif %} {% static_alias "govplan_header" %} @@ -280,8 +274,59 @@
+ + + + + + diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html index 7f87902..75d4478 100644 --- a/froide_govplan/templates/froide_govplan/detail.html +++ b/froide_govplan/templates/froide_govplan/detail.html @@ -14,178 +14,161 @@ {% include "snippets/meta.html" %} {% endblock meta %} {% block app_body %} -
-
-
-
- {% if not government.active %} -
Dieses Vorhaben gehörte zur {{ government.name }} und wird nicht mehr aktualisiert.
+ +

{{ object.title }}

+

+

+
    +
  • + {{ object.get_status_display }} +
    • + {% for cat in object.categories.all %} +
  • + {{ cat.name }} +
    • + {% endfor %} +
+
+
+ {% if object.quote %} +
Ausschnitt aus dem Koalitionsvertrag
+
+
+ {{ object.quote | addquotes | markdown }} +
+ {% with refs=object.get_reference_links %} + {% if refs %} +

+ + {% if refs|length > 1 %} + Quellen: + {% else %} + Quelle: + {% endif %} + + {% for ref in refs %} + {{ forloop.counter }} + {% endfor %} +

+ {% endif %} + {% endwith %} + {% endif %} +
+ {% if object.description %} +
+
Unsere Einschätzung
+
+ {{ object.description | safe }} +
+
+ {% endif %} +
+
+
+
+ {% if object.rating %} +
Bewertung
+
+ {{ object.get_rating_display }} +
{% endif %} -

{{ object.title }}

-
-
    -
  • - {{ object.get_status_display }} -
    • - {% for cat in object.categories.all %} -
  • - {{ cat.name }} -
    • - {% endfor %} -
- FIXME FOLLOW LIST -
-
-
-
- {% if object.quote %} -
Ausschnitt aus dem Koalitionsvertrag
-
-
- {{ object.quote | addquotes | markdown }} -
- {% with refs=object.get_reference_links %} - {% if refs %} -

- - {% if refs|length > 1 %} - Quellen: - {% else %} - Quelle: - {% endif %} - - {% for ref in refs %} - {{ forloop.counter }} - {% endfor %} -

- {% endif %} - {% endwith %} - {% endif %} + {% if object.measure %} +
Art der Umsetzung
+
+ {{ object.measure }} +
+ {% endif %} + {% if object.due_date %} +
Frist
+
+ {{ object.due_date|date:"SHORT_DATE_FORMAT" }} +
+ {% endif %} + {% if object.responsible_publicbody %} +
Federführung
+
+ {{ object.responsible_publicbody.name }} +
+ {% endif %} + {% if object.responsible_publicbody %} + {% if not object.has_recent_foirequest and government.active %} +

+ Anfrage zum Vorhaben stellen +

+ {% elif object.has_recent_foirequest %} + {% with foirequest=object.get_recent_foirequest %} +
Anfrage
+
+ {% include "foirequest/snippets/request_item_mini.html" with object=foirequest %}
- {% if object.description %} -
-
Unsere Einschätzung
-
- {{ object.description | safe }} -
-
- {% endif %} -
-
-
-
- {% if object.rating %} -
Bewertung
-
- {{ object.get_rating_display }} -
- {% endif %} - {% if object.measure %} -
Art der Umsetzung
-
- {{ object.measure }} -
- {% endif %} - {% if object.due_date %} -
Frist
-
- {{ object.due_date|date:"SHORT_DATE_FORMAT" }} -
- {% endif %} - {% if object.responsible_publicbody %} -
Federführung
-
- {{ object.responsible_publicbody.name }} -
- {% endif %} - {% if object.responsible_publicbody %} - {% if not object.has_recent_foirequest and government.active %} -

- Anfrage zum Vorhaben stellen -

- {% elif object.has_recent_foirequest %} - {% with foirequest=object.get_recent_foirequest %} -
Anfrage
-
- {% include "foirequest/snippets/request_item_mini.html" with object=foirequest %} -
- {% endwith %} + {% endwith %} + {% endif %} + {% endif %} + {% if object.organization %} +
Beobachtet von
+
+ + {% if object.organization.logo %} + {% if object.organization.logo.url.lower|slice:"-4:" == ".svg" %} + {# djlint:off H006 #} + {{ object.organization.name }} + {% else %} + {{ object.organization.name }} {% endif %} + {% else %} + {{ object.organization.name }} {% endif %} - {% if object.organization %} -
Beobachtet von
-
- - {% if object.organization.logo %} - {% if object.organization.logo.url.lower|slice:"-4:" == ".svg" %} - {# djlint:off H006 #} - {{ object.organization.name }} - {% else %} - {{ object.organization.name }} - {% endif %} - {% else %} - {{ object.organization.name }} - {% endif %} - -
- {% endif %} -
+ + + {% endif %} +
+
+
+

+ +
+ {% include "froide_govplan/plugins/updates.html" with wrapper_classes="col col-12 col-lg-6 d-flex mb-4" %} + {% if government.active %} +
+
+

Neue Entwicklung melden

+

+ Gibt es Neuigkeiten zu diesem Vorhaben, die wir noch nicht erfasst haben? +

+ +
-
- {% include "froide_govplan/plugins/updates.html" with wrapper_classes="col col-12 col-lg-6 d-flex mb-4" %} - {% if government.active %} -
-
-
-
-

Neue Entwicklung melden

-
-
- {% if request.user.is_authenticated %} -

Gibt es Neuigkeiten zu diesem Vorhaben, die wir noch nicht erfasst haben?

- - - {% else %} - Bitte melden Sie sich an, um einen Änderungsvorschlag einzureichen. - {% endif %} -
-
-
-
- {% endif %} -
+ {% endif %}
+ {% endblock app_body %} diff --git a/froide_govplan/templates/froide_govplan/plugins/card_cols.html b/froide_govplan/templates/froide_govplan/plugins/card_cols.html index 8e1f5bd..f430808 100644 --- a/froide_govplan/templates/froide_govplan/plugins/card_cols.html +++ b/froide_govplan/templates/froide_govplan/plugins/card_cols.html @@ -21,21 +21,21 @@
{{ object.quote|striptags|truncatewords:20|addquotes }}
- {% endif %} + {% endif %} + + + → mehr lesen + +

- - - → mehr lesen - - +

Last updated 3 mins ago

{{ object.get_status_display }}
-

Last updated 3 mins ago

diff --git a/froide_govplan/templates/froide_govplan/plugins/sections.html b/froide_govplan/templates/froide_govplan/plugins/sections.html index 4896647..8a1fa7b 100644 --- a/froide_govplan/templates/froide_govplan/plugins/sections.html +++ b/froide_govplan/templates/froide_govplan/plugins/sections.html @@ -11,28 +11,42 @@ {% endfor %} -
- {% for section in sections %} -
- -
-
-
-

{{ section.title }}

- {% if section.icon %} -
-
- -
+
+ +
+ + {% for section in sections %} +
+ +
+ + Placeholder + + {{ section.title }} + + + {% if section.icon %} +
+
+
- {% endif %}
-
- {% get_section_progress section %} + {% endif %} +
+

+ {% get_section_progress section %} +

+
+
+ + +
+ 9 mins +
+
- + {% endfor %}
- {% endfor %}