bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

djade formatting

Browse Source
This commit is contained in:
Patrick Mayr
2025-01-26 22:42:20 +01:00
parent f999a98d7c
commit f0d0c44fd6
49 changed files with 97 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fet2020/templates/404.html
View File

@@ -18,4 +18,4 @@
</div>
</section>
</main>
{% endblock %}
{% endblock content %}

11
fet2020/templates/admin/base.html
View File

@@ -1,10 +1,9 @@
{% extends "admin/base.html" %}
{% load i18n admin_urls %}
{% load static %}
{% load admin_urls i18n static %}
{% block extrahead %}
<link rel="shortcut icon" type="image/png" href="{% static 'img/fet_logo_white.png' %}"/>
{% endblock %}
{% endblock extrahead %}
{% block usertools %}
{% if has_permission %}
@@ -12,14 +11,14 @@
{% block welcome-msg %}
{% translate 'Welcome,' %}
<strong>{% firstof user.get_short_name user.get_username %}</strong>.
{% endblock %}
{% endblock welcome-msg %}
{% block userlinks %}
{% if site_url %}
<a class="button" href="{{ site_url }}">Zurück zur FET Homepage</a>
{% endif %}
<!-- TODO: FIXME: <a class="button" href="{% url 'authentications:password_change' %}">Passwort ändern</a> -->
<a class="button" href="{% url 'admin:logout' %}">{% translate 'Log out' %}</a>
{% endblock %}
{% endblock userlinks %}
</div>
{% endif %}
{% endblock %}
{% endblock usertools %}

2
fet2020/templates/admin/base_site.html
View File

@@ -1,3 +1,3 @@
{% extends "admin/base_site.html" %}
{% block title %}{{ site_title }}: {{ title }} {% endblock %}
{% block title %}{{ site_title }}: {{ title }}{% endblock %}

4
fet2020/templates/admin/change_form.html
View File

@@ -1,6 +1,6 @@
{% extends "admin/change_form.html" %}
{% load i18n admin_urls %}
{% load admin_urls i18n %}
{% block form_top %}
{% if help_text %}<p>{{ help_text }}</p>{% endif %}
{% endblock %}
{% endblock form_top %}

4
fet2020/templates/admin/submit_line.html
View File

@@ -1,5 +1,5 @@
{% extends "admin/submit_line.html" %}
{% load i18n admin_urls %}
{% load admin_urls i18n %}
{% block submit-row %}
{% if not show_close %}
@@ -8,4 +8,4 @@
{% endif %}
{% if generate_pdf %}<input type="submit" value="PDF File generieren" class="default" name="_generate_pdf">{% endif %}
{{ block.super }}
{% endblock %}
{% endblock submit-row %}

2
fet2020/templates/authentications/change_password.html
View File

@@ -26,4 +26,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/authentications/change_password_done.html
View File

@@ -12,4 +12,4 @@
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/authentications/login.html
View File

@@ -28,4 +28,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

10
fet2020/templates/base.html
View File

@@ -1,6 +1,4 @@
{% load flatpages %}
{% load static %}
{% load version %}
{% load flatpages static version %}
<!DOCTYPE html>
<html lang="de" x-data="bodyData" x-bind="documentRoot">
@@ -50,9 +48,9 @@
<link rel="stylesheet" href="{% static 'fonts/Fira_Code-6.2/fira_code.css' %}">
{% block galleryheader %}
{% endblock %}
{% endblock galleryheader %}
{% block extraheader %}
{% endblock %}
{% endblock extraheader %}
</head>
<body x-bind="documentBody">
@@ -203,7 +201,7 @@
</nav>
{% block content %}
{% endblock %}
{% endblock content %}
<footer>
<ul class="icon-list">

2
fet2020/templates/blackboard/index.html
View File

@@ -75,4 +75,4 @@
{% endif %}
</div>
</main>
{% endblock %}
{% endblock content %}

12
fet2020/templates/documents/base.html
View File

@@ -1,4 +1,3 @@
<!DOCTYPE html>
{% load i18n %}
<html lang="en">
@@ -14,10 +13,10 @@
<div id="nav"><nav>
{% block nav %}
{% if user.is_authenticated %}
<a class="nav" href="/accounts/profile/">{% trans "profile" %}</a>
<a class="nav" href="/logout">{% trans "logout" %}</a>
<a class="nav" href="/accounts/profile/">{% translate "profile" %}</a>
<a class="nav" href="/logout">{% translate "logout" %}</a>
{% endif %}
{% endblock %}
{% endblock nav %}
</nav></div>
<div id="wrapper">
{% block wrapper %}
@@ -31,7 +30,7 @@
<span class="mark">!</span>{{ message.text }}<span class="mark">!</span>
</div>
{% endfor %}
{% endblock %}
{% endblock messages %}
</div>
{% endif %}
{% block content %}{% endblock %}
@@ -42,9 +41,8 @@
<div id="footer"><footer>
</footer></div>
</div>
{% endblock %}
{% endblock wrapper %}
</div>
</body>
</html>

9
fet2020/templates/documents/pad.html
View File

@@ -1,18 +1,17 @@
{% extends "documents/base.html" %}
{% block title %}{{pad.name}}{% endblock %}
{% block title %}{{ pad.name }}{% endblock %}
{% block wrapper %}
{% if error %}
<div id="main">
<div id="errors">
<h2>Errors:</h2>
<p>{{error}}</p>
<p>{{ error }}</p>
</div>
</div>
{% else %}
<iframe src="{{link}}?userName={{uname}}" style="height: 95%; width: 100%; min-height: 500px; display: block"></iframe>
<iframe src="{{ link }}?userName={{ uname }}" style="height: 95%; width: 100%; min-height: 500px; display: block"></iframe>
<script type="text/javascript">
/**
@@ -31,4 +30,4 @@
</script>
{% endif %}
{% endblock %}
{% endblock wrapper %}

2
fet2020/templates/finance/bill_create.html
View File

@@ -103,4 +103,4 @@
</section>
</form>
</main>
{% endblock %}
{% endblock content %}

4
fet2020/templates/finance/bill_create_done.html
View File

@@ -6,10 +6,10 @@
<!-- Main Content -->
<main class="container mx-auto w-full px-4 my-8 flex-1">
<section class="w-full text-center">
<p class="mt-6 text-gray-900 dark:text-gray-100">Rechnung #{{pk}} wurde erfolgreich eingereicht.</p>
<p class="mt-6 text-gray-900 dark:text-gray-100">Rechnung #{{ pk }} wurde erfolgreich eingereicht.</p>
<div class="mt-10 flex items-center justify-center">
<a href="{% url 'home' %}" type="submit" class="block btn btn-primary">Zur Startseite</a>
</div>
</section>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/finance/bill_update.html
View File

@@ -178,4 +178,4 @@
{% endif %}
</form>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/finance/index.html
View File

@@ -71,4 +71,4 @@
</div>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/finance/resolution_create.html
View File

@@ -35,4 +35,4 @@
</section>
</form>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/finance/resolution_detail.html
View File

@@ -57,4 +57,4 @@
</a>
</section>
</main>
{% endblock %}
{% endblock content %}

4
fet2020/templates/finance/resolution_list.html
View File

@@ -27,7 +27,7 @@
{% for result in object_list %}
<tr>
<td class="text-right">{{ result.id }}</td>
<td class="text-blue-700 dark:text-blue-200 no-underline hover:underline"><a href="{%url 'finance:resolution_detail' result.id %}">{{ result.name }}</a></td>
<td class="text-blue-700 dark:text-blue-200 no-underline hover:underline"><a href="{% url 'finance:resolution_detail' result.id %}">{{ result.name }}</a></td>
<!--<td class="text-left">{{ result.voting_text|truncatechars:300 }}</td>-->
<td class="text-left">{{ result.voting }}</td>
<td class="text-left">{{ result.get_option_display }}</td>
@@ -65,4 +65,4 @@
{% endif %}
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/finance/resolution_update.html
View File

@@ -35,4 +35,4 @@
</section>
</form>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/flatpages/default.html
View File

@@ -17,4 +17,4 @@
</div>
{% endif %}
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/flatpages/social_media.html
View File

@@ -77,4 +77,4 @@
</main>
</div>
</body>
{% endblock %}
{% endblock content %}

4
fet2020/templates/gallery/album.html
View File

@@ -5,7 +5,7 @@
{% block galleryheader %}
<link rel="stylesheet" href="{% static 'Gallery-3.4.0/css/blueimp-gallery.min.css' %}">
{% endblock %}
{% endblock galleryheader %}
{% block content %}
<!-- Main Content -->
@@ -77,4 +77,4 @@
}
</script>
{% endblock %}
{% endblock content %}

2
fet2020/templates/gallery/index.html
View File

@@ -31,4 +31,4 @@
{% endfor %}
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/home.html
View File

@@ -121,4 +121,4 @@
</section>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/attachment/create.html
View File

@@ -20,4 +20,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/attachment/detail.html
View File

@@ -61,4 +61,4 @@
<a href="{% url 'intern:attachment_update' attachment.topic.topic_group.slug attachment.topic.slug attachment.slug %}" class="btn btn-primary block place-self-end"><i class="fa-solid fa-pen-to-square mr-2"></i>Beschreibung bearbeiten</a>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/attachment/update.html
View File

@@ -20,4 +20,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/etherpad/create.html
View File

@@ -20,4 +20,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/fileupload/create.html
View File

@@ -20,4 +20,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/index.html
View File

@@ -92,4 +92,4 @@
<a href="{% url 'admin:intern_topicgroup_add' %}" class="btn btn-primary block w-full"><i class="fa-solid fa-plus-square mr-2"></i>Neuer Themenbereich</a>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/topic/create.html
View File

@@ -20,4 +20,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/topic/detail.html
View File

@@ -36,4 +36,4 @@
</section>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/intern/topic/update.html
View File

@@ -24,4 +24,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

13
fet2020/templates/members/index.html
View File

@@ -1,9 +1,6 @@
{% extends 'base.html' %}
{% load flatpages %}
{% load job_groups %}
{% load softhyphen_tags %}
{% load static %}
{% load flatpages job_groups softhyphen_tags static %}
{% block content %}
<!-- Main Content -->
@@ -106,21 +103,21 @@
{% if member %}
<!-- show details of a member -->
{% block member_content %}
{% endblock %}
{% endblock member_content %}
{% endif %}
{% if members %}
<!-- show all, active or pension members -->
{% block members_content %}
{% endblock %}
{% endblock members_content %}
{% endif %}
{% if job_members %}
<!-- show job lists in a job group -->
{% block jobs_content %}
{% endblock %}
{% endblock jobs_content %}
{% endif %}
</section>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/members/jobs.html
View File

@@ -36,4 +36,4 @@
</article>
{% endfor %}
</div>
{% endblock %}
{% endblock jobs_content %}

4
fet2020/templates/members/member.html
View File

@@ -9,7 +9,7 @@
<meta content="{{ member.firstname }}" property="og:profile:first_name">
<meta content="{{ member.surname }}" property="og:profile:last_name">
<meta content="profile" property="og:type">
{% endblock %}
{% endblock extraheader %}
{% block member_content %}
<section class="flex-grow w-full max-w-prose my-8 sm:my-0 text-gray-800 dark:text-gray-300">
@@ -70,4 +70,4 @@
</div>
{% endif %}
</section>
{% endblock %}
{% endblock member_content %}

2
fet2020/templates/members/members.html
View File

@@ -26,4 +26,4 @@
{% endfor %}
</div>
</article>
{% endblock %}
{% endblock members_content %}

12
fet2020/templates/posts/event/detail.html
View File

@@ -5,9 +5,11 @@
{% block title %}{{ post.title }}{% endblock %}
{% block prev_text_big %}Vorheriges<br>Event{% endblock %}
{% block next_text_big %}Nächstes<br>Event{% endblock %}
{% block prev_text %}Vorheriges Event{% endblock %}
{% block next_text %}Nächstes Event{% endblock %}
{% block update_button_desktop %}
@@ -16,7 +18,7 @@
<i class="fa-solid fa-pen-to-square mr-1"></i>Event bearbeiten
</a>
{% endif %}
{% endblock %}
{% endblock update_button_desktop %}
{% block event_details_desktop %}
<div class="hidden lg:block absolute top-0 right-0 bg-white dark:bg-gray-950 rounded-bl p-2 bg-opacity-60 dark:bg-opacity-60 gap-2 backdrop-blur">
@@ -46,13 +48,13 @@
{% endif %}
</span>
</div>
{% endblock %}
{% endblock event_details_desktop %}
{% block post_body %}
{% if post.body %}
{{ post.body|safe|tags_to_url }}
{% endif %}
{% endblock %}
{% endblock post_body %}
{% block event_details_mobile %}
<hr class="lg:hidden -mx-4 border-gray-200 dark:border-gray-800 dark:border my-4">
@@ -66,7 +68,7 @@
{% endif %}
</ul>
</div>
{% endblock %}
{% endblock event_details_mobile %}
{% block update_button_mobile %}
{% if request.user.is_authenticated %}
@@ -74,4 +76,4 @@
<i class="fa-solid fa-pen-to-square mr-1"></i>Event bearbeiten
</a>
{% endif %}
{% endblock %}
{% endblock update_button_mobile %}

2
fet2020/templates/posts/event/update.html
View File

@@ -27,4 +27,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/posts/fetmeeting/create.html
View File

@@ -26,4 +26,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

14
fet2020/templates/posts/fetmeeting/detail.html
View File

@@ -5,9 +5,11 @@
{% block title %}{{ post.title }} vom {{ post.event_start|date }}{% endblock %}
{% block prev_text_big %}Vorherige<br>Sitzung{% endblock %}
{% block next_text_big %}Nächste<br>Sitzung{% endblock %}
{% block prev_text %}Vorherige Sitzung{% endblock %}
{% block next_text %}Nächste Sitzung{% endblock %}
{% block update_button_desktop %}
@@ -16,7 +18,7 @@
<i class="fa-solid fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
</a>
{% endif %}
{% endblock %}
{% endblock update_button_desktop %}
{% block event_details_desktop %}
<div class="hidden lg:block absolute top-0 right-0 bg-white dark:bg-gray-950 rounded-bl p-2 bg-opacity-60 dark:bg-opacity-60 gap-2 backdrop-blur">
@@ -46,7 +48,7 @@
{% endif %}
</span>
</div>
{% endblock %}
{% endblock event_details_desktop %}
{% block post_body %}
{% if post.has_agenda and post.agenda_html %}
@@ -59,7 +61,7 @@
<h2>Protokoll</h2>
{{ post.protocol_html|safe }}
{% endif %}
{% endblock %}
{% endblock post_body %}
{% block event_details_mobile %}
<hr class="lg:hidden -mx-4 border-gray-200 dark:border-gray-800 dark:border my-4">
@@ -73,7 +75,7 @@
{% endif %}
</ul>
</div>
{% endblock %}
{% endblock event_details_mobile %}
{% block docu_buttons %}
{% if request.user.is_authenticated %}
@@ -176,7 +178,7 @@
</div>
</div>
{% endif %}
{% endblock %}
{% endblock docu_buttons %}
{% block update_button_mobile %}
{% if request.user.is_authenticated %}
@@ -184,4 +186,4 @@
<i class="fa-solid fa-pen-to-square mr-1"></i>FET Sitzung bearbeiten
</a>
{% endif %}
{% endblock %}
{% endblock update_button_mobile %}

2
fet2020/templates/posts/fetmeeting/update.html
View File

@@ -25,4 +25,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/posts/index.html
View File

@@ -116,4 +116,4 @@
</section>
</div>
</main>
{% endblock %}
{% endblock content %}

8
fet2020/templates/posts/news/detail.html
View File

@@ -10,13 +10,13 @@
<i class="fa-solid fa-pen-to-square mr-1"></i>Artikel bearbeiten
</a>
{% endif %}
{% endblock %}
{% endblock update_button_desktop %}
{% block post_body %}
{% if post.body %}
{{ post.body|safe|tags_to_url }}
{% endif %}
{% endblock %}
{% endblock post_body %}
{% block files_buttons %}
{% if files %}
@@ -51,7 +51,7 @@
</div>
{% endfor %}
{% endif %}
{% endblock %}
{% endblock files_buttons %}
{% block update_button_mobile %}
{% if request.user.is_authenticated %}
@@ -59,4 +59,4 @@
<i class="fa-solid fa-pen-to-square mr-1"></i>Artikel bearbeiten
</a>
{% endif %}
{% endblock %}
{% endblock update_button_mobile %}

2
fet2020/templates/posts/news/update.html
View File

@@ -23,4 +23,4 @@
</form>
</div>
</main>
{% endblock %}
{% endblock content %}

18
fet2020/templates/posts/show.html
View File

@@ -7,7 +7,7 @@
<meta content="{{ post.title }}" property="og:title">
<meta content="article" property="og:type">
<meta content="" property="og:url">
{% endblock %}
{% endblock extraheader %}
{% block content %}
<!-- Main Content -->
@@ -81,12 +81,12 @@
</div>
{% block update_button_desktop %}
{% endblock %}
{% endblock update_button_desktop %}
</div>
</div>
<div class="relative w-full h-44 sm:h-56 md:h-60 lg:h-64 xl:h-96 bg-center bg-no-repeat bg-cover sm:rounded-md mx-auto" style="background-image: url('{{ post.imageurl }}');">
{% block event_details_desktop %}
{% endblock %}
{% endblock event_details_desktop %}
</div>
</section>
<section class="mx-4 z-10">
@@ -94,17 +94,17 @@
<div class="db-page-content-left">
<!-- Content from DB here: -->
{% block post_body %}
{% endblock %}
{% endblock post_body %}
</div>
{% block event_details_mobile %}
{% endblock %}
{% endblock event_details_mobile %}
{% block docu_buttons %}
{% endblock %}
{% endblock docu_buttons %}
{% block files_buttons %}
{% endblock %}
{% endblock files_buttons %}
<hr class="-mx-4 border-gray-200 dark:border-gray-800 dark:border my-4">
<div class="-m-4 flex divide-x divide-gray-200 dark:divide-gray-800 dark:divide-x-2 text-sm sm:text-base">
@@ -120,7 +120,7 @@
</article>
{% block update_button_mobile %}
{% endblock %}
{% endblock update_button_mobile %}
</section>
{% if related_posts and related_posts|length > 1 %}
@@ -146,4 +146,4 @@
</section>
{% endif %}
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/posts/tag.html
View File

@@ -14,4 +14,4 @@
</section>
</div>
</main>
{% endblock %}
{% endblock content %}

2
fet2020/templates/search/index.html
View File

@@ -45,4 +45,4 @@
{% endif %}
</section>
</main>
{% endblock %}
{% endblock content %}