diff --git a/MANIFEST.in b/MANIFEST.in index e64644a..10ba452 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,8 @@ recursive-include localcosmos_server/app_admin/static * recursive-include localcosmos_server/app_admin/templates * recursive-include localcosmos_server/datasets/templates * -recursive-include localcosmos_server/online_content/static * -recursive-include localcosmos_server/online_content/templates * +recursive-include localcosmos_server/template__content/static * +recursive-include localcosmos_server/template_content/templates * recursive-include localcosmos_server/server_control_panel/templates * recursive-include localcosmos_server/specifications * recursive-include localcosmos_server/static * diff --git a/docker/localcosmos_private/settings.py b/docker/localcosmos_private/settings.py index 8f3d65f..59ac30d 100644 --- a/docker/localcosmos_private/settings.py +++ b/docker/localcosmos_private/settings.py @@ -48,7 +48,7 @@ 'localcosmos_server.app_admin', 'localcosmos_server.server_control_panel', 'localcosmos_server.datasets', - 'localcosmos_server.online_content', + 'localcosmos_server.template_content', 'django_road', 'anycluster', diff --git a/localcosmos_server/__init__.py b/localcosmos_server/__init__.py index dde181c..4de7ac2 100644 --- a/localcosmos_server/__init__.py +++ b/localcosmos_server/__init__.py @@ -1,2 +1,2 @@ name = 'localcosmos_server' -__version__ = '0.10.0' +__version__ = '0.12.0' diff --git a/localcosmos_server/app_admin/middleware.py b/localcosmos_server/app_admin/middleware.py index 47c713c..6f38168 100644 --- a/localcosmos_server/app_admin/middleware.py +++ b/localcosmos_server/app_admin/middleware.py @@ -16,7 +16,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): request.is_appadmin = False # the admin has to use localcosmos_server.urls to not conflict with the commercial installation - # online_content needs the correct urlconf + # template_content needs the correct urlconf if '/app-admin/' in request.path: request.is_appadmin = True diff --git a/localcosmos_server/app_admin/templates/app_admin/base.html b/localcosmos_server/app_admin/templates/app_admin/base.html index 74d23a1..bf147be 100644 --- a/localcosmos_server/app_admin/templates/app_admin/base.html +++ b/localcosmos_server/app_admin/templates/app_admin/base.html @@ -56,7 +56,7 @@ {% endif %} -