summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpnshiralkar2020-05-14 16:26:01 +0530
committerpnshiralkar2020-05-14 16:26:01 +0530
commitc23bbd34b4f31002c47ef6167144f104b74b5b71 (patch)
treec0a33682ef7478ab2e8f78b7ca56f265a2d12d84
parent778a1d2d8100ad0e2bfc2ce98bf610c9961f4a5e (diff)
downloadworkshop_booking-c23bbd34b4f31002c47ef6167144f104b74b5b71.tar.gz
workshop_booking-c23bbd34b4f31002c47ef6167144f104b74b5b71.tar.bz2
workshop_booking-c23bbd34b4f31002c47ef6167144f104b74b5b71.zip
Improved Adminsite view, changed CDN to static files
-rw-r--r--cms/admin.py29
-rw-r--r--cms/templates/cms_base.html18
-rw-r--r--cms/views.py2
3 files changed, 31 insertions, 18 deletions
diff --git a/cms/admin.py b/cms/admin.py
index 8918797..595793e 100644
--- a/cms/admin.py
+++ b/cms/admin.py
@@ -1,9 +1,30 @@
from django.contrib import admin
+
from cms.models import *
+
# Register your models here.
-admin.site.register(Nav)
-admin.site.register(SubNav)
-admin.site.register(Page)
-admin.site.register(StaticFile)
+class NavAdmin(admin.ModelAdmin):
+ list_display = ['name', 'link', 'position']
+ ordering = ['position']
+
+
+class SubNavAdmin(admin.ModelAdmin):
+ list_display = ['name', 'nav', 'link', 'position']
+ ordering = ['nav', 'position']
+ list_filter = ['nav']
+
+
+class PageAdmin(admin.ModelAdmin):
+ list_display = ['title', 'permalink', 'pub_date']
+
+
+class StaticFileAdmin(admin.ModelAdmin):
+ list_display = ['filename', 'file']
+
+
+admin.site.register(Nav, NavAdmin)
+admin.site.register(SubNav, SubNavAdmin)
+admin.site.register(Page, PageAdmin)
+admin.site.register(StaticFile, StaticFileAdmin)
diff --git a/cms/templates/cms_base.html b/cms/templates/cms_base.html
index c2683f3..90d0e2b 100644
--- a/cms/templates/cms_base.html
+++ b/cms/templates/cms_base.html
@@ -1,22 +1,16 @@
<!DOCTYPE html>
<html lang="en">
+{% load static %}
<head>
<meta charset="UTF-8">
<title>{{ page.title }}</title>
- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
- integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+ <link rel="stylesheet" href="{% static 'cms/css/bootstrap.min.css' %}">
- <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
- integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
- crossorigin="anonymous"></script>
- <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
- integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
- crossorigin="anonymous"></script>
+ <script src="{% static 'cms/js/jquery-3.4.1.slim.min.js' %}"></script>
+ <script src="{% static 'cms/js/popper.min.js' %}"></script>
{{ page.imports | safe }}
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
- integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
- crossorigin="anonymous"></script>
- <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/base.css" type="text/css"/>
+ <script src="{% static 'cms/js/bootstrap.min.js' %}"></script>
+ <link rel="stylesheet" href="{% static 'workshop_app/css/base.css' %}" type="text/css"/>
</head>
<body>
diff --git a/cms/views.py b/cms/views.py
index 8a324f4..0b74822 100644
--- a/cms/views.py
+++ b/cms/views.py
@@ -20,8 +20,6 @@ def home(request, permalink=''):
nav_obj['subnavs'] = subnav_objects.filter(nav=nav).order_by('position')
navs.insert(-1, nav_obj)
- print(navs)
-
if page.exists():
page = page.first()
else: