diff --git a/openslides/templates/base.html b/openslides/templates/base.html index b25b784ea..a986d6408 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -12,6 +12,7 @@ + {% block header %} {% endblock %} diff --git a/openslides/urls.py b/openslides/urls.py index ea8000655..4d9bfe2cc 100644 --- a/openslides/urls.py +++ b/openslides/urls.py @@ -17,8 +17,10 @@ import settings from utils.views import FrontPage + handler500 = 'openslides.utils.views.server_error' + urlpatterns = patterns('', # frontpage (r'^$', FrontPage.as_view()), @@ -32,6 +34,10 @@ urlpatterns = patterns('', (r'^i18n/', include('django.conf.urls.i18n')), ) +js_info_dict = { + 'packages': [], +} + for plugin in settings.INSTALLED_PLUGINS: try: mod = import_module(plugin + '.urls') @@ -40,10 +46,12 @@ for plugin in settings.INSTALLED_PLUGINS: plugin_name = mod.__name__.split('.')[0] urlpatterns += patterns('', (r'^%s/' % plugin_name, include('%s.urls' % plugin_name))) + js_info_dict['packages'].append(plugin_name) urlpatterns += patterns('', (r'^500/$', 'openslides.utils.views.server_error'), + (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), url(r'^login/$', 'django.contrib.auth.views.login',