diff --git a/src/c3nav/access/static/access/css/c3nav-access.css b/src/c3nav/access/static/access/css/c3nav-access.css index 3cf2f285..b765dd68 100644 --- a/src/c3nav/access/static/access/css/c3nav-access.css +++ b/src/c3nav/access/static/access/css/c3nav-access.css @@ -9,3 +9,19 @@ h1 { .login .container { max-width:420px; } + + +footer { + text-align:center; +} +.languages { + margin-bottom:0; + height:2px; +} +.languages button { + text-transform:none; + font-weight:normal; + margin-top:0 !important; + border-width:0 !important; + padding:0; +} diff --git a/src/c3nav/access/templates/access/base.html b/src/c3nav/access/templates/access/base.html index d8a088f5..71060762 100644 --- a/src/c3nav/access/templates/access/base.html +++ b/src/c3nav/access/templates/access/base.html @@ -19,6 +19,8 @@

c3nav access control

{% block content %} {% endblock %} + + {% include 'site/footer.html' %} {% compress js %} diff --git a/src/c3nav/settings.py b/src/c3nav/settings.py index e79c8722..d0ee5dd7 100644 --- a/src/c3nav/settings.py +++ b/src/c3nav/settings.py @@ -205,11 +205,6 @@ template_loaders = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ) -if not DEBUG: - template_loaders = ( - ('django.template.loaders.cached.Loader', template_loaders), - ) - TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -220,6 +215,7 @@ TEMPLATES = [ 'django.template.context_processors.debug', 'django.template.context_processors.i18n', 'django.template.context_processors.request', + 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', ], @@ -227,6 +223,11 @@ TEMPLATES = [ }, }, ] +if not DEBUG: + template_loaders = ( + ('django.template.loaders.cached.Loader', template_loaders), + ) + STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', diff --git a/src/c3nav/site/static/site/css/c3nav.css b/src/c3nav/site/static/site/css/c3nav.css index aa266d98..17fcac04 100644 --- a/src/c3nav/site/static/site/css/c3nav.css +++ b/src/c3nav/site/static/site/css/c3nav.css @@ -278,3 +278,15 @@ footer { padding-bottom: 18px; } } + +.languages { + margin-bottom:0; + height:2px; +} +.languages button { + text-transform:none; + font-weight:normal; + margin-top:0 !important; + border-width:0 !important; + padding:0; +} diff --git a/src/c3nav/site/templates/site/base.html b/src/c3nav/site/templates/site/base.html index 284e131d..fb138cf6 100644 --- a/src/c3nav/site/templates/site/base.html +++ b/src/c3nav/site/templates/site/base.html @@ -22,25 +22,7 @@ {% block content %} {% endblock %} - + {% include 'site/footer.html' %} {% compress js %} diff --git a/src/c3nav/site/templates/site/footer.html b/src/c3nav/site/templates/site/footer.html new file mode 100644 index 00000000..6db55cac --- /dev/null +++ b/src/c3nav/site/templates/site/footer.html @@ -0,0 +1,33 @@ +{% load i18n %} + + diff --git a/src/c3nav/urls.py b/src/c3nav/urls.py index e9d7f1c5..9b56feaf 100644 --- a/src/c3nav/urls.py +++ b/src/c3nav/urls.py @@ -11,5 +11,6 @@ urlpatterns = [ url(r'^editor/', include(c3nav.editor.urls)), url(r'^api/', include(c3nav.api.urls, namespace='api')), url(r'^admin/', admin.site.urls), + url(r'^locales/', include('django.conf.urls.i18n')), url(r'^', include(c3nav.site.urls)), ]