clean up section and detail views a bit
This commit is contained in:
krmax44
parent
fae6f31794
commit
01915865ef
5 changed files with 118 additions and 112 deletions
|
|
@ -3,7 +3,9 @@
|
|||
{% load cms_tags %}
|
||||
{% load menu_tags %}
|
||||
|
||||
{% block navbar %}{% endblock %}
|
||||
{% block navbar %}
|
||||
{% include "header_reduced.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<nav class="breadcrumb-container" aria-label="breadcrumb">
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{% extends CMS_TEMPLATE %}
|
||||
{% extends "froide_govplan/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load markup %}
|
||||
{% load cms_tags %}
|
||||
{% load follow_tags %}
|
||||
{% load govplan %}
|
||||
|
||||
{% block title %}{{ object.title }}{% endblock %}
|
||||
|
||||
|
|
@ -14,17 +15,15 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block app_body %}
|
||||
<div class="container mb-5">
|
||||
<div class="row justify-content-center mb-5">
|
||||
<div class="col col-lg-8 mt-md-n5">
|
||||
<div class="box-card border-yellow md:shadow-yellow bg-white">
|
||||
<div class="container">
|
||||
<div class="box-card border-yellow md:shadow-yellow bg-white mb-5">
|
||||
<div>
|
||||
<div class="flex-grow-1 tight-margin p-3 p-md-4 p-lg-5">
|
||||
<h1 class="mt-0 h3">
|
||||
{{ object.title }}
|
||||
</h1>
|
||||
|
||||
<div class="d-md-flex my-3 align-items-center">
|
||||
<div class="d-md-flex my-4 align-items-center">
|
||||
<ul class="list-unstyled d-flex m-0">
|
||||
<li>
|
||||
<span class="badge badge-{{ object.get_status_css }} mr-2">
|
||||
|
|
@ -33,8 +32,8 @@
|
|||
</li>
|
||||
{% for cat in object.categories.all %}
|
||||
<li>
|
||||
<a href="{{ section.get_absolute_url }}">
|
||||
<span class="badge badge-light mr-2">{{ cat.name }}</span>
|
||||
<a href="{{ section.get_absolute_url }}" class="badge badge-light mr-2">
|
||||
{{ cat.name }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
|
@ -45,22 +44,25 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col col-12 col-md-7 col-lg-8 order-md-2 offset-lg-1">
|
||||
{% if object.quote %}
|
||||
<blockquote>
|
||||
{{ object.quote | markdown }}
|
||||
{{ object.quote | addquotes | markdown }}
|
||||
</blockquote>
|
||||
{% endif %}
|
||||
|
||||
{% with refs=object.get_reference_links %}
|
||||
{% if refs %}
|
||||
<p class="small">
|
||||
<p>
|
||||
<span class="small">
|
||||
{% if refs|length > 1 %}
|
||||
Quellen:
|
||||
{% else %}
|
||||
Quelle:
|
||||
{% endif %}
|
||||
</span>
|
||||
{% for ref in refs %}
|
||||
<a href="{{ ref }}" target="_blank">
|
||||
<a href="{{ ref }}" class="badge badge-light mr-2" target="_blank">
|
||||
{{ forloop.counter }}
|
||||
</a>
|
||||
{% endfor %}
|
||||
|
|
@ -68,23 +70,13 @@
|
|||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
{% if object.organization %}
|
||||
<p>
|
||||
Dieses Vorhaben wird beobachtet von
|
||||
<a href="{{ object.organization.website }}">
|
||||
{{ object.organization.name }}
|
||||
</a>
|
||||
</p>
|
||||
{% if object.description %}
|
||||
<div class="mt-5">
|
||||
{{ object.description | safe }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="container">
|
||||
<div class="col col-12 col-md-5 col-lg-3 mt-5 mt-md-0">
|
||||
<dl>
|
||||
{% if object.rating %}
|
||||
<dt>Bewertung</dt>
|
||||
|
|
@ -98,26 +90,29 @@
|
|||
<dt>Frist</dt>
|
||||
<dd>{{ object.due_date|date:"SHORT_DATE_FORMAT" }}</dd>
|
||||
{% endif %}
|
||||
</dl>
|
||||
|
||||
<div>
|
||||
{{ object.description | safe }}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{% if object.responsible_publicbody %}
|
||||
<p>
|
||||
Federführung:
|
||||
<dt>Federführung</dt>
|
||||
<dd>
|
||||
<a href="{{ object.responsible_publicbody.get_absolute_url }}">
|
||||
{{ object.responsible_publicbody.name }}
|
||||
</a>
|
||||
</p>
|
||||
</dd>
|
||||
{% endif %}
|
||||
{% if object.organization %}
|
||||
<dt>Beobachtet von</dt>
|
||||
<dd>
|
||||
<a href="{{ object.organization.website }}">
|
||||
<img src="{{ object.organization.logo.url }}" class="img-sm" alt="{{ object.organization.name }}">
|
||||
</a>
|
||||
</dd>
|
||||
{% endif %}
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3>Neueste Entwicklungen</h3>
|
||||
{% for update in updates %}
|
||||
<h4>{{ update.title }}</h4>
|
||||
|
||||
|
|
@ -140,8 +135,6 @@
|
|||
</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% empty %}
|
||||
Keine Entwicklungen
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{% load thumbnail %}
|
||||
{% load i18n %}
|
||||
{% load govplan %}
|
||||
|
||||
{% if object_list|length == 0 %}
|
||||
<p>
|
||||
|
|
@ -10,23 +11,30 @@
|
|||
{% 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 shadow-blue">
|
||||
<div class="box-card border-blue w-100 bg-white shadow-blue">
|
||||
<div class="box-card-header p-3 bg-blue-20">
|
||||
<h3 class="h6 m-0">
|
||||
{{ object.title }}
|
||||
</h3>
|
||||
</div>
|
||||
<div class="p-3 tight-margin">
|
||||
<div class="p-3 tight-margin d-flex flex-column flex-1 h-100">
|
||||
{% if object.quote %}
|
||||
<blockquote>
|
||||
„{{ object.quote|striptags|truncatewords:20 }}“
|
||||
{{ object.quote|striptags|truncatewords:20|addquotes }}
|
||||
</blockquote>
|
||||
{% endif %}
|
||||
<span class="badge badge-{{ object.get_status_css }} mt-auto">
|
||||
<div class="d-flex mt-auto">
|
||||
<span href="{{ object.get_absolute_url }}" class="action-link text-blue-600">
|
||||
→ mehr lesen
|
||||
</span>
|
||||
<div class="ml-auto">
|
||||
<span class="badge badge-{{ object.get_status_css }}">
|
||||
{{ object.get_status_display }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends CMS_TEMPLATE %}
|
||||
{% extends "froide_govplan/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load markup %}
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block app_body %}
|
||||
<div class="container mb-5">
|
||||
<div class="row justify-content-center mb-5">
|
||||
<div class="col col-lg-8 mt-md-n5">
|
||||
<div class="container">
|
||||
<div class="row justify-content-center mb-3">
|
||||
<div class="col col-lg-12">
|
||||
<div class="box-card {% comment %} box-card-has-image-lg {% endcomment %} border-yellow md:shadow-yellow bg-white">
|
||||
<div>
|
||||
{% comment %} <div class="box-card-image overlap-right text-center">
|
||||
|
|
@ -47,26 +47,24 @@
|
|||
</div> {% endcomment %}
|
||||
|
||||
<div class="flex-grow-1 tight-margin p-3 p-md-4 p-lg-5">
|
||||
<h1 class="mt-0">
|
||||
<h1 class="mt-0 h2">
|
||||
{{ object.title }}
|
||||
</h1>
|
||||
|
||||
<p>
|
||||
<p class="col-lg-8 px-0">
|
||||
{% 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>
|
||||
|
||||
{% page_url 'koalitionstracker' as base_url %}
|
||||
<a href="{{ base_url }}" class="action-link">zurück zu allen Kategorien</a>
|
||||
</div>
|
||||
<!-- {% page_url 'koalitionstracker' as base_url %}
|
||||
<a href="{{ base_url }}" class="action-link">zurück zu allen Kategorien</a> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
{% include "froide_govplan/plugins/card_cols.html" with object_list=plans %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -41,3 +41,8 @@ def get_plan_progress(object_list):
|
|||
@register.inclusion_tag("froide_govplan/plugins/progress.html")
|
||||
def get_section_progress(section):
|
||||
return {"object_list": section.get_plans()}
|
||||
|
||||
|
||||
@register.filter
|
||||
def addquotes(text):
|
||||
return f"„{str.strip(text)}“"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue