From 94573dc28b159ee609f8c32e8050a35c73d7af57 Mon Sep 17 00:00:00 2001 From: Esther Kleinhenz Date: Sun, 18 Nov 2018 18:39:08 +0100 Subject: [PATCH] added filter and some design things --- application/templates/base.html | 4 +- application/templates/post_list.html | 55 ++++---- application/templates/registration/login.html | 25 +++- application/templates/search_add.html | 47 +++---- application/templates/tag_list.html | 11 +- application/views.py | 4 +- .../bachelorabeit_EstherKleinhenz.aux | 2 +- .../bachelorabeit_EstherKleinhenz.lof | 3 + .../bachelorabeit_EstherKleinhenz.log | 120 ++++++++++++++---- .../bachelorabeit_EstherKleinhenz.out | 9 +- .../bachelorabeit_EstherKleinhenz.synctex.gz | Bin 167647 -> 176059 bytes .../bachelorabeit_EstherKleinhenz.toc | 11 +- .../.texpadtmp/chapters/ausblick.aux | 4 +- .../.texpadtmp/chapters/ergebnis.aux | 10 +- .../.texpadtmp/chapters/fazit.aux | 8 +- .../.texpadtmp/chapters/prototyp.aux | 14 +- .../bachelorabeit_EstherKleinhenz.pdf | Bin 1267566 -> 1724356 bytes .../chapters/Fazit.tex | 2 + .../chapters/prototyp.tex | 41 ++++-- .../figures/filtern.png | Bin 0 -> 97968 bytes .../figures/newsfeed.png | Bin 0 -> 177667 bytes .../figures/view-search-add.png | Bin 0 -> 268270 bytes log.txt | 73 +++++++++++ 23 files changed, 318 insertions(+), 125 deletions(-) create mode 100644 doc/bachelorarbeit_EstherKleinhenz/figures/filtern.png create mode 100644 doc/bachelorarbeit_EstherKleinhenz/figures/newsfeed.png create mode 100644 doc/bachelorarbeit_EstherKleinhenz/figures/view-search-add.png diff --git a/application/templates/base.html b/application/templates/base.html index 3d31ecc..85e3555 100644 --- a/application/templates/base.html +++ b/application/templates/base.html @@ -60,13 +60,13 @@ - {% else %} + {% elif user.is_authenticated %} + {% endif %} diff --git a/application/templates/post_list.html b/application/templates/post_list.html index 323b35b..06c5ec2 100644 --- a/application/templates/post_list.html +++ b/application/templates/post_list.html @@ -1,42 +1,41 @@ {% extends 'base.html' %} {% block content %}
- - {% if tag %}

Artikel mit dem Tag "{{ tag.name }}"

{% endif %}
-
-

Artikleübersicht

-
+
+

Artikleübersicht

+
-
+
-{% if messages %}
- {% for message in messages %} -

{{ message }}

- {% endfor %} -
-{% endif %} -{% for post in posts %} -
-
- {{ post.published_date }} + {% if messages %} +
+ {% for message in messages %} +

{{ message }}

+ {% endfor %} +
+ {% endif %} + {% for post in posts %} +
+
+ {{ post.published_date }} +
+

+ {{ post.title }} +

+

{{ post.text|linebreaks }}

+ Tags: {% for tag in post.tags.all %} + {{ tag.name }} + {% if not forloop.last %}, {% endif %} {% endfor %}

+ {{ post.author }} +

+
+ {% endfor %}
-

- {{ post.title }} -

-

{{ post.text|linebreaks }}

- Tags: {% for tag in post.tags.all %} - {{ tag.name }} - {% if not forloop.last %}, {% endif %} {% endfor %}

- {{ post.author }} -

-
-{% endfor %} -
{% endblock %} \ No newline at end of file diff --git a/application/templates/registration/login.html b/application/templates/registration/login.html index 5a192c8..c183dc9 100644 --- a/application/templates/registration/login.html +++ b/application/templates/registration/login.html @@ -28,5 +28,28 @@
- +
+
+
+
+ {% for post in posts %} +
+
+ {{ post.published_date }} +
+

+ {{ post.title }} +

+

{{ post.text|linebreaks }}

+ Tags: {% for tag in post.tags.all %} + {{ tag.name }} + {% if not forloop.last %}, {% endif %} {% endfor %}

+ {{ post.author }} +

+
+ {% endfor %} +
+
+
+
{% endblock %} \ No newline at end of file diff --git a/application/templates/search_add.html b/application/templates/search_add.html index e9e5b82..488d72d 100644 --- a/application/templates/search_add.html +++ b/application/templates/search_add.html @@ -1,13 +1,12 @@ {% extends "base.html" %} {% block content %} {% load taggit_templatetags2_tags %} -
-