Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
roomlist
Commits
7fb57669
Commit
7fb57669
authored
Dec 22, 2016
by
Daniel W Bond
Browse files
merged nander13's ye olde changed to upgrade to 1.9!
parents
d2f05419
fa96f773
Changes
5
Hide whitespace changes
Inline
Side-by-side
requirements.txt
View file @
7fb57669
argparse
==1.2.1
beautifulsoup4
==4.
3.2
Django
==1.
8
.1
5
beautifulsoup4
==4.
4.1
Django
==1.
9
.1
2
django-allauth
==0.28.0
django-analytical
==
0.19
.0
django-analytical
==
1.0
.0
django-autoslug
==1.9.3
django-braces
==1.
4.0
django-braces
==1.
8.1
django-cas-client
==1.2.0
django-crispy-forms
==1.
4.0
django-crispy-forms
==1.
5.2
django-filter
==0.12.0
django-gravatar2
==1.
1.4
django-haystack
==2.
3
.1
django-localflavor
==1.
0
django-model-utils
==2.
2
django-gravatar2
==1.
3.0
django-haystack
==2.
4
.1
django-localflavor
==1.
2
django-model-utils
==2.
4
django-multiselectfield
==0.1.3
django-randomslugfield
==0.3.0
django-ratelimit
==0.6.0
django-redis-cache
==
0.13.0
django-redis-cache
==
1.6.4
djangorestframework
==3.3.2
flake8
==2.
4
.0
flake8
==2.
5
.0
gunicorn
==19.6.0
Markdown
==2.6.5
mccabe
==0.3
mccabe
==0.3
.1
MySQL-python
==1.2.5
oauthlib
==2.0.0
pep8
==1.
5.7
pyflakes
==
0.8.1
pep8
==1.
6.2
pyflakes
==
1.0.0
python-openid
==2.2.5
redis
==2.10.
3
redis
==2.10.
5
requests
==2.11.1
requests-oauthlib
==0.7.0
six
==1.
8
.0
six
==1.
10
.0
wsgiref
==0.1.2
wheel
==0.2
4
.0
Whoosh
==2.
6
.0
wheel
==0.2
6
.0
Whoosh
==2.
7
.0
roomlist/settings/production.py
View file @
7fb57669
...
...
@@ -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
...
...
roomlist/settings/settings.py
View file @
7fb57669
...
...
@@ -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'
,
...
...
roomlist/templates/layouts/base.html
View file @
7fb57669
<!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>
roomlist/templates/layouts/navbar.html
View file @
7fb57669
...
...
@@ -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 %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment