diff --git a/README.md b/README.md index fc735cb..820f1a4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Django-Learn -Repo following tutorial @ +✅ Repo following tutorial @ https://docs.djangoproject.com/en/3.2/intro/ ✅ Login Page tutorial @ diff --git a/djlearn/djlearn/settings.py b/djlearn/djlearn/settings.py index b114ab5..af8da93 100644 --- a/djlearn/djlearn/settings.py +++ b/djlearn/djlearn/settings.py @@ -56,7 +56,7 @@ ROOT_URLCONF = 'djlearn.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [BASE_DIR / 'templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/djlearn/polls/admin.py b/djlearn/polls/admin.py index ee4e60e..70ef834 100644 --- a/djlearn/polls/admin.py +++ b/djlearn/polls/admin.py @@ -3,5 +3,18 @@ from .models import Question, Choice # Register your models here. -admin.site.register(Question) -admin.site.register(Choice) +class ChoiceInline(admin.TabularInline): + model = Choice + extra = 1 + +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/djlearn/polls/models.py b/djlearn/polls/models.py index 09dfc52..f0e2bb7 100644 --- a/djlearn/polls/models.py +++ b/djlearn/polls/models.py @@ -2,6 +2,7 @@ import datetime from django.db import models from django.utils import timezone +from django.contrib import admin # Create your models here. @@ -11,6 +12,11 @@ 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() return now - datetime.timedelta(days=1) <= self.pub_date <= now diff --git a/djlearn/templates/admin/app_list.html b/djlearn/templates/admin/app_list.html new file mode 100644 index 0000000..ea4a85b --- /dev/null +++ b/djlearn/templates/admin/app_list.html @@ -0,0 +1,40 @@ +{% load i18n %} + +{% if app_list %} + {% for app in app_list %} +
+ + + {% for model in app.models %} + + {% if model.admin_url %} + + {% else %} + + {% endif %} + + {% if model.add_url %} + + {% else %} + + {% endif %} + + {% if model.admin_url and show_changelinks %} + {% if model.view_only %} + + {% else %} + + {% endif %} + {% elif show_changelinks %} + + {% endif %} + + {% endfor %} +
+ {{ app.name }} +
{{ model.name }}{{ model.name }}{% translate 'Add' %}{% translate 'View' %}{% translate 'Change' %}
+
+ {% endfor %} +{% else %} +

{% translate 'You don’t have permission to view or edit anything.' %}

+{% endif %} diff --git a/djlearn/templates/admin/base.html b/djlearn/templates/admin/base.html new file mode 100644 index 0000000..e3788b9 --- /dev/null +++ b/djlearn/templates/admin/base.html @@ -0,0 +1,104 @@ +{% load i18n static %} +{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} + + +{% block title %}{% endblock %} + +{% if not is_popup and is_nav_sidebar_enabled %} + + +{% endif %} +{% block extrastyle %}{% endblock %} +{% if LANGUAGE_BIDI %}{% endif %} +{% block extrahead %}{% endblock %} +{% block responsive %} + + + {% if LANGUAGE_BIDI %}{% endif %} +{% endblock %} +{% block blockbots %}{% endblock %} + +{% load i18n %} + + + + +
+ + {% if not is_popup %} + + + + {% block breadcrumbs %} +
+ {% translate 'Home' %} + {% if title %} › {{ title }}{% endif %} +
+ {% endblock %} + {% endif %} + +
+ {% if not is_popup and is_nav_sidebar_enabled %} + {% block nav-sidebar %} + {% include "admin/nav_sidebar.html" %} + {% endblock %} + {% endif %} +
+ {% block messages %} + {% if messages %} +
    {% for message in messages %} + {{ message|capfirst }} + {% endfor %}
+ {% endif %} + {% endblock messages %} + +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content_subtitle %}{% if subtitle %}

{{ subtitle }}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+
+ + {% block footer %}{% endblock %} +
+
+
+ + + diff --git a/djlearn/templates/admin/base_site.html b/djlearn/templates/admin/base_site.html new file mode 100644 index 0000000..d6ac408 --- /dev/null +++ b/djlearn/templates/admin/base_site.html @@ -0,0 +1,9 @@ +{% extends "admin/base.html" %} + +{% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | Admin {% endblock %} + +{% block branding %} +

myPolls

+{% endblock %} + +{% block nav-global %}{% endblock %} diff --git a/djlearn/templates/admin/index.html b/djlearn/templates/admin/index.html new file mode 100644 index 0000000..b6e84b6 --- /dev/null +++ b/djlearn/templates/admin/index.html @@ -0,0 +1,50 @@ +{% extends "admin/base_site.html" %} +{% load i18n static %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block coltype %}colMS{% endblock %} + +{% block bodyclass %}{{ block.super }} dashboard{% endblock %} + +{% block breadcrumbs %}{% endblock %} + +{% block nav-sidebar %}{% endblock %} + +{% block content %} +
+ {% include "admin/app_list.html" with app_list=app_list show_changelinks=True %} +
+{% endblock %} + +{% block sidebar %} +
+
+

{% translate 'Recent actions' %}

+

{% translate 'My actions' %}

+ {% load log %} + {% get_admin_log 10 as admin_log for_user user %} + {% if not admin_log %} +

{% translate 'None available' %}

+ {% else %} + + {% endif %} +
+
+{% endblock %} diff --git a/djlearn/templates/admin/nav_sidebar.html b/djlearn/templates/admin/nav_sidebar.html new file mode 100644 index 0000000..32c5b8f --- /dev/null +++ b/djlearn/templates/admin/nav_sidebar.html @@ -0,0 +1,5 @@ +{% load i18n %} + +