Add footer with language controls

Also add a project wide global_static directory at the root for storing project wide static files. Add some translations for the member register app.
2017-02-06 01:10:25 +02:00
parent c34e31c0e5
commit 7ee3f69740
13 changed files with 176 additions and 125 deletions
@@ -60,14 +60,16 @@ ROOT_URLCONF = 'sikweb.urls'
 TEMPLATES = [
    {
        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': ['templates'],
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
                'django.template.context_processors.debug',
                'django.template.context_processors.request',
+                'django.template.context_processors.i18n',
                'django.contrib.auth.context_processors.auth',
                'django.contrib.messages.context_processors.messages',
+                'django.core.context_processors.static',
            ],
        },
    },
@@ -159,8 +161,15 @@ USE_TZ = True

 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
-STATICFILES_FINDERS = ['django.contrib.staticfiles.finders.AppDirectoriesFinder']
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+)
 STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'global_static'),
+)

 HSL_USERHASH = 'YOUR HSL USERHASH HERE'
 HSL_DEPARTURE_THRESHOLD = 8
@@ -18,6 +18,10 @@ from django.conf.urls import url
 from django.contrib import admin
 from django.views.generic.base import RedirectView
 from django.conf.urls import include
+from django.conf.urls.static import static
+from django.conf import settings
+from django.contrib.staticfiles import views as static_views
+
 # main
 from webapp.views import main_index
 # login
@@ -66,57 +70,60 @@ from members.views import application_success_index
 favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True)

 urlpatterns = [
-    # main
-    url(r'^$', main_index),
-    # admin
-    url(r'^admin/', admin.site.urls),
-    # login stuff
-    url(r'^login$', login_view),
-    url(r'^logout$', logout_view),
-    # members
-    url(r'^members/$', member_list),
-    url(r'^members/list$', member_list),
-    url(r'^members/add$', add_member),
-    url(r'^members/add_many$', add_many_members),
-    url(r'^members/edit/(?P<index>\d+)$', edit_member),
-    url(r'^members/applications$', list_applications),
-    url(r'^members/edit_application/(?P<index>\d+)$', edit_application),
-    url(r'^members/api/members$', mems),
-    url(r'^members/api/member/(?P<idx>\d+)$', mem),
-    url(r'^members/api/member/$', mem),
-    url(r'^members/api/csvimport$', mem_csv_import),
-    url(r'^members/api/requests$', member_requests),
-    url(r'^members/api/request$', new_member_request),
-    url(r'^members/api/request/(?P<idx>\d+)$', handle_mem_request),
-    url(r'^members/api/getCSV$', mem_csv_export),
-    url(r'^members/tommy$', tommy_blooper),
-    #infoscreen
-    url(r'^infoscreen/$', infodefault),
-    url(r'^infoscreen/(?P<idx>\d+)$', infoindex),
-    url(r'^infoscreen/items$', info_items),
-    url(r'^infoscreen/rotation/(?P<idx>\d+)$', rotation),
-    url(r'^infoscreen/rotations$', rotations),
-    url(r'^infoscreen/instance$', createInfoInstance),
-    url(r'^infoscreen/instance/(?P<idx>\d+)$', deleteInfoInstance),
-    url(r'^infoscreen/types$', info_types),
-    url(r'^infoscreen/delete_item/(?P<type_id>\d+)/(?P<idx>\d+)$', delete_info_item),
-    url(r'^infoscreen/create_external_image$', createExternalImageInfoItem),
-    url(r'^infoscreen/create_image$', create_image_item),
-    url(r'^infoscreen/create_abbitem$', createABBItem),
-    url(r'^infoscreen/create_sossoitem$', createSossoItem),
-    url(r'^infoscreen/create_hslitem$', createHslItem),
-    url(r'^infoscreen/create_coffeeitem$', createCoffeeItem),
-    url(r'^infoscreen/admin$', infoscreen_admin),
-    url(r'^infoscreen/create_rotation$', create_rotation),
-    url(r'^infoscreen/delete_rotation/(?P<id>\d+)$', delete_rotation),
-    url(r'^infoscreen/hsl_data$', CurrentHSLView),
-    url(r'^infoscreen/hsl_data/settings$', hsl_timetable_settings),
-    #application
-    url(r'^application/$', application_index),
-    url(r'^application/success$', application_success_index),
-    url(r'^favicon\.ico$', favicon_view),
+        # main
+        url(r'^$', main_index),
+        # admin
+        url(r'^admin/', admin.site.urls),
+        # login stuff
+        url(r'^login$', login_view),
+        url(r'^logout$', logout_view),
+        # members
+        url(r'^members/$', member_list),
+        url(r'^members/list$', member_list),
+        url(r'^members/add$', add_member),
+        url(r'^members/add_many$', add_many_members),
+        url(r'^members/edit/(?P<index>\d+)$', edit_member),
+        url(r'^members/applications$', list_applications),
+        url(r'^members/edit_application/(?P<index>\d+)$', edit_application),
+        url(r'^members/api/members$', mems),
+        url(r'^members/api/member/(?P<idx>\d+)$', mem),
+        url(r'^members/api/member/$', mem),
+        url(r'^members/api/csvimport$', mem_csv_import),
+        url(r'^members/api/requests$', member_requests),
+        url(r'^members/api/request$', new_member_request),
+        url(r'^members/api/request/(?P<idx>\d+)$', handle_mem_request),
+        url(r'^members/api/getCSV$', mem_csv_export),
+        url(r'^members/tommy$', tommy_blooper),
+        #infoscreen
+        url(r'^infoscreen/$', infodefault),
+        url(r'^infoscreen/(?P<idx>\d+)$', infoindex),
+        url(r'^infoscreen/items$', info_items),
+        url(r'^infoscreen/rotation/(?P<idx>\d+)$', rotation),
+        url(r'^infoscreen/rotations$', rotations),
+        url(r'^infoscreen/instance$', createInfoInstance),
+        url(r'^infoscreen/instance/(?P<idx>\d+)$', deleteInfoInstance),
+        url(r'^infoscreen/types$', info_types),
+        url(r'^infoscreen/delete_item/(?P<type_id>\d+)/(?P<idx>\d+)$', delete_info_item),
+        url(r'^infoscreen/create_external_image$', createExternalImageInfoItem),
+        url(r'^infoscreen/create_image$', create_image_item),
+        url(r'^infoscreen/create_abbitem$', createABBItem),
+        url(r'^infoscreen/create_sossoitem$', createSossoItem),
+        url(r'^infoscreen/create_hslitem$', createHslItem),
+        url(r'^infoscreen/create_coffeeitem$', createCoffeeItem),
+        url(r'^infoscreen/admin$', infoscreen_admin),
+        url(r'^infoscreen/create_rotation$', create_rotation),
+        url(r'^infoscreen/delete_rotation/(?P<id>\d+)$', delete_rotation),
+        url(r'^infoscreen/hsl_data$', CurrentHSLView),
+        url(r'^infoscreen/hsl_data/settings$', hsl_timetable_settings),
+        #application
+        url(r'^application/$', application_index),
+        url(r'^application/success$', application_success_index),
+        url(r'^favicon\.ico$', favicon_view),

-    # i18n default view for changing the active language
-    url(r'^i18n/', include('django.conf.urls.i18n')),
+        # i18n default view for changing the active language
+        url(r'^i18n/', include('django.conf.urls.i18n')),

-]
+        # staticfiles default view for static files in development
+        url(r'^static/(?P<path>.*)$', static_views.serve),
+
+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)