From 5bd92689e13d516a6168651a023332d07c803c9c Mon Sep 17 00:00:00 2001 From: CDaut Date: Sat, 25 Jun 2022 16:37:22 +0200 Subject: [PATCH] added topic view on the left --- markdownblog/blog/views.py | 12 +++- markdownblog/markdownblog/static/base.css | 17 ++++++ .../markdownblog/static/images/logo.svg | 61 +++++++++++++++++++ .../markdownblog/templates/base/base.html | 48 ++++++++++++--- .../markdownblog/templates/blog/index.html | 1 - .../templates/blog/tree_view_list_only.html | 21 +++++++ .../markdownblog/templates/blog/viewpost.html | 4 +- 7 files changed, 150 insertions(+), 14 deletions(-) create mode 100644 markdownblog/markdownblog/static/base.css create mode 100644 markdownblog/markdownblog/static/images/logo.svg create mode 100644 markdownblog/markdownblog/templates/blog/tree_view_list_only.html diff --git a/markdownblog/blog/views.py b/markdownblog/blog/views.py index 370cd85..a8635b4 100644 --- a/markdownblog/blog/views.py +++ b/markdownblog/blog/views.py @@ -31,12 +31,16 @@ def viewblog(request, title) -> HttpResponse: '{% autoescape off %}' + html_form_md + '{% endautoescape %}').render(Context({})) - context = {'post': post, 'html': rendered_html} + context = {'post': post, 'html': rendered_html, 'roottopics': Topic.objects.all().filter(rootTopic=None), + 'allposts': Blogpost.objects.all()} + return render(request, 'blog/viewpost.html', context) def index(request) -> HttpResponse: - return render(request, 'blog/index.html', {"debug": settings.DEBUG}) + context = {'roottopics': Topic.objects.all().filter(rootTopic=None), 'allposts': Blogpost.objects.all(), + 'debug': settings.DEBUG} + return render(request, 'blog/index.html', context) @login_required @@ -62,7 +66,9 @@ def order(request) -> HttpResponse: @login_required def addpost(request) -> HttpResponse: - context = {'alltopics': Topic.objects.all().order_by('name').values(), 'markdown': ''} + context = {'alltopics': Topic.objects.all().order_by('name').values(), 'markdown': '', + 'roottopics': Topic.objects.all().filter(rootTopic=None), + 'allposts': Blogpost.objects.all()} if request.method == 'POST': title = request.POST['title'] markdown = request.POST['markdown'] diff --git a/markdownblog/markdownblog/static/base.css b/markdownblog/markdownblog/static/base.css new file mode 100644 index 0000000..1d2b625 --- /dev/null +++ b/markdownblog/markdownblog/static/base.css @@ -0,0 +1,17 @@ +.no-liststyle { + list-style-type: none !important; + padding-left: 0 !important; +} + +.top-nav { + background-color: #35aca1 +} + +#root_list_left { + padding-left: revert !important; +} + +.postlink { + margin-left: 1.5em !important; + color: #039be5 !important; +} \ No newline at end of file diff --git a/markdownblog/markdownblog/static/images/logo.svg b/markdownblog/markdownblog/static/images/logo.svg new file mode 100644 index 0000000..439b03a --- /dev/null +++ b/markdownblog/markdownblog/static/images/logo.svg @@ -0,0 +1,61 @@ + + + + + + + + BLOG + + diff --git a/markdownblog/markdownblog/templates/base/base.html b/markdownblog/markdownblog/templates/base/base.html index e0cc44a..8ceaf99 100644 --- a/markdownblog/markdownblog/templates/base/base.html +++ b/markdownblog/markdownblog/templates/base/base.html @@ -11,27 +11,56 @@ + {% block includehere %} {% endblock %}
-
diff --git a/markdownblog/markdownblog/templates/blog/index.html b/markdownblog/markdownblog/templates/blog/index.html index 9bcb57b..2e08f92 100644 --- a/markdownblog/markdownblog/templates/blog/index.html +++ b/markdownblog/markdownblog/templates/blog/index.html @@ -3,7 +3,6 @@ Willkommen! {% endblock %} {% block includehere %} - {% endblock %} {% block content %}

Willkommen!

diff --git a/markdownblog/markdownblog/templates/blog/tree_view_list_only.html b/markdownblog/markdownblog/templates/blog/tree_view_list_only.html new file mode 100644 index 0000000..75e27f4 --- /dev/null +++ b/markdownblog/markdownblog/templates/blog/tree_view_list_only.html @@ -0,0 +1,21 @@ +{% load tree_utils %} +
  • {{ topic.name }} + + {% if topic|has_children %} + + {% endif %} +
    • \ No newline at end of file diff --git a/markdownblog/markdownblog/templates/blog/viewpost.html b/markdownblog/markdownblog/templates/blog/viewpost.html index 427d465..47d7bae 100644 --- a/markdownblog/markdownblog/templates/blog/viewpost.html +++ b/markdownblog/markdownblog/templates/blog/viewpost.html @@ -12,7 +12,9 @@ {% endblock %} {% block content %} {% autoescape off %} - {{ html }} +
    + {{ html }} +
    {% endautoescape %}