From 677e6a78d13d8141b0164d1fb675285a56bb467e Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Wed, 25 Nov 2015 19:39:11 +0000 Subject: [PATCH] Added content template --- project/pages/urls.py | 2 -- project/urls.py | 1 + static/src/less/style.less | 11 ++++++++++- templates/about/website.html | 12 ++++++++++++ templates/base.html | 8 ++++---- templates/content_base.html | 19 +++++++++++++++++++ templates/index.html | 6 +++--- 7 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 templates/about/website.html create mode 100644 templates/content_base.html diff --git a/project/pages/urls.py b/project/pages/urls.py index 6dbaf72..2ced6c6 100644 --- a/project/pages/urls.py +++ b/project/pages/urls.py @@ -5,7 +5,5 @@ from . import views urlpatterns = [ url(r'^about/website/$', views.AboutWebsiteView.as_view(), name='about-website'), url(r'^about/$', views.AboutIndexView.as_view(), name='about'), - url(r'^no-js/$', views.NoJavascriptView.as_view(), name='no-js'), - url(r'^404/$', views.Custom404View.as_view(), name='404'), url(r'^$', views.IndexView.as_view(), name='index') ] diff --git a/project/urls.py b/project/urls.py index 207aa27..89c7c3a 100644 --- a/project/urls.py +++ b/project/urls.py @@ -6,6 +6,7 @@ from project.pages.views import Custom404View, NoJavascriptView urlpatterns = [ url(r'^site-admin/', include(admin.site.urls)), url(r'^404/', Custom404View.as_view(), name="404"), + url(r'^404/', Custom404View.as_view(), name="404"), url(r'^no-js/', NoJavascriptView.as_view(), name="no-js"), url(r'', include('project.pages.urls', namespace='pages')) ] diff --git a/static/src/less/style.less b/static/src/less/style.less index 92d36b0..db41646 100644 --- a/static/src/less/style.less +++ b/static/src/less/style.less @@ -117,4 +117,13 @@ footer { float: right; } } -/* @end no-js*/ \ No newline at end of file +/* @end no-js*/ + +/* @group content base */ +.jumbotron.header { + padding-top: 10px; + padding-bottom: 10px; + background-color: #232323; + color: white; +} +/* @end content base */ \ No newline at end of file diff --git a/templates/about/website.html b/templates/about/website.html new file mode 100644 index 0000000..bce7cc6 --- /dev/null +++ b/templates/about/website.html @@ -0,0 +1,12 @@ +{% extends 'content_base.html' %} + +{% block htmlTitle %}About the website{% endblock %} + +{% block bodyClass %}{% endblock %} + +{% block pageTitle %}About my website{% endblock %} + +{% block content %} + + +{% endblock %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index c660e24..b955b92 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,15 +2,15 @@ - {% block htmltitle %}{% endblock %} | TheOrangeOne + {% block baseHtmlTitle %}{% endblock %} | TheOrangeOne - - {% block content%}{% endblock %} + + {% block baseContent%}{% endblock %}