diff --git a/flake.nix b/flake.nix index 50299c0..0f1e9bb 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ start = pkgs.writeShellScriptBin "start" '' set -e + export NIXPKGS_ALLOW_INSECURE=1 export QEMU_NET_OPTS="hostfwd=tcp::8080-:80" ${pkgs.nixos-shell}/bin/nixos-shell --flake . ''; diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html index 2920f7e..6e852d1 100644 --- a/froide_govplan/templates/froide_govplan/base.html +++ b/froide_govplan/templates/froide_govplan/base.html @@ -186,13 +186,21 @@
-

Get started with Bootstrap

-

Quickly and easily get started with Bootstrap's compiled, production-ready files with this barebones example featuring some basic HTML and helpful links. Download all our examples to get started.

+ {% 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 + Download examples
+ {% endif %} + {% static_alias "govplan_header" %} {% block app_body %} {% placeholder "content" %} @@ -273,7 +281,7 @@
diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html index e563388..7f87902 100644 --- a/froide_govplan/templates/froide_govplan/detail.html +++ b/froide_govplan/templates/froide_govplan/detail.html @@ -5,7 +5,6 @@ {% load cms_tags %} {% load follow_tags %} {% load govplan %} -{% load form_helper %} {% load content_helper %} {% load thumbnail %} {% block title %} @@ -35,9 +34,7 @@ {% endfor %} - {% if government.active %} -
{% show_follow "govplan" object %}
- {% endif %} + FIXME FOLLOW LIST
@@ -176,12 +173,7 @@ aria-label="{% translate "Close" %}">
diff --git a/froide_govplan/templates/froide_govplan/plugins/card_cols.html b/froide_govplan/templates/froide_govplan/plugins/card_cols.html index 115abfa..8e1f5bd 100644 --- a/froide_govplan/templates/froide_govplan/plugins/card_cols.html +++ b/froide_govplan/templates/froide_govplan/plugins/card_cols.html @@ -9,34 +9,37 @@ {% else %}
{% for object in object_list %} -
- -
-
-

- {{ object.title }} -

-
-
+ +
+
+
+ +
{{ object.title }}
+
+

{% if object.quote %}

{{ object.quote|striptags|truncatewords:20|addquotes }}
- {% endif %} -
- - → mehr lesen + {% endif %} +

+
+ + + → mehr lesen + + +
+ + {{ object.get_status_display }} -
- - {{ object.get_status_display }} - -
-
+
+

Last updated 3 mins ago

-
+
+ {% endfor %}
{% endif %} diff --git a/froide_govplan/templates/froide_govplan/section.html b/froide_govplan/templates/froide_govplan/section.html index ed6fe3b..3596a71 100644 --- a/froide_govplan/templates/froide_govplan/section.html +++ b/froide_govplan/templates/froide_govplan/section.html @@ -11,39 +11,37 @@ {% include "snippets/meta.html" %} {% endblock meta %} {% block app_body %} -
-
-
-
-
-
- {% if not government.active %} -
- Dieser Themenbereich gehörte zur {{ government.name }} und wird nicht mehr aktualisiert. -
- {% endif %} -

{{ object.title }}

-

- {% blocktranslate with section=object.title %} - Here you can find all plans of the section “{{ section }}”, which the coalition constituted in their agreement. On the curresponding detail pages, you'll get more information, stay up to date with news or submit changes. - {% endblocktranslate %} -

-
-
-
- {% include "froide_govplan/plugins/progress_row.html" with object_list=plans %} -

-  nicht begonnen -  begonnen -  teilweise umgesetzt -  umgesetzt -  verschoben -

- {% include "froide_govplan/plugins/time_used.html" with instance=object %} -
+ + {% if not government.active %} +
+ Dieser Themenbereich gehörte zur {{ government.name }} und wird nicht mehr aktualisiert. +
+ {% endif %} + +

{{ object.title }}

+

+ {% blocktranslate with section=object.title %} + Here you can find all plans of the section “{{ section }}”, which the coalition constituted in their agreement. On the curresponding detail pages, you'll get more information, stay up to date with news or submit changes. + {% endblocktranslate %} +

+ +
+
+
+
+ {% include "froide_govplan/plugins/progress_row.html" with object_list=plans %} +

+  nicht begonnen +  begonnen +  teilweise umgesetzt +  umgesetzt +  verschoben +

+ {% include "froide_govplan/plugins/time_used.html" with instance=object %}
- {% include "froide_govplan/plugins/card_cols.html" with object_list=plans %}
+ {% include "froide_govplan/plugins/card_cols.html" with object_list=plans %} + {% endblock app_body %}