This commit is contained in:
Jonas Heinrich 2025-04-04 08:16:42 +02:00
parent af673c6fa2
commit 83d8aa21b5
5 changed files with 67 additions and 65 deletions

View file

@ -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 .
'';

View file

@ -186,13 +186,21 @@
</header>
<main>
<h1 class="text-body-emphasis">Get started with Bootstrap</h1>
<p class="fs-5 col-md-8">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.</p>
{% if request.path == '/' %}
<h1 class="text-body-emphasis">Licht ins Dunkel</h1>
<p class="fs-5 col-md-8">
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?
</p>
<div class="mb-5">
<a href="/docs/5.3/examples/" class="btn btn-primary btn-lg px-4">Download examples</a>
<a href="/docs/5.3/examples/" class="btn btn-primary btn-lg px-4">Download examples</a>
</div>
{% endif %}
{% static_alias "govplan_header" %}
{% block app_body %}
{% placeholder "content" %}
@ -273,7 +281,7 @@
</div>
</main>
<footer class="pt-5 my-5 text-body-secondary border-top">
Created by the Bootstrap team &middot; &copy; 2024
Created by the Project-Insanity team &middot; &copy; 2025
</footer>
</div>
<script src="https://getbootstrap.com/docs/5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>

View file

@ -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 @@
</li>
{% endfor %}
</ul>
{% if government.active %}
<div class="ms-auto mt-2 mt-md-0">{% show_follow "govplan" object %}</div>
{% endif %}
<b>FIXME FOLLOW LIST</b>
</div>
<div class="row">
<div class="col col-12 col-md-7 col-lg-8 order-md-2 offset-lg-1">
@ -176,12 +173,7 @@
aria-label="{% translate "Close" %}"></button>
</div>
<div class="modal-body">
<form method="post"
action="{% url 'govplan:propose_planupdate' gov=object.government.slug plan=object.slug %}">
{% csrf_token %}
{% render_form update_proposal_form %}
<button type="submit" class="btn btn-primary">Neue Entwicklung melden</button>
</form>
<b>FIXME FORM SUBMIT</b>>
</div>
</div>
</div>

View file

@ -9,34 +9,37 @@
{% else %}
<div class="row">
{% for object in object_list %}
<div class="col col-12 col-md-6 col-lg-4 d-flex mb-3">
<a href="{{ object.get_absolute_url }}" class="d-flex w-100 text-body text-decoration-none">
<div class="box-card border-blue w-100 bg-body shadow-blue">
<div class="box-card-header p-3 text-bg-callout">
<h3 class="h6 m-0">
{{ object.title }}
</h3>
</div>
<div class="p-3 tight-margin d-flex flex-column flex-1 h-100">
<div class="col-sm-6 col-lg-4 mb-4">
<div class="card">
<div class="card-body">
<a href="{{ object.get_absolute_url }}" class="text-decoration-none text-reset">
<h5 class="card-title">{{ object.title }}</h5>
</a>
<p class="card-text">
{% if object.quote %}
<blockquote>
{{ object.quote|striptags|truncatewords:20|addquotes }}
</blockquote>
{% endif %}
<div class="d-flex mt-auto">
<span href="{{ object.get_absolute_url }}" class="action-link text-blue-600">
→ mehr lesen
{% endif %}
</p>
<div class="d-flex mt-auto">
<a href="{{ object.get_absolute_url }}" class="text-decoration-none">
<span href="{{ object.get_absolute_url }}" class="action-link text-blue-600 ">
→ mehr lesen
</span>
</a>
<div class="ms-auto">
<span class="badge text-bg-{{ object.get_status_css }}">
{{ object.get_status_display }}
</span>
<div class="ms-auto">
<span class="badge text-bg-{{ object.get_status_css }}">
{{ object.get_status_display }}
</span>
</div>
</div>
</div>
</div>
<p class="card-text"><small class="text-body-secondary">Last updated 3 mins ago</small></p>
</div>
</a>
</div>
</div>
{% endfor %}
</div>
{% endif %}

View file

@ -11,39 +11,37 @@
{% include "snippets/meta.html" %}
{% endblock meta %}
{% block app_body %}
<div class="container">
<div class="row justify-content-center mb-5">
<div class="col col-lg-12">
<div class="box-card border-yellow md:shadow-yellow bg-body p-3 p-md-4 p-lg-5 tight-margin">
<div class="row mx-0">
<div class="col col-12 col-md-12 ps-0 tight-margin">
{% if not government.active %}
<div class="alert alert-info">
Dieser Themenbereich gehörte zur {{ government.name }} und wird nicht mehr aktualisiert.
</div>
{% endif %}
<h1 class="mt-0 h2">{{ object.title }}</h1>
<p>
{% 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 %}
</p>
</div>
</div>
<div class="mt-5">
{% include "froide_govplan/plugins/progress_row.html" with object_list=plans %}
<p class="small text-body-secondary mt-3 no-hyphens">
<span class="text-nowrap me-1"><i class="fa fa-circle text-light"></i>&nbsp;nicht begonnen</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-primary"></i>&nbsp;begonnen</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-warning"></i>&nbsp;teilweise umgesetzt</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-success"></i>&nbsp;umgesetzt</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-danger"></i>&nbsp;verschoben</span>
</p>
{% include "froide_govplan/plugins/time_used.html" with instance=object %}
</div>
{% if not government.active %}
<div class="alert alert-info">
Dieser Themenbereich gehörte zur {{ government.name }} und wird nicht mehr aktualisiert.
</div>
{% endif %}
<h1 class="text-body-emphasis">{{ object.title }}</h1>
<p class="fs-5 col-md-8">
{% 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 %}
</p>
<div class="row justify-content-center mb-5">
<div class="col col-lg-12">
<div class="box-card border-yellow md:shadow-yellow bg-body p-3 p-md-4 p-lg-5 tight-margin">
<div class="mt-5">
{% include "froide_govplan/plugins/progress_row.html" with object_list=plans %}
<p class="small text-body-secondary mt-3 no-hyphens">
<span class="text-nowrap me-1"><i class="fa fa-circle text-light"></i>&nbsp;nicht begonnen</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-primary"></i>&nbsp;begonnen</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-warning"></i>&nbsp;teilweise umgesetzt</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-success"></i>&nbsp;umgesetzt</span>
<span class="text-nowrap me-1"><i class="fa fa-circle text-danger"></i>&nbsp;verschoben</span>
</p>
{% include "froide_govplan/plugins/time_used.html" with instance=object %}
</div>
</div>
</div>
{% include "froide_govplan/plugins/card_cols.html" with object_list=plans %}
</div>
{% include "froide_govplan/plugins/card_cols.html" with object_list=plans %}
{% endblock app_body %}