Commit 630706e9 authored by Patrick Kimber's avatar Patrick Kimber

doc, django 1.8 and move 'base.html' to 'dash' #983

parent be17f11d
...@@ -30,12 +30,7 @@ Usage ...@@ -30,12 +30,7 @@ Usage
:: ::
py.test -x && \ ../init_dev.sh
touch temp.db && rm temp.db && \
django-admin migrate --noinput && \
django-admin demo_data_login && \
django-admin demo_data_booking && \
django-admin runserver
Release Release
======= =======
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block sub_title %} {% block sub_title %}
Calendar event Calendar event
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block sub_title %} {% block sub_title %}
Calendar event Calendar event
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block title %} {% block title %}
Booking categories Booking categories
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block sub_title %} {% block sub_title %}
Event location Event location
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% load thumbnail %} {% load thumbnail %}
{% block title %} {% block title %}
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block sub_title %} {% block sub_title %}
Rota Rota
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block sub_title %} {% block sub_title %}
Rota type Rota type
......
{% extends 'project/base.html' %} {% extends 'dash/base.html' %}
{% block title %} {% block title %}
Rota types Rota types
......
...@@ -3,15 +3,12 @@ ...@@ -3,15 +3,12 @@
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
DEBUG = True DEBUG = True
TEMPLATE_DEBUG = DEBUG
TESTING = False TESTING = False
THUMBNAIL_DEBUG = DEBUG THUMBNAIL_DEBUG = DEBUG
SESSION_COOKIE_SECURE = False SESSION_COOKIE_SECURE = False
CSRF_COOKIE_SECURE = False CSRF_COOKIE_SECURE = False
TEMPLATE_STRING_IF_INVALID = '**** INVALID EXPRESSION: %s ****'
ADMINS = ( ADMINS = (
('admin', 'code@pkimber.net'), ('admin', 'code@pkimber.net'),
) )
...@@ -91,15 +88,29 @@ MIDDLEWARE_CLASSES = ( ...@@ -91,15 +88,29 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'example_booking.urls' ROOT_URLCONF = 'example_booking.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
],
'string_if_invalid': '**** INVALID EXPRESSION: %s ****',
},
},
]
# Python dotted path to the WSGI application used by Django's runserver. # Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'example_booking.wsgi.application' WSGI_APPLICATION = 'example_booking.wsgi.application'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
DJANGO_APPS = ( DJANGO_APPS = (
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment