diff --git a/application/templates/post_detail.html b/application/templates/post_detail.html
index ea3a0d5..84f8541 100644
--- a/application/templates/post_detail.html
+++ b/application/templates/post_detail.html
@@ -14,7 +14,7 @@ import from https://tutorial.djangogirls.org/en/template_extending/
{% else %}
Publish
-
+
{% endif %} {% if user.is_staff and user == post.author %}
@@ -29,21 +29,16 @@ import from https://tutorial.djangogirls.org/en/template_extending/
{{ post.title }}
{{ post.text|linebreaksbr }}
-
- Tags:
- {% for tag in post.tags.all %}
- {{ tag.name }}
- {% if not forloop.last %}, {% endif %}
- {% endfor %}
+ Tags: {% for tag in post.tags.all %}
+ {{ tag.name }}
+ {% if not forloop.last %}, {% endif %} {% endfor %}
+ {{ post.author }}
+ {% if user.is_staff %}
+
+ {% get_hit_count for post %} Benutzer haben diesen Post bereits gelesen!
+
+ {% endif %}
-
- Autor: {{ post.author }}
-
- {% if user.is_staff %}
-
- {% get_hit_count for post %} Benutzer haben diesen Post bereits gelesen!
-
- {% endif %}
{% endblock %}
\ No newline at end of file
diff --git a/application/views.py b/application/views.py
index 9710fc9..13844b9 100644
--- a/application/views.py
+++ b/application/views.py
@@ -123,13 +123,15 @@ def post_remove(request, pk):
def tag_list(request):
log = logging.getLogger('mysite')
u = User.objects.get(username=request.user)
+ posts = Post.objects.none()
if u:
tags_user = Tag.objects.filter(customuser__user = u)
log.info(tags_user)
for tag in tags_user:
- posts = Post.objects.filter(tags__in=[tag]).order_by('-published_date')
+ query = Post.objects.filter(tags__in=[tag]).order_by('-published_date')
+ posts = posts | query
log.info(posts)
- return render(request, 'tag_list.html', locals())
+ return render(request, 'tag_list.html', {'posts': posts})
@login_required
def search_add(request):
diff --git a/doc/BA-Verteidigung.key b/doc/BA-Verteidigung.key
index 06d27e3..ed1bf98 100755
Binary files a/doc/BA-Verteidigung.key and b/doc/BA-Verteidigung.key differ
diff --git a/doc/Verteidigung-Notizen.pages b/doc/Verteidigung-Notizen.pages
new file mode 100644
index 0000000..1c3208e
Binary files /dev/null and b/doc/Verteidigung-Notizen.pages differ
diff --git a/doc/abonnieren_video.mov b/doc/abonnieren_video.mov
new file mode 100644
index 0000000..ff15359
Binary files /dev/null and b/doc/abonnieren_video.mov differ
diff --git a/doc/abonnieren_video_slow.mov b/doc/abonnieren_video_slow.mov
new file mode 100644
index 0000000..bf3ad8b
Binary files /dev/null and b/doc/abonnieren_video_slow.mov differ
diff --git a/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.log b/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.log
index 145b5c9..01304f4 100644
--- a/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.log
+++ b/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.log
@@ -1,4 +1,4 @@
-This is XeTeX, Version 3.14159265-2.6-0.99999 (TeX Live 2018) (preloaded format=xelatex 2018.6.7) 10 DEC 2018 17:28
+This is XeTeX, Version 3.14159265-2.6-0.99999 (TeX Live 2018) (preloaded format=xelatex 2018.6.7) 10 DEC 2018 22:23
entering extended mode
\write18 enabled.
file:line:error style messages enabled.
@@ -2382,4 +2382,25 @@ Package babel Info: Redefining german shorthand "~
(babel) in language on input line 78.
[35]
Package atveryend Info: Empty hook `AfterLastShipout' on input line 78.
- (/Users/Esthi/the
\ No newline at end of file
+ (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.aux (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/titlepage/titlepage.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/abstract/abstract.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/chapters/einleitung.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/chapters/framework.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/chapters/prototyp.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/chapters/ergebnis.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/chapters/ausblick.aux) (/Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/chapters/fazit.aux))
+Package atveryend Info: Empty hook `AtVeryEndDocument' on input line 78.
+Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 78.
+Package rerunfilecheck Info: File `bachelorabeit_EstherKleinhenz.out' has not changed.
+(rerunfilecheck) Checksum: 1C7F7EA8FD90A663BA0DCEA09291597A.
+
+
+LaTeX Font Warning: Some font shapes were not available, defaults substituted.
+
+Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 78.
+ )
+(\end occurred when \ifnum on line 5 was incomplete)
+Here is how much of TeX's memory you used:
+ 27401 strings out of 492970
+ 489936 string characters out of 6133939
+ 562461 words of memory out of 5000000
+ 30983 multiletter control sequences out of 15000+600000
+ 559401 words of font info for 77 fonts, out of 8000000 for 9000
+ 1348 hyphenation exceptions out of 8191
+ 44i,18n,50p,10437b,951s stack positions out of 5000i,500n,10000p,200000b,80000s
+
+Output written on /Users/Esthi/thesis_ek/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.pdf (40 pages).
diff --git a/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.pdf b/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.pdf
deleted file mode 100644
index 87d0465..0000000
Binary files a/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.pdf and /dev/null differ
diff --git a/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.synctex(busy) b/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.synctex(busy)
deleted file mode 100644
index 3072930..0000000
Binary files a/doc/bachelorarbeit_EstherKleinhenz/.texpadtmp/bachelorabeit_EstherKleinhenz.synctex(busy) and /dev/null differ
diff --git a/doc/bachelorarbeit_EstherKleinhenz/bachelorabeit_EstherKleinhenz.pdf b/doc/bachelorarbeit_EstherKleinhenz/bachelorabeit_EstherKleinhenz.pdf
index 95db086..dafc7a4 100644
Binary files a/doc/bachelorarbeit_EstherKleinhenz/bachelorabeit_EstherKleinhenz.pdf and b/doc/bachelorarbeit_EstherKleinhenz/bachelorabeit_EstherKleinhenz.pdf differ
diff --git a/doc/bachelorarbeit_EstherKleinhenz/titlepage/titlepage.tex b/doc/bachelorarbeit_EstherKleinhenz/titlepage/titlepage.tex
index 9b14d69..6ae2947 100755
--- a/doc/bachelorarbeit_EstherKleinhenz/titlepage/titlepage.tex
+++ b/doc/bachelorarbeit_EstherKleinhenz/titlepage/titlepage.tex
@@ -23,7 +23,7 @@
\vspace{3.2cm}
-\raggedright{ Abgabedatum: \today}\\
+\raggedright{ Abgabedatum: 11. Dezember 2018}\\
\raggedright { Betreuer: Prof. Dr. Oliver Hofmann}\\
\vspace{0.4cm}
diff --git a/doc/emptypage.pdf b/doc/emptypage.pdf
deleted file mode 100644
index 75f3c69..0000000
Binary files a/doc/emptypage.pdf and /dev/null differ
diff --git a/doc/img/django-cycle.jpeg b/doc/img/django-cycle.jpeg
new file mode 100644
index 0000000..77e2b7a
Binary files /dev/null and b/doc/img/django-cycle.jpeg differ
diff --git a/doc/img/django.png b/doc/img/django.png
new file mode 100644
index 0000000..2a1d873
Binary files /dev/null and b/doc/img/django.png differ
diff --git a/doc/img/pydja.png b/doc/img/pydja.png
new file mode 100644
index 0000000..fd48be3
Binary files /dev/null and b/doc/img/pydja.png differ
diff --git a/doc/img/python.png b/doc/img/python.png
new file mode 100644
index 0000000..dbe1e15
Binary files /dev/null and b/doc/img/python.png differ
diff --git a/doc/paperback.pages b/doc/paperback.pages
new file mode 100755
index 0000000..6db6388
Binary files /dev/null and b/doc/paperback.pages differ
diff --git a/log.txt b/log.txt
index d40a593..2f93ade 100644
--- a/log.txt
+++ b/log.txt
@@ -1,464 +1,274 @@
-[15/Nov/2018 11:29:37] INFO [mysite:149] , , , ]>
-[15/Nov/2018 11:30:31] INFO [mysite:146] , ]>
-[15/Nov/2018 11:30:31] INFO [mysite:149] , , ]>
-[15/Nov/2018 11:30:31] INFO [mysite:149] , , , ]>
-[15/Nov/2018 11:30:41] INFO [mysite:146] , ]>
-[15/Nov/2018 11:30:41] INFO [mysite:149] , , ]>
-[15/Nov/2018 11:30:41] INFO [mysite:149] , , , ]>
-[15/Nov/2018 11:30:52] INFO [mysite:146] , ]>
-[15/Nov/2018 11:30:52] INFO [mysite:149] , , ]>
-[15/Nov/2018 11:30:52] INFO [mysite:149] , , , ]>
-[15/Nov/2018 11:31:01] INFO [mysite:146] , ]>
-[15/Nov/2018 11:31:01] INFO [mysite:149] , , ]>
-[15/Nov/2018 11:31:01] INFO [mysite:149] , , , ]>
-[15/Nov/2018 11:31:11] INFO [mysite:146] , ]>
-[15/Nov/2018 11:31:11] INFO [mysite:149] , , ]>
-[15/Nov/2018 11:31:11] INFO [mysite:149] , , , ]>
-[15/Nov/2018 11:48:01] INFO [mysite:157] None
-[15/Nov/2018 11:48:29] INFO [mysite:157] hi
-[15/Nov/2018 17:44:00] INFO [mysite:157] hi
-[15/Nov/2018 17:45:30] INFO [mysite:157] hi
-[15/Nov/2018 17:46:41] INFO [mysite:157] hi
-[15/Nov/2018 17:46:57] INFO [mysite:157] hi
-[15/Nov/2018 17:47:53] INFO [mysite:157] hi
-[15/Nov/2018 17:48:27] INFO [mysite:157] hi
-[15/Nov/2018 17:49:18] INFO [mysite:157] hi
-[15/Nov/2018 17:49:51] INFO [mysite:157] hi
-[15/Nov/2018 17:51:05] INFO [mysite:157] hi
-[15/Nov/2018 18:33:51] INFO [mysite:157] hi
-[15/Nov/2018 18:34:10] INFO [mysite:157] hi
-[15/Nov/2018 18:34:36] INFO [mysite:157] hi
-[15/Nov/2018 18:35:08] INFO [mysite:157] hi
-[15/Nov/2018 18:35:33] INFO [mysite:157] hi
-[15/Nov/2018 18:35:40] INFO [mysite:157] hi
-[15/Nov/2018 18:36:04] INFO [mysite:157] hi
-[15/Nov/2018 18:36:37] INFO [mysite:157] hi
-[15/Nov/2018 18:37:59] INFO [mysite:157] hi
-[15/Nov/2018 18:38:04] INFO [mysite:157] None
-[15/Nov/2018 18:38:05] INFO [mysite:146] , ]>
-[15/Nov/2018 18:38:06] INFO [mysite:149] , , ]>
-[15/Nov/2018 18:38:06] INFO [mysite:149] , , , ]>
-[15/Nov/2018 18:38:18] INFO [mysite:146] , ]>
-[15/Nov/2018 18:38:18] INFO [mysite:149] , , ]>
-[15/Nov/2018 18:38:18] INFO [mysite:149] , , , ]>
-[15/Nov/2018 18:38:26] INFO [mysite:157] None
-[15/Nov/2018 18:38:56] INFO [mysite:157] None
-[15/Nov/2018 18:39:03] INFO [mysite:157] None
-[15/Nov/2018 18:39:30] INFO [mysite:157] None
-[15/Nov/2018 18:40:05] INFO [mysite:157] None
-[15/Nov/2018 18:40:14] INFO [mysite:157] None
-[15/Nov/2018 18:40:25] INFO [mysite:157] None
-[15/Nov/2018 18:40:36] INFO [mysite:157] None
-[15/Nov/2018 18:40:46] INFO [mysite:157] None
-[15/Nov/2018 18:41:09] INFO [mysite:157] None
-[15/Nov/2018 18:41:23] INFO [mysite:157] None
-[15/Nov/2018 18:42:09] INFO [mysite:157] None
-[15/Nov/2018 18:42:23] INFO [mysite:157] None
-[15/Nov/2018 18:43:17] INFO [mysite:157] None
-[15/Nov/2018 18:43:37] INFO [mysite:157] None
-[16/Nov/2018 13:07:18] INFO [mysite:146] , ]>
-[16/Nov/2018 13:07:18] INFO [mysite:149] , , ]>
-[16/Nov/2018 13:07:18] INFO [mysite:149] , , , ]>
-[16/Nov/2018 13:10:03] INFO [mysite:146] , ]>
-[16/Nov/2018 13:10:03] INFO [mysite:149] , , ]>
-[16/Nov/2018 13:10:03] INFO [mysite:149] , , , , ]>
-[16/Nov/2018 13:10:34] INFO [mysite:157] None
-[16/Nov/2018 13:11:18] INFO [mysite:162] post method
-[16/Nov/2018 13:11:18] INFO [mysite:165] form is valid
-[16/Nov/2018 13:11:18] INFO [mysite:169] ['hi', 'first', 'test', 'bayern', 'second', 'bla', 'sunday', 'studienbüro', 'two', 'visual studio code', 'wow', 'strange', 'hi there']
-[16/Nov/2018 13:11:18] INFO [mysite:172] two
-[16/Nov/2018 13:11:18] INFO [mysite:174] worked out
-[16/Nov/2018 13:11:18] INFO [mysite:157] None
-[16/Nov/2018 13:11:39] INFO [mysite:157] test
-[16/Nov/2018 13:11:52] INFO [mysite:59] , , ]>
-[16/Nov/2018 13:12:55] INFO [mysite:146]
-[16/Nov/2018 13:13:27] INFO [mysite:146] , , , , ]>
-[16/Nov/2018 13:13:27] INFO [mysite:149] , , ]>
-[16/Nov/2018 13:13:27] INFO [mysite:149] , , ]>
-[16/Nov/2018 13:13:27] INFO [mysite:149]
-[16/Nov/2018 13:13:27] INFO [mysite:149] , , , , ]>
-[16/Nov/2018 13:13:27] INFO [mysite:149] ]>
-[16/Nov/2018 13:28:47] INFO [mysite:145] , , ]>
-[16/Nov/2018 13:28:47] INFO [mysite:148] , , ]>
-[16/Nov/2018 13:28:47] INFO [mysite:148] , , , , ]>
-[16/Nov/2018 13:28:47] INFO [mysite:148] ]>
-[16/Nov/2018 13:28:50] INFO [mysite:145] , , ]>
-[16/Nov/2018 13:28:50] INFO [mysite:148] , , ]>
-[16/Nov/2018 13:28:50] INFO [mysite:148] , , , , ]>
-[16/Nov/2018 13:28:50] INFO [mysite:148] ]>
-[16/Nov/2018 13:28:52] INFO [mysite:145] , , ]>
-[16/Nov/2018 13:28:52] INFO [mysite:148] , , ]>
-[16/Nov/2018 13:28:52] INFO [mysite:148] , , , , ]>
-[16/Nov/2018 13:28:52] INFO [mysite:148] ]>
-[16/Nov/2018 13:33:26] INFO [mysite:145] , , , , ]>
-[16/Nov/2018 13:33:26] INFO [mysite:148] , , ]>
-[16/Nov/2018 13:33:26] INFO [mysite:148] , , ]>
-[16/Nov/2018 13:33:26] INFO [mysite:148]
-[16/Nov/2018 13:33:26] INFO [mysite:148] , , , , ]>
-[16/Nov/2018 13:33:26] INFO [mysite:148] ]>
-[16/Nov/2018 13:33:28] INFO [mysite:156] None
-[17/Nov/2018 14:55:06] INFO [mysite:156] None
-[17/Nov/2018 14:56:39] INFO [mysite:156] None
-[17/Nov/2018 15:00:30] INFO [mysite:156] None
-[17/Nov/2018 15:00:42] INFO [mysite:156] None
-[17/Nov/2018 15:00:45] INFO [mysite:156] None
-[17/Nov/2018 15:01:04] INFO [mysite:156] None
-[17/Nov/2018 15:01:47] INFO [mysite:156] None
-[17/Nov/2018 15:03:00] INFO [mysite:156] None
-[17/Nov/2018 15:03:20] INFO [mysite:156] None
-[17/Nov/2018 15:03:37] INFO [mysite:156] None
-[17/Nov/2018 15:04:41] INFO [mysite:156] None
-[17/Nov/2018 15:06:26] INFO [mysite:156] None
-[17/Nov/2018 15:06:36] INFO [mysite:145] , , ]>
-[17/Nov/2018 15:06:36] INFO [mysite:148] , , ]>
-[17/Nov/2018 15:06:36] INFO [mysite:148] , , , , ]>
-[17/Nov/2018 15:06:36] INFO [mysite:148] ]>
-[17/Nov/2018 15:06:42] INFO [mysite:156] None
-[17/Nov/2018 15:09:44] INFO [mysite:156] None
-[17/Nov/2018 15:10:11] INFO [mysite:156] None
-[17/Nov/2018 15:10:36] INFO [mysite:156] None
-[17/Nov/2018 15:10:46] INFO [mysite:156] None
-[17/Nov/2018 15:11:14] INFO [mysite:156] None
-[17/Nov/2018 15:11:23] INFO [mysite:156] None
-[17/Nov/2018 15:11:35] INFO [mysite:156] None
-[17/Nov/2018 15:11:44] INFO [mysite:156] None
-[17/Nov/2018 15:11:52] INFO [mysite:156] None
-[17/Nov/2018 15:13:06] INFO [mysite:156] None
-[17/Nov/2018 15:17:31] INFO [mysite:156] None
-[17/Nov/2018 15:17:50] INFO [mysite:156] None
-[17/Nov/2018 15:18:42] INFO [mysite:156] None
-[17/Nov/2018 15:19:25] INFO [mysite:156] None
-[17/Nov/2018 15:19:34] INFO [mysite:156] None
-[17/Nov/2018 15:19:59] INFO [mysite:156] None
-[17/Nov/2018 15:20:13] INFO [mysite:156] None
-[17/Nov/2018 15:20:21] INFO [mysite:156] None
-[17/Nov/2018 15:20:29] INFO [mysite:164] post method
-[17/Nov/2018 15:20:29] INFO [mysite:167] form is valid
-[17/Nov/2018 15:20:29] INFO [mysite:171] ['hi', 'first', 'test', 'bayern', 'second', 'bla', 'sunday', 'studienbüro', 'two', 'visual studio code', 'wow', 'strange', 'hi there']
-[17/Nov/2018 15:20:29] INFO [mysite:174] second
-[17/Nov/2018 15:20:29] INFO [mysite:176] worked out
-[17/Nov/2018 15:20:29] INFO [mysite:156] None
-[17/Nov/2018 18:24:17] INFO [mysite:156] None
-[17/Nov/2018 18:24:32] INFO [mysite:145] , , , ]>
-[17/Nov/2018 18:24:32] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:24:32] INFO [mysite:148] , , , , ]>
-[17/Nov/2018 18:24:32] INFO [mysite:148] ]>
-[17/Nov/2018 18:24:32] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:24:45] INFO [mysite:156] None
-[17/Nov/2018 18:25:07] INFO [mysite:156] None
-[17/Nov/2018 18:25:37] INFO [mysite:145] , , , ]>
-[17/Nov/2018 18:25:37] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:25:37] INFO [mysite:148] , , , , ]>
-[17/Nov/2018 18:25:37] INFO [mysite:148] ]>
-[17/Nov/2018 18:25:37] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:25:47] INFO [mysite:156] None
-[17/Nov/2018 18:26:13] INFO [mysite:156] None
-[17/Nov/2018 18:29:34] INFO [mysite:156] None
-[17/Nov/2018 18:30:24] INFO [mysite:156] None
-[17/Nov/2018 18:30:36] INFO [mysite:145] , , , ]>
-[17/Nov/2018 18:30:36] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:30:36] INFO [mysite:148] , , , , ]>
-[17/Nov/2018 18:30:36] INFO [mysite:148] ]>
-[17/Nov/2018 18:30:36] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:31:46] INFO [mysite:145] , , , ]>
-[17/Nov/2018 18:31:46] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:31:46] INFO [mysite:148] , , , , ]>
-[17/Nov/2018 18:31:47] INFO [mysite:148] ]>
-[17/Nov/2018 18:31:47] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:33:24] INFO [mysite:145] , , , ]>
-[17/Nov/2018 18:33:24] INFO [mysite:148] , , ]>
-[17/Nov/2018 18:33:24] INFO [mysite:148] , , , , ]>
-[17/Nov/2018 18:33:24] INFO [mysite:148] ]>
-[17/Nov/2018 18:33:24] INFO [mysite:148] , ,