From 65188e033ef47d89c3ae158961301637eb828458 Mon Sep 17 00:00:00 2001 From: Esther Kleinhenz Date: Sun, 15 Jul 2018 15:27:10 +0200 Subject: [PATCH] added post to admin.py and fixed css --- application/admin.py | 2 ++ application/migrations/0002_post_tags.py | 20 ++++++++++++++++++++ application/templates/base.html | 11 ++++++++--- application/views.py | 4 ++-- mysite/settings.py | 2 +- mysite/urls.py | 2 +- 6 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 application/migrations/0002_post_tags.py diff --git a/application/admin.py b/application/admin.py index 8c38f3f..72c9b3c 100644 --- a/application/admin.py +++ b/application/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin +from .models import Post +admin.site.register(Post) # Register your models here. diff --git a/application/migrations/0002_post_tags.py b/application/migrations/0002_post_tags.py new file mode 100644 index 0000000..6961c0c --- /dev/null +++ b/application/migrations/0002_post_tags.py @@ -0,0 +1,20 @@ +# Generated by Django 2.0.6 on 2018-07-15 12:30 + +from django.db import migrations +import taggit.managers + + +class Migration(migrations.Migration): + + dependencies = [ + ('taggit', '0002_auto_20150616_2121'), + ('application', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='post', + name='tags', + field=taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'), + ), + ] diff --git a/application/templates/base.html b/application/templates/base.html index 9d86d2a..81635a1 100644 --- a/application/templates/base.html +++ b/application/templates/base.html @@ -6,7 +6,7 @@ {% block title %}Seitenname{% endblock %} - + @@ -76,8 +76,13 @@ - {% block content %} {% endblock %} - +
+
+
+ {% block content %} {% endblock %} +
+
+
diff --git a/application/views.py b/application/views.py index 7c28bf0..424d2fe 100644 --- a/application/views.py +++ b/application/views.py @@ -35,13 +35,13 @@ def navlogin(request): context = {'error': error} return render(request, 'index.html', context) - +@login_required def post_list(request): posts = Post.objects.filter( published_date__lte=timezone.now()).order_by('published_date') return render(request, 'post_list.html', {'posts': posts}) - +@login_required def post_detail(request, pk): post = get_object_or_404(Post, pk=pk) return render(request, 'post_detail.html', {'post': post}) diff --git a/mysite/settings.py b/mysite/settings.py index 5e147a7..cf98f33 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -43,8 +43,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'taggit', 'application', + 'taggit', ] MIDDLEWARE = [ diff --git a/mysite/urls.py b/mysite/urls.py index 396df72..4d03099 100644 --- a/mysite/urls.py +++ b/mysite/urls.py @@ -23,8 +23,8 @@ import application.views urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name="index.html")), url(r'^admin/', admin.site.urls), url(r'^navlogin/', application.views.navlogin, name='navlogin'), url(r'^accounts/', include('django.contrib.auth.urls')), + url(r'', include('application.urls')) ] \ No newline at end of file