adebaumann/vgui-cicd
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tweaks on Oblique

Browse Source
This commit is contained in:
Adrian A. Baumann
2025-11-07 14:31:05 +01:00
parent cca9022f53
commit c5f4715e97
3 changed files with 178 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
dokumente/templates/standards/standard_detail.html
View File

@@ -1,61 +1,124 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}{{ standard }}{% endblock %}
{% block title %}{{ standard.nummer }} – {{ standard.name }}{% endblock %}
{% block content %} {% block content %}
<h1>{{ standard.nummer }} – {{ standard.name }}</h1> <div class="container-fluid">
{% if standard.history == True %} <nav aria-label="breadcrumb">
<h2>Version vom {{ standard.check_date }}</h2> <ol class="breadcrumb">
{% endif %} <li class="breadcrumb-item"><a href="/">Startseite</a></li>
<!-- Autoren, Prüfende etc. --> <li class="breadcrumb-item"><a href="/dokumente">Standards</a></li>
<p><strong>Autoren:</strong> {{ standard.autoren.all|join:", " }}</p> <li class="breadcrumb-item active" aria-current="page">{{ standard.nummer }}</li>
<p><strong>Prüfende:</strong> {{ standard.pruefende.all|join:", " }}</p> </ol>
<p><strong>Gültigkeit:</strong> {{ standard.gueltigkeit_von }} bis {{ standard.gueltigkeit_bis|default_if_none:"auf weiteres" }}</p> </nav>
<p><a href="{% url 'standard_json' standard.nummer %}" class="button" download="{{ standard.nummer }}.json">JSON herunterladen</a></p>
<!-- Start Einleitung --> <h1>{{ standard.nummer }} – {{ standard.name }}</h1>
{% if standard.einleitung_html %}
<h2>Einleitung</h2>
{% for typ, html in standard.einleitung_html %}
<div>{{ html|safe }}</div>
{% endfor %}
{% endif %}
<!-- End Einleitung -->
<!-- Start Geltungsbereich --> {% if standard.history == True %}
{% if standard.geltungsbereich_html %} <div class="alert alert-warning" role="alert">
<h2>Geltungsbereich</h2> <strong>Historische Version vom {{ standard.check_date }}</strong>
{% for typ, html in standard.geltungsbereich_html %} </div>
<div>{{ html|safe }}</div>
{% endfor %}
{% endif %}
<!-- End Geltungsbereich -->
<h2>Vorgaben</h2>
{% for vorgabe in vorgaben %}
<!-- Start Vorgabe -->
{% if standard.history == True or vorgabe.long_status == "active" %}
<a id="{{ vorgabe.Vorgabennummer }}"></a><div class="card mb-4">
{% if vorgabe.long_status == "active"%}
<div class="card-header d-flex justify-content-between align-items-center bg-secondary text-light">
{% elif standard.history == True %}
<div class="card-header d-flex justify-content-between align-items-center bg-danger-subtle">
{% endif %}
<h3 class="h5 m-0">{{ vorgabe.Vorgabennummer }} – {{ vorgabe.titel }}
{% if vorgabe.long_status != "active" and standard.history == True %}<span class="text-danger"> ({{ vorgabe.long_status}})</span>{% endif %}
</h3>
{% if vorgabe.relevanzset %}
<span class="badge bg-light text-black"> Relevanz:
{{ vorgabe.relevanzset|join:", " }}
</span>
{% endif %} {% endif %}
<span class="badge bg-light text-black">{{ vorgabe.thema }}</span> <!-- Metadata -->
<div class="row mb-4">
<div class="col-md-12">
<dl class="row">
<dt class="col-sm-3">Autoren:</dt>
<dd class="col-sm-9">{{ standard.autoren.all|join:", " }}</dd>
<dt class="col-sm-3">Prüfende:</dt>
<dd class="col-sm-9">{{ standard.pruefende.all|join:", " }}</dd>
<dt class="col-sm-3">Gültigkeit:</dt>
<dd class="col-sm-9">{{ standard.gueltigkeit_von }} bis {{ standard.gueltigkeit_bis|default_if_none:"auf weiteres" }}</dd>
</dl>
<p>
<a href="{% url 'standard_json' standard.nummer %}"
class="btn btn-secondary icon icon--before icon--download"
download="{{ standard.nummer }}.json">
JSON herunterladen
</a>
</p>
</div>
</div> </div>
<div class="card-body p-0"> <!-- Einleitung -->
<!-- Start Kurztext --> {% if standard.einleitung_html %}
{% comment %} KURZTEXT BLOCK {% endcomment %} <div class="row mb-4">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h2 class="h4 mb-0">Einleitung</h2>
</div>
<div class="card-body">
{% for typ, html in standard.einleitung_html %}
<div class="mb-2">{{ html|safe }}</div>
{% endfor %}
</div>
</div>
</div>
</div>
{% endif %}
<!-- Geltungsbereich -->
{% if standard.geltungsbereich_html %}
<div class="row mb-4">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h2 class="h4 mb-0">Geltungsbereich</h2>
</div>
<div class="card-body">
{% for typ, html in standard.geltungsbereich_html %}
<div class="mb-2">{{ html|safe }}</div>
{% endfor %}
</div>
</div>
</div>
</div>
{% endif %}
<!-- Vorgaben -->
<div class="row">
<div class="col-md-12">
<h2>Vorgaben</h2>
</div>
</div>
{% for vorgabe in vorgaben %}
{% if standard.history == True or vorgabe.long_status == "active" %}
<!-- Vorgabe {{ vorgabe.Vorgabennummer }} -->
<div class="row">
<div class="col-md-12">
{% if not forloop.first %}
<hr style="border: 0; border-top: 1px solid #d3d3d3; margin: 2rem 0;">
{% endif %}
<a id="{{ vorgabe.Vorgabennummer }}"></a>
<div class="card mb-4">
<div class="card-header">
<div class="d-flex justify-content-between align-items-center flex-wrap">
<h3 class="h5 mb-0 flex-grow-1">
{{ vorgabe.Vorgabennummer }} – {{ vorgabe.titel }}
{% if vorgabe.long_status != "active" and standard.history == True %}
<span class="badge badge-danger">{{ vorgabe.long_status }}</span>
{% endif %}
</h3>
<div class="d-flex align-items-center gap-2">
<span class="badge badge-info">{{ vorgabe.thema }}</span>
{% if vorgabe.relevanzset %}
<span class="badge badge-secondary">
Relevanz: {{ vorgabe.relevanzset|join:", " }}
</span>
{% endif %}
</div>
</div>
</div>
<div class="card-body">
<!-- Kurztext -->
{% if vorgabe.kurztext_html.0.1 %} {% if vorgabe.kurztext_html.0.1 %}
<div class="p-3 mb-3 bg-light border-3" style="width: 100%;"> <div class="alert alert-info">
{% for typ, html in vorgabe.kurztext_html %} {% for typ, html in vorgabe.kurztext_html %}
{% if html %} {% if html %}
<div class="mb-2">{{ html|safe }}</div> <div class="mb-2">{{ html|safe }}</div>
@@ -63,48 +126,56 @@
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
<!-- Langtext --> <!-- Langtext -->
<div class="p-3 mb-3"> <div class="mb-3">
{% comment %} LANGTEXT BLOCK {% endcomment %}
{# <h5>Langtext</h5> #}
{% for typ, html in vorgabe.langtext_html %} {% for typ, html in vorgabe.langtext_html %}
{% if html %}<div class="mb-3">{{ html|safe }}</div>{% endif %} {% if html %}
<div class="mb-3">{{ html|safe }}</div>
{% endif %}
{% endfor %} {% endfor %}
<!-- Checklistenfragen --> </div>
{% comment %} CHECKLISTENFRAGEN BLOCK {% endcomment %}
<h5>Checklistenfragen</h5> <!-- Checklistenfragen -->
<h4 class="h6">Checklistenfragen</h4>
{% if vorgabe.checklistenfragen.all %} {% if vorgabe.checklistenfragen.all %}
<ul class="list-group"> <ul class="list-group mb-3">
{% for frage in vorgabe.checklistenfragen.all %} {% for frage in vorgabe.checklistenfragen.all %}
<li class="list-group-item">{{ frage.frage }}</li> <li class="list-group-item">{{ frage.frage }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}
<p><em>Keine Checklistenfragen</em></p> <p class="text-muted"><em>Keine Checklistenfragen</em></p>
{% endif %} {% endif %}
{% comment %} STICHWORTE + REFERENZEN AT BOTTOM {% endcomment %}
<div class="mt-4 small text-muted"> <!-- Stichworte und Referenzen -->
<div class="mt-4 p-3" style="background-color: #f8f9fa; border-left: 3px solid #dee2e6;">
<p class="mb-2">
<strong>Stichworte:</strong> <strong>Stichworte:</strong>
{% if vorgabe.stichworte.all %} {% if vorgabe.stichworte.all %}
{% for s in vorgabe.stichworte.all %} {% for s in vorgabe.stichworte.all %}
<a href="{% url 'stichwort_detail' stichwort=s %}">{{ s }}</a>{% if not forloop.last %}, {% endif %} <a href="{% url 'stichwort_detail' stichwort=s %}" class="badge badge-secondary">{{ s }}</a>{% if not forloop.last %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
<em>Keine</em> <span class="text-muted">Keine</span>
{% endif %} {% endif %}
<br> </p>
<p class="mb-0">
<strong>Referenzen:</strong> <strong>Referenzen:</strong>
{% if vorgabe.referenzpfade %} {% if vorgabe.referenzpfade %}
{% for ref in vorgabe.referenzpfade %} {% for ref in vorgabe.referenzpfade %}
{{ ref|safe }}{% if not forloop.last %}, {% endif %} {{ ref|safe }}{% if not forloop.last %}, {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
<em>Keine</em> <span class="text-muted">Keine</span>
{% endif %} {% endif %}
</p>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div>
{% endblock %} {% endblock %}

2
pages/templates/base.html
View File

@@ -114,7 +114,7 @@
</nav> </nav>
<!-- Main Content --> <!-- Main Content -->
<div class="container container-main" id="content"> <div class="container container-main" id="content" style="padding: 2rem 3rem;">
{% if messages %} {% if messages %}
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">

8
stichworte/templates/stichworte/stichwort_list.html
View File

@@ -11,16 +11,18 @@
<div class="row mb-4"> <div class="row mb-4">
<div class="col-md-12"> <div class="col-md-12">
<h2 class="h3" id="{{ Anfang }}">{{ Anfang }}</h2> <h2 class="h3" id="{{ Anfang }}">{{ Anfang }}</h2>
<div class="list-group"> </div>
</div>
<div class="row mb-4">
{% for Wort in Worte %} {% for Wort in Worte %}
<div class="col-md-4 mb-2">
<a href="{% url 'stichwort_detail' stichwort=Wort %}" <a href="{% url 'stichwort_detail' stichwort=Wort %}"
class="list-group-item list-group-item-action"> class="list-group-item list-group-item-action">
{{ Wort }} {{ Wort }}
</a> </a>
</div>
{% endfor %} {% endfor %}
</div> </div>
</div>
</div>
{% endfor %} {% endfor %}
</div> </div>
{% endblock %} {% endblock %}