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

add Create- and UpdateView, labels, link to tasks. change date format.

Browse Source
This commit is contained in:
Patrick Mayr
2022-01-23 18:08:33 +00:00
parent 7520486ebd
commit 844be27d59
23 changed files with 659 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fet2020/templates/intern/docu.html
View File

@@ -1,12 +1,12 @@
{% extends "layout.html" %}
{% block content %}
{% block content %}
<div class="grid-container">
<div class="grid-x grid-padding-x">
<div class="cell padding-top-1">
<h3>
<a href="{% url 'intern' %}#{{ active_topic.topic_group.slug }}">{{ active_topic.topic_group.title }}</a>
/ <a href="{% url 'topic' active_topic.slug %}">{{ active_topic.title }}</a>
<a href="{% url 'intern:index' %}#{{ active_topic.topic_group.slug }}">{{ active_topic.topic_group.title }}</a>
/ <a href="{% url 'intern:topic' active_topic.slug %}">{{ active_topic.title }}</a>
/ {{ active_docu.title }}
</h3>
</div>
@@ -17,7 +17,7 @@
{% if request.user.is_authenticated %}
<div class="grid-x grid-padding-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'admin:intern_documentation_change' active_docu.id %}">Beschreibung bearbeiten</a>
<a class="button" href="{% url 'intern:docu-update' active_topic.slug active_docu.slug %}">Beschreibung bearbeiten</a>
</div>
</div>
{% endif %}
@@ -32,7 +32,7 @@
<div class="grid-x grid-padding-x">
<div class="cell">
Etherpad Dokumente:
<a href="{% url 'etherpad-create' active_topic.slug active_docu.slug %}">
<a href="{% url 'intern:etherpad-create' active_topic.slug active_docu.slug %}">
<div class="news-hero-compact">
<div class="news-hero-compact-text">
<p style="margin-bottom: 0rem;">+ neues Etherpad erstellen</p>
@@ -54,7 +54,7 @@
{% endfor %}
Dokumente:
<a href="{% url 'file-create' active_topic.slug active_docu.slug %}">
<a href="{% url 'intern:file-create' active_topic.slug active_docu.slug %}">
<div class="news-hero-compact">
<div class="news-hero-compact-text">
<p style="margin-bottom: 0rem;">+ neue Datei hochladen</p>
@@ -78,5 +78,4 @@
</div>
</div>
</div>
{% endblock %}

23
fet2020/templates/intern/docu/docu_create.html Normal file
View File

@@ -0,0 +1,23 @@
{% extends "layout.html" %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'intern:topic' slug %}">Zurück</a>
</div>
</div>
<hr>
<h2>Neue Dokumentation erstellen</h2>
<div class="grid-x">
<div class="cell">
<form action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form }}
<input type="submit" class="button" name="btn_input" value="Hinzufügen">
</form>
</div>
</div>
</div>
{% endblock %}

26
fet2020/templates/intern/docu/docu_update.html Normal file
View File

@@ -0,0 +1,26 @@
{% extends "layout.html" %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'intern:docu' topic_slug slug %}">Zurück</a>
</div>
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'admin:intern_documentation_change' documentation.id %}">Dokumentation im Admin bearbeiten</a>
</div>
</div>
<hr>
<h2>Dokumentation '{{ documentation.title }}' bearbeiten</h2>
<div class="grid-x">
<div class="cell">
<form action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form }}
<input type="submit" class="button" name="btn_input" value="Bearbeiten">
</form>
</div>
</div>
</div>
{% endblock %}

7
fet2020/templates/intern/etherpad_create.html
View File

@@ -1,10 +1,10 @@
{% extends "layout.html" %}
{% block content %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1 padding-left-1 padding-right-1">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'docu' topic_slug slug %}">Zurück</a>
<a class="button" href="{% url 'intern:docu' topic_slug slug %}">Zurück</a>
</div>
</div>
<hr>
@@ -20,5 +20,4 @@
</div>
</div>
</div>
{% endblock %}

7
fet2020/templates/intern/file_create.html
View File

@@ -1,10 +1,10 @@
{% extends "layout.html" %}
{% block content %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1 padding-left-1 padding-right-1">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'docu' topic_slug slug %}">Zurück</a>
<a class="button" href="{% url 'intern:docu' topic_slug slug %}">Zurück</a>
</div>
</div>
<hr>
@@ -20,5 +20,4 @@
</div>
</div>
</div>
{% endblock %}

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

@@ -1,6 +1,6 @@
{% extends "layout.html" %}
{% block content %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1">
{% if request.user.is_authenticated %}
@@ -13,13 +13,17 @@
{% regroup topic by topic_group as topic_list %}
{% for topic in topic_list %}
<div class="internheader">
<h3>{{ topic.grouper.title }}<a class="headerlink" id="{{topic.list.0.topic_group.slug}}" href="#{{topic.list.0.topic_group.slug}}" title="Permalink to {{topic.grouper}}" style="color: lightgrey;"> #</a></h3>
<h3>{{ topic.grouper.title }}<a class="headerlink" id="{{ topic.list.0.topic_group.slug }}" href="#{{ topic.list.0.topic_group.slug }}" title="Permalink to {{ topic.grouper }}" style="color: lightgrey;"> #</a></h3>
</div>
{% if topic.grouper.short_description %}
{{ topic.grouper.short_description }}
{% endif %}
<div class="grid-x grid-padding-x">
{% for tp in topic.list %}
<div class="cell large-2 medium-4 small-6">
<a href="{% url 'topic' tp.slug %}">
<a href="{% url 'intern:topic' tp.slug %}">
<div class="intern-topic">
<div class="intern-topic-text">
{{ tp.title }}
@@ -29,7 +33,25 @@
</div>
{% endfor %}
<div class="cell large-2 medium-4 small-6">
<a href="{% url 'admin:intern_topic_add' %}">
<a href="{% url 'intern:topic-create' topic.list.0.topic_group.slug %}">
<div class="intern-topic">
<div class="intern-topic-text">
+
</div>
</div>
</a>
</div>
</div>
{% endfor %}
{% for topic_group in empty_topic_groups %}
<div class="internheader">
<h3>{{ topic_group.title }}<a class="headerlink" id="{{ topic_group.slug }}" href="#{{ topic_group.slug }}" title="Permalink to {{ topic_group.title }}" style="color: lightgrey;"> #</a></h3>
</div>
<div class="grid-x grid-padding-x">
<div class="cell large-2 medium-4 small-6">
<a href="{% url 'intern:topic-create' topic_group.slug %}">
<div class="intern-topic">
<div class="intern-topic-text">
+
@@ -48,7 +70,7 @@
<div class="grid-x grid-padding-x">
{% for tp in archive_topic %}
<div class="cell large-2 medium-4 small-6">
<a href="{% url 'topic' tp.slug %}">
<a href="{% url 'intern:topic' tp.slug %}">
<div class="intern-topic">
<div class="intern-topic-text">
{{ tp.title }}
@@ -59,7 +81,5 @@
{% endfor %}
</div>
{% endif %}
</div>
{% endblock %}

23
fet2020/templates/intern/task_create.html Normal file
View File

@@ -0,0 +1,23 @@
{% extends 'layout.html' %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'intern:topic' slug %}">Zurück</a>
</div>
</div>
<hr>
<h2>Neuen Task hinzufügen</h2>
<div class="grid-x">
<div class="cell">
<form action="" method="post">
{% csrf_token %}
{{ form }}
<input type="submit" class="button" name="btn_input" value="Hinzufügen">
</form>
</div>
</div>
</div>
{% endblock %}

24
fet2020/templates/intern/topic.html
View File

@@ -1,11 +1,11 @@
{% extends "layout.html" %}
{% block content %}
{% block content %}
<div class="grid-container">
<div class="grid-x grid-padding-x">
<div class="cell padding-top-1">
<h3>
<a href="{% url 'intern' %}#{{ active_topic.topic_group.slug }}">{{ active_topic.topic_group.title }}</a>
<a href="{% url 'intern:index' %}#{{ active_topic.topic_group.slug }}">{{ active_topic.topic_group.title }}</a>
/ {{ active_topic.title }}
</h3>
</div>
@@ -14,11 +14,13 @@
<div class="intern-hero">
<div class="grid-x padding-top-1 padding-left-1 padding-right-1">
<div class="cell large-3 medium-4 small-10">
<a class="button" href="{% url 'admin:intern_topic_change' active_topic.id %}">Thema bearbeiten</a>
</div>
<div class="cell large-3 medium-4 small-10">
<a class="button" href="{% url 'task-create' %}">neuen Task hinzufügen</a>
<a class="button" href="{% url 'intern:topic-update' active_topic.slug %}">Thema bearbeiten</a>
</div>
{% if active_topic.task_list %}
<div class="cell large-3 medium-4 small-10">
<a class="button" href="{% url 'intern:task-create' active_topic.slug %}">neuen Task hinzufügen</a>
</div>
{% endif %}
</div>
{% if active_topic.description %}
@@ -34,18 +36,17 @@
{% for task in tasks %}
<div class="cell">
<a href="{% url 'task-detail' task.id %}">{{ task }}</a>
<a href="{% url 'tasks:task-detail' task.id %}">{{ task }}</a>
</div>
{% endfor %}
</div>
<hr>
{% endif %}
<div class="grid-x grid-padding-x">
{% for docu in docus %}
<div class="cell large-2 medium-4 small-6">
<a href="{% url 'docu' active_topic.slug docu.slug %}">
<a href="{% url 'intern:docu' active_topic.slug docu.slug %}">
<div class="intern-topic">
<div class="intern-topic-text">
{{ docu.title }}
@@ -56,7 +57,7 @@
{% endfor %}
<div class="cell large-2 medium-4 small-6">
<a href="{% url 'admin:intern_documentation_add' %}">
<a href="{% url 'intern:docu-create' active_topic.slug %}">
<div class="intern-topic">
<div class="intern-topic-text">
+
@@ -64,10 +65,7 @@
</div>
</a>
</div>
</div>
</div>
</div>
{% endblock %}

23
fet2020/templates/intern/topic/topic_create.html Normal file
View File

@@ -0,0 +1,23 @@
{% extends "layout.html" %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'intern:index' %}">Zurück</a>
</div>
</div>
<hr>
<h2>Neues Thema erstellen</h2>
<div class="grid-x">
<div class="cell">
<form action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form }}
<input type="submit" class="button" name="btn_input" value="Hinzufügen">
</form>
</div>
</div>
</div>
{% endblock %}

26
fet2020/templates/intern/topic/topic_update.html Normal file
View File

@@ -0,0 +1,26 @@
{% extends "layout.html" %}
{% block content %}
<div class="grid-container">
<div class="grid-x padding-top-1">
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'intern:topic' slug %}">Zurück</a>
</div>
<div class="cell large-3 medium-4 small-12">
<a class="button" href="{% url 'admin:intern_topic_change' topic.id %}">Thema im Admin bearbeiten</a>
</div>
</div>
<hr>
<h2>Thema '{{ topic.title }}' bearbeiten</h2>
<div class="grid-x">
<div class="cell">
<form action="" method="post" enctype="multipart/form-data">
{% csrf_token %}
{{ form }}
<input type="submit" class="button" name="btn_input" value="Bearbeiten">
</form>
</div>
</div>
</div>
{% endblock %}