Commit 7fb57669 authored by Daniel W Bond's avatar Daniel W Bond

merged nander13's ye olde changed to upgrade to 1.9!

parents d2f05419 fa96f773
......@@ -33,6 +33,7 @@ STATIC_ROOT = '/srv/roomlist/static'
# can haz ssl certs
ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
# use redis cache when not in local development
CACHES = {
'default': {
'BACKEND': 'redis_cache.RedisCache',
......@@ -71,7 +72,7 @@ LOGGING = {
'disable_existing_loggers': False,
'handlers': {
'file': {
'level': 'WARNING', # will log all errors
'level': 'WARNING',
'class': 'logging.FileHandler',
# make sure to change this to the proper path, and one that
# can be written to
......
......@@ -27,7 +27,7 @@ SECRET_KEY = secret.SECRET_KEY
DEBUG = True
# the domains this application will be deployed on, e.g. which
# domains this app should listen to requests from.
ALLOWED_HOSTS = ['127.0.0.1']
ALLOWED_HOSTS = ['localhost', '127.0.0.1']
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.7/howto/static-files/
......@@ -73,6 +73,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles',
'django.contrib.sites',
'django.contrib.humanize',
'cas',
# apps
'api',
'housing',
......@@ -81,7 +82,6 @@ INSTALLED_APPS = (
# packages
'crispy_forms',
'django_gravatar',
'analytical',
'randomslugfield',
'haystack',
'multiselectfield',
......@@ -109,7 +109,6 @@ MIDDLEWARE_CLASSES = (
'django.contrib.auth.middleware.AuthenticationMiddleware',
'cas.middleware.CASMiddleware',
'django.contrib.admindocs.middleware.XViewMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
......@@ -38,7 +37,6 @@
</head>
<body>
{% load piwik %}
<div id="wrap" style="display: flex;">
{% include 'layouts/navbar.html' %}
<div id="contentcontain" class="container">
......@@ -55,10 +53,5 @@
<script type="text/javascript" src="/static/js/bootstrap.min.js"></script>
{% block javascript %}
{% endblock javascript %}
{% comment %}
We are not presently using piwik as we do not have sufficient resources to devote.
{% piwik %}
{% endcomment %}
</body>
</html>
......@@ -39,6 +39,9 @@
<li class="visible-xs">
<a href="{% url 'update_student' request.user.username %}">Settings</a>
</li>
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}">Admin</a></li>
{% endif %}
<li><a href="{% url 'logout' %}">Logout</a>
</li>
{% else %}
......
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