diff --git a/Django/mysite/db.sqlite3 b/Django/mysite/db.sqlite3 index 80b5f5a..f746306 100644 Binary files a/Django/mysite/db.sqlite3 and b/Django/mysite/db.sqlite3 differ diff --git a/Django/mysite/mysite/settings.py b/Django/mysite/mysite/settings.py index 4257e30..ba2a3dc 100644 --- a/Django/mysite/mysite/settings.py +++ b/Django/mysite/mysite/settings.py @@ -55,7 +55,7 @@ ROOT_URLCONF = 'mysite.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [BASE_DIR / "templates"], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/Django/mysite/polls/admin.py b/Django/mysite/polls/admin.py index 1f194a0..a60697e 100644 --- a/Django/mysite/polls/admin.py +++ b/Django/mysite/polls/admin.py @@ -1,6 +1,22 @@ from django.contrib import admin -# Register your models here. -from .models import Question +from .models import Choice, Question -admin.site.register(Question) \ No newline at end of file + +class ChoiceInline(admin.TabularInline): + model = Choice + extra = 3 + + +class QuestionAdmin(admin.ModelAdmin): + fieldsets = [ + (None, {"fields": ["question_text"]}), + ("Date information", {"fields": ["pub_date"], "classes": ["collapse"]}), + ] + inlines = [ChoiceInline] + list_display = ["question_text", "pub_date", "was_published_recently"] + list_filter = ["pub_date"] + search_fields = ["question_text"] + + +admin.site.register(Question, QuestionAdmin) \ No newline at end of file diff --git a/Django/mysite/polls/models.py b/Django/mysite/polls/models.py index ab7ddba..bc46f33 100644 --- a/Django/mysite/polls/models.py +++ b/Django/mysite/polls/models.py @@ -1,6 +1,8 @@ import datetime from django.db import models from django.utils import timezone +from django.contrib import admin + # Create your models here. @@ -10,6 +12,14 @@ class Question(models.Model): def __str__(self): return self.question_text + + @admin.display( + boolean=True, + ordering="pub_date", + description="Published recently?", + ) + + def was_published_recently(self): now = timezone.now() diff --git a/Django/mysite/templates/admin/base_site.html b/Django/mysite/templates/admin/base_site.html new file mode 100644 index 0000000..6aa80af --- /dev/null +++ b/Django/mysite/templates/admin/base_site.html @@ -0,0 +1,12 @@ +{% extends "admin/base.html" %} + +{% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %} + +{% block branding %} +
Polls Administration
+{% if user.is_anonymous %} + {% include "admin/color_theme_toggle.html" %} +{% endif %} +{% endblock %} + +{% block nav-global %}{% endblock %} \ No newline at end of file