From 3e8f8acfb72323dafdc6c33cc0d0f2b726eef0e0 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Mon, 3 Jan 2022 17:45:38 +0000 Subject: [PATCH] add buttons --- fet2020/templates/intern/docu.html | 92 +++++++----------------- fet2020/templates/intern/index.html | 17 +++++ fet2020/templates/intern/topic.html | 18 ++++- fet2020/templates/tasks/task_create.html | 7 +- fet2020/templates/tasks/task_detail.html | 10 +-- 5 files changed, 69 insertions(+), 75 deletions(-) diff --git a/fet2020/templates/intern/docu.html b/fet2020/templates/intern/docu.html index 3de34b35..1f7d93c8 100644 --- a/fet2020/templates/intern/docu.html +++ b/fet2020/templates/intern/docu.html @@ -13,80 +13,33 @@
+ + {% if request.user.is_authenticated %} + + {% endif %} + {% if active_docu.description %}
- Beschreibung bearbeiten -
{{ active_docu.description|safe }}
{% endif %} - will man diese Buttons haben? - -
- - oder direkt hier es erstellen? -
- {% csrf_token %} - -
- - {{ form_add_etherpad.management_form }} - - {% for form in form_add_etherpad %} -
- {{ form }} -
- {% endfor %} - - {{ form_add_etherpad.non_field_errors }} - -
- -
-
-
- -
- {% csrf_token %} - -
- - {{ form_add_file.management_form }} - - {% for form in form_add_file %} -
- {{ form }} -
- {% endfor %} - - {{ form_add_file.non_field_errors }} - -
- -
-
-
- - {% for message in messages %} -

{{message}}

- {% endfor %} - -
- -
- {% if documents %} Etherpad Dokumente: + +
+
+

+ neues Etherpad erstellen

+
+
+
+ {% for document in documents %}
@@ -99,10 +52,16 @@
{% endfor %} - {% endif %} - {% if files %} Dokumente: + +
+
+

+ neue Datei hochladen

+
+
+
+ {% for file in files %}
@@ -115,7 +74,6 @@
{% endfor %} - {% endif %}
diff --git a/fet2020/templates/intern/index.html b/fet2020/templates/intern/index.html index 5f2b5b28..ff3fd4c6 100644 --- a/fet2020/templates/intern/index.html +++ b/fet2020/templates/intern/index.html @@ -2,6 +2,14 @@ {% block content %}
+
+ {% if request.user.is_authenticated %} + + {% endif %} +
+ {% regroup topic by topic_group as topic_list %} {% for topic in topic_list %}
@@ -20,6 +28,15 @@
{% endfor %} +
{% endfor %} diff --git a/fet2020/templates/intern/topic.html b/fet2020/templates/intern/topic.html index 80ac64db..2d489faf 100644 --- a/fet2020/templates/intern/topic.html +++ b/fet2020/templates/intern/topic.html @@ -14,7 +14,7 @@
neuen Task hinzufügen @@ -22,10 +22,10 @@
{% if active_topic.description %} -
+
{{ active_topic.description|safe }} +
-
{% endif %} {% if tasks %} @@ -54,6 +54,18 @@
{% endfor %} + + + +
diff --git a/fet2020/templates/tasks/task_create.html b/fet2020/templates/tasks/task_create.html index f4e71e16..56458b7e 100644 --- a/fet2020/templates/tasks/task_create.html +++ b/fet2020/templates/tasks/task_create.html @@ -3,7 +3,12 @@

diff --git a/fet2020/templates/tasks/task_detail.html b/fet2020/templates/tasks/task_detail.html index 8b9a02bf..3c60a5af 100644 --- a/fet2020/templates/tasks/task_detail.html +++ b/fet2020/templates/tasks/task_detail.html @@ -2,12 +2,14 @@ {% block content %}