-
+
diff --git a/ddm/auth/templates/auth/no_permission.html b/ddm/auth/templates/ddm_auth/no_permission.html
similarity index 89%
rename from ddm/auth/templates/auth/no_permission.html
rename to ddm/auth/templates/ddm_auth/no_permission.html
index 38c2df7e..2228ef99 100644
--- a/ddm/auth/templates/auth/no_permission.html
+++ b/ddm/auth/templates/ddm_auth/no_permission.html
@@ -1,4 +1,4 @@
-{% extends 'core/base.html' %}
+{% extends 'ddm_core/base.html' %}
{% block page_title %}Permission Denied{% endblock %}
diff --git a/ddm/auth/templates/auth/token.html b/ddm/auth/templates/ddm_auth/token.html
similarity index 98%
rename from ddm/auth/templates/auth/token.html
rename to ddm/auth/templates/ddm_auth/token.html
index b8926ba8..3f1e661e 100644
--- a/ddm/auth/templates/auth/token.html
+++ b/ddm/auth/templates/ddm_auth/token.html
@@ -1,4 +1,4 @@
-{% extends 'core/page_with_form.html' %}
+{% extends 'ddm_core/page_with_form.html' %}
{% block page_title %}Project Access Token{% endblock %}
diff --git a/ddm/auth/tests/test_views.py b/ddm/auth/tests/test_views.py
index 6e306ca0..5001afd7 100644
--- a/ddm/auth/tests/test_views.py
+++ b/ddm/auth/tests/test_views.py
@@ -87,7 +87,7 @@ def test_redirect_if_anonymous(self):
class TestView(DDMAuthMixin, TemplateView):
- template_name = 'auth/no_permission.html'
+ template_name = 'ddm_auth/no_permission.html'
@override_settings(DDM_SETTINGS={'EMAIL_PERMISSION_CHECK': r'.*(\.|@)mail\.com$', })
diff --git a/ddm/auth/views.py b/ddm/auth/views.py
index c1dc235b..a2b46105 100644
--- a/ddm/auth/views.py
+++ b/ddm/auth/views.py
@@ -59,7 +59,7 @@ class DdmNoPermissionView(TemplateView):
* Unauthenticated users are redirected to the login page.
* Logged-in users with permission and a research profile are redirected to the project list.
"""
- template_name = 'auth/no_permission.html'
+ template_name = 'ddm_auth/no_permission.html'
def dispatch(self, request, *args, **kwargs):
if request.method == 'GET':
@@ -73,7 +73,7 @@ def dispatch(self, request, *args, **kwargs):
class ProjectTokenView(SuccessMessageMixin, DDMAuthMixin, FormView):
""" View to see existing access token or generate a new one. """
- template_name = 'auth/token.html'
+ template_name = 'ddm_auth/token.html'
form_class = TokenCreationForm
def get_project(self):
diff --git a/ddm/core/static/core/css/bootstrap/bootstrap-icons.css b/ddm/core/static/ddm_core/css/bootstrap/bootstrap-icons.css
similarity index 100%
rename from ddm/core/static/core/css/bootstrap/bootstrap-icons.css
rename to ddm/core/static/ddm_core/css/bootstrap/bootstrap-icons.css
diff --git a/ddm/core/static/core/css/bootstrap/bootstrap-table-filter-control.min.css b/ddm/core/static/ddm_core/css/bootstrap/bootstrap-table-filter-control.min.css
similarity index 100%
rename from ddm/core/static/core/css/bootstrap/bootstrap-table-filter-control.min.css
rename to ddm/core/static/ddm_core/css/bootstrap/bootstrap-table-filter-control.min.css
diff --git a/ddm/core/static/core/css/bootstrap/bootstrap-table.min.css b/ddm/core/static/ddm_core/css/bootstrap/bootstrap-table.min.css
similarity index 100%
rename from ddm/core/static/core/css/bootstrap/bootstrap-table.min.css
rename to ddm/core/static/ddm_core/css/bootstrap/bootstrap-table.min.css
diff --git a/ddm/core/static/core/css/bootstrap/bootstrap.min.css b/ddm/core/static/ddm_core/css/bootstrap/bootstrap.min.css
similarity index 100%
rename from ddm/core/static/core/css/bootstrap/bootstrap.min.css
rename to ddm/core/static/ddm_core/css/bootstrap/bootstrap.min.css
diff --git a/ddm/core/static/core/css/bootstrap/bootstrap.min.css.map b/ddm/core/static/ddm_core/css/bootstrap/bootstrap.min.css.map
similarity index 100%
rename from ddm/core/static/core/css/bootstrap/bootstrap.min.css.map
rename to ddm/core/static/ddm_core/css/bootstrap/bootstrap.min.css.map
diff --git a/ddm/core/static/core/css/ddm-base.css b/ddm/core/static/ddm_core/css/ddm-base.css
similarity index 100%
rename from ddm/core/static/core/css/ddm-base.css
rename to ddm/core/static/ddm_core/css/ddm-base.css
diff --git a/ddm/core/static/core/css/ddm-ckeditor-styles.css b/ddm/core/static/ddm_core/css/ddm-ckeditor-styles.css
similarity index 100%
rename from ddm/core/static/core/css/ddm-ckeditor-styles.css
rename to ddm/core/static/ddm_core/css/ddm-ckeditor-styles.css
diff --git a/ddm/core/static/core/css/fonts.css b/ddm/core/static/ddm_core/css/fonts.css
similarity index 100%
rename from ddm/core/static/core/css/fonts.css
rename to ddm/core/static/ddm_core/css/fonts.css
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-Black.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Black.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-Black.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Black.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-BlackItalic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-BlackItalic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-BlackItalic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-BlackItalic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-Bold.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Bold.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-Bold.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Bold.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-BoldItalic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-BoldItalic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-BoldItalic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-BoldItalic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraBold.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraBold.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraBold.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraBold.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraLight.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraLight.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraLight.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraLight.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-Italic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Italic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-Italic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Italic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-Light.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Light.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-Light.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Light.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-LightItalic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-LightItalic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-LightItalic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-LightItalic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-Regular.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Regular.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-Regular.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-Regular.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-SemiBold.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-SemiBold.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-SemiBold.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-SemiBold.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf b/ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf
rename to ddm/core/static/ddm_core/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf
diff --git a/ddm/core/static/core/fonts/NunitoSans/OFL.txt b/ddm/core/static/ddm_core/fonts/NunitoSans/OFL.txt
similarity index 100%
rename from ddm/core/static/core/fonts/NunitoSans/OFL.txt
rename to ddm/core/static/ddm_core/fonts/NunitoSans/OFL.txt
diff --git a/ddm/core/static/core/fonts/bootstrap-icons/bootstrap-icons.woff2 b/ddm/core/static/ddm_core/fonts/bootstrap-icons/bootstrap-icons.woff2
similarity index 100%
rename from ddm/core/static/core/fonts/bootstrap-icons/bootstrap-icons.woff2
rename to ddm/core/static/ddm_core/fonts/bootstrap-icons/bootstrap-icons.woff2
diff --git a/ddm/core/static/core/img/ddl_favicon_black.svg b/ddm/core/static/ddm_core/img/ddl_favicon_black.svg
similarity index 100%
rename from ddm/core/static/core/img/ddl_favicon_black.svg
rename to ddm/core/static/ddm_core/img/ddl_favicon_black.svg
diff --git a/ddm/core/static/core/img/logos/DDM_Logo_Schwarz.svg b/ddm/core/static/ddm_core/img/logos/DDM_Logo_Schwarz.svg
similarity index 100%
rename from ddm/core/static/core/img/logos/DDM_Logo_Schwarz.svg
rename to ddm/core/static/ddm_core/img/logos/DDM_Logo_Schwarz.svg
diff --git a/ddm/core/static/core/img/logos/Example Logo.png b/ddm/core/static/ddm_core/img/logos/Example Logo.png
similarity index 100%
rename from ddm/core/static/core/img/logos/Example Logo.png
rename to ddm/core/static/ddm_core/img/logos/Example Logo.png
diff --git a/ddm/core/static/core/js/bootstrap/bootstrap-table-export.min.js b/ddm/core/static/ddm_core/js/bootstrap/bootstrap-table-export.min.js
similarity index 100%
rename from ddm/core/static/core/js/bootstrap/bootstrap-table-export.min.js
rename to ddm/core/static/ddm_core/js/bootstrap/bootstrap-table-export.min.js
diff --git a/ddm/core/static/core/js/bootstrap/bootstrap-table-filter-control.min.js b/ddm/core/static/ddm_core/js/bootstrap/bootstrap-table-filter-control.min.js
similarity index 100%
rename from ddm/core/static/core/js/bootstrap/bootstrap-table-filter-control.min.js
rename to ddm/core/static/ddm_core/js/bootstrap/bootstrap-table-filter-control.min.js
diff --git a/ddm/core/static/core/js/bootstrap/bootstrap-table.min.js b/ddm/core/static/ddm_core/js/bootstrap/bootstrap-table.min.js
similarity index 100%
rename from ddm/core/static/core/js/bootstrap/bootstrap-table.min.js
rename to ddm/core/static/ddm_core/js/bootstrap/bootstrap-table.min.js
diff --git a/ddm/core/static/core/js/bootstrap/bootstrap.bundle.min.js b/ddm/core/static/ddm_core/js/bootstrap/bootstrap.bundle.min.js
similarity index 100%
rename from ddm/core/static/core/js/bootstrap/bootstrap.bundle.min.js
rename to ddm/core/static/ddm_core/js/bootstrap/bootstrap.bundle.min.js
diff --git a/ddm/core/static/core/js/filesaver/FileSaver.min.js b/ddm/core/static/ddm_core/js/filesaver/FileSaver.min.js
similarity index 100%
rename from ddm/core/static/core/js/filesaver/FileSaver.min.js
rename to ddm/core/static/ddm_core/js/filesaver/FileSaver.min.js
diff --git a/ddm/core/static/core/js/filesaver/FileSaver.min.js.map b/ddm/core/static/ddm_core/js/filesaver/FileSaver.min.js.map
similarity index 100%
rename from ddm/core/static/core/js/filesaver/FileSaver.min.js.map
rename to ddm/core/static/ddm_core/js/filesaver/FileSaver.min.js.map
diff --git a/ddm/core/static/core/js/jquery/jquery-3.6.2.min.js b/ddm/core/static/ddm_core/js/jquery/jquery-3.6.2.min.js
similarity index 100%
rename from ddm/core/static/core/js/jquery/jquery-3.6.2.min.js
rename to ddm/core/static/ddm_core/js/jquery/jquery-3.6.2.min.js
diff --git a/ddm/core/static/core/js/jquery/tableExport.min.js b/ddm/core/static/ddm_core/js/jquery/tableExport.min.js
similarity index 100%
rename from ddm/core/static/core/js/jquery/tableExport.min.js
rename to ddm/core/static/ddm_core/js/jquery/tableExport.min.js
diff --git a/ddm/core/static/core/vue/css/vue_questionnaire.css b/ddm/core/static/ddm_core/vue/css/vue_questionnaire.css
similarity index 100%
rename from ddm/core/static/core/vue/css/vue_questionnaire.css
rename to ddm/core/static/ddm_core/vue/css/vue_questionnaire.css
diff --git a/ddm/core/static/core/vue/css/vue_uploader.css b/ddm/core/static/ddm_core/vue/css/vue_uploader.css
similarity index 100%
rename from ddm/core/static/core/vue/css/vue_uploader.css
rename to ddm/core/static/ddm_core/vue/css/vue_uploader.css
diff --git a/ddm/core/static/core/vue/favicon.ico b/ddm/core/static/ddm_core/vue/favicon.ico
similarity index 100%
rename from ddm/core/static/core/vue/favicon.ico
rename to ddm/core/static/ddm_core/vue/favicon.ico
diff --git a/ddm/core/static/core/vue/index.html b/ddm/core/static/ddm_core/vue/index.html
similarity index 100%
rename from ddm/core/static/core/vue/index.html
rename to ddm/core/static/ddm_core/vue/index.html
diff --git a/ddm/core/static/core/vue/js/chunk-vendors.js b/ddm/core/static/ddm_core/vue/js/chunk-vendors.js
similarity index 100%
rename from ddm/core/static/core/vue/js/chunk-vendors.js
rename to ddm/core/static/ddm_core/vue/js/chunk-vendors.js
diff --git a/ddm/core/static/core/vue/js/chunk-vendors.js.map b/ddm/core/static/ddm_core/vue/js/chunk-vendors.js.map
similarity index 100%
rename from ddm/core/static/core/vue/js/chunk-vendors.js.map
rename to ddm/core/static/ddm_core/vue/js/chunk-vendors.js.map
diff --git a/ddm/core/static/core/vue/js/vue_questionnaire.js b/ddm/core/static/ddm_core/vue/js/vue_questionnaire.js
similarity index 100%
rename from ddm/core/static/core/vue/js/vue_questionnaire.js
rename to ddm/core/static/ddm_core/vue/js/vue_questionnaire.js
diff --git a/ddm/core/static/core/vue/js/vue_questionnaire.js.map b/ddm/core/static/ddm_core/vue/js/vue_questionnaire.js.map
similarity index 100%
rename from ddm/core/static/core/vue/js/vue_questionnaire.js.map
rename to ddm/core/static/ddm_core/vue/js/vue_questionnaire.js.map
diff --git a/ddm/core/static/core/vue/js/vue_uploader.js b/ddm/core/static/ddm_core/vue/js/vue_uploader.js
similarity index 100%
rename from ddm/core/static/core/vue/js/vue_uploader.js
rename to ddm/core/static/ddm_core/vue/js/vue_uploader.js
diff --git a/ddm/core/static/core/vue/js/vue_uploader.js.map b/ddm/core/static/ddm_core/vue/js/vue_uploader.js.map
similarity index 100%
rename from ddm/core/static/core/vue/js/vue_uploader.js.map
rename to ddm/core/static/ddm_core/vue/js/vue_uploader.js.map
diff --git a/ddm/core/static/core/vue/webpack-stats.json b/ddm/core/static/ddm_core/vue/webpack-stats.json
similarity index 100%
rename from ddm/core/static/core/vue/webpack-stats.json
rename to ddm/core/static/ddm_core/vue/webpack-stats.json
diff --git a/ddm/core/templates/core/base.html b/ddm/core/templates/ddm_core/base.html
similarity index 69%
rename from ddm/core/templates/core/base.html
rename to ddm/core/templates/ddm_core/base.html
index c0a9a14f..f5837e8e 100644
--- a/ddm/core/templates/core/base.html
+++ b/ddm/core/templates/ddm_core/base.html
@@ -5,10 +5,10 @@
DDM: {% block page_title %}Title{% endblock %}
-
-
-
-
+
+
+
+
{% block extrahead %}{% endblock %}
@@ -17,7 +17,7 @@
{% block header %}
{% endblock %}
@@ -56,9 +56,9 @@ {% block main_heading %}{% endblock %}
{% block scripts %}
-
-
-
+
+
+
{% endblock %}