diff --git a/marietje/marietje/context_processors.py b/marietje/marietje/context_processors.py new file mode 100644 index 0000000..170dd78 --- /dev/null +++ b/marietje/marietje/context_processors.py @@ -0,0 +1,6 @@ +from django.conf import settings + + +def global_settings(request): + return {'issues_url': settings.ISSUES_URL, 'contact_email': settings.CONTACT_EMAIL, + 'merge_requests_url': settings.MERGE_REQUESTS_URL} diff --git a/marietje/marietje/settings.py b/marietje/marietje/settings.py index 1d39fa7..402a1dd 100644 --- a/marietje/marietje/settings.py +++ b/marietje/marietje/settings.py @@ -66,6 +66,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'marietje.context_processors.global_settings', ], }, }, @@ -79,8 +80,12 @@ WSGI_APPLICATION = 'marietje.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'marietje', + 'USER': 'marietje', + 'PASSWORD': 'UYmINKUDXIfY1qudVhbr5UhJ61kVwZPA', + 'HOST': 'localhost', + 'PORT': '3306', } } @@ -155,3 +160,6 @@ CONTACT_EMAIL = 'marietje@science.ru.nl' STATS_TOP_COUNT = 50 STATS_REQUEST_IGNORE_USER_IDS = (51, 515) + +ISSUES_URL = 'https://gitlab.science.ru.nl/Marietje/MarietjeDjango/issues' +MERGE_REQUESTS_URL = 'https://gitlab.science.ru.nl/Marietje/MarietjeDjango/merge_requests' diff --git a/marietje/marietje/static/css/custom.css b/marietje/marietje/static/css/custom.css index 0009f9b..f97451c 100644 --- a/marietje/marietje/static/css/custom.css +++ b/marietje/marietje/static/css/custom.css @@ -17,3 +17,7 @@ #queue-time-header { cursor: pointer; } + +footer { + text-align: center; +} diff --git a/marietje/marietje/templates/base.html b/marietje/marietje/templates/base.html index 4449b3c..6426d87 100644 --- a/marietje/marietje/templates/base.html +++ b/marietje/marietje/templates/base.html @@ -7,7 +7,7 @@ Marietje 4.0 - {% block title %}{% endblock title %} - + @@ -69,5 +69,10 @@ {% endif %} {% block content %}{% endblock content %} +