django-cms-qe 3.6.2__tar.gz → 3.7.0__tar.gz

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/MANIFEST.in

@@ -2,6 +2,7 @@ recursive-include cms_qe/boilerplates *
 recursive-include cms_qe/locale *
 recursive-include cms_qe/migrations *
 recursive-include cms_qe/templates *
+recursive-include cms_qe/static *
 
 include cms_qe_analytical/LICENSE.txt
 recursive-include cms_qe_analytical/templates *

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cms-qe
-Version: 3.6.2
+Version: 3.7.0
 Summary: Django CMS Quick & Easy provides all important modules to run new page withouta lot of coding. Aims to do it very easily and securely.
 Home-page: https://websites.pages.nic.cz/django-cms-qe
 Author: CZ.NIC, z.s.p.o.
@@ -23,36 +23,41 @@ Classifier: Framework :: Django :: 4.0
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: django~=4.2
-Requires-Dist: django-cms~=3.11
+Requires-Dist: django-cms~=4.1
+Requires-Dist: django-filer~=3.3
+Requires-Dist: djangocms-admin-style~=3.3
+Requires-Dist: djangocms-alias~=2.0
+Requires-Dist: djangocms-frontend~=2.1
+Requires-Dist: djangocms-text~=0.8
+Requires-Dist: djangocms-versioning~=2.3
 Requires-Dist: easy-thumbnails[svg]~=2.10
-Requires-Dist: djangocms-frontend~=1.1
-Requires-Dist: django-csp~=3.7
-Requires-Dist: djangocms-picture~=4.0
-Requires-Dist: django-axes~=6.0
-Requires-Dist: django-constance[database]~=2.9
-Requires-Dist: djangocms-file~=3.0
-Requires-Dist: django-import-export~=3.2
-Requires-Dist: django-mail-queue==3.2.5
-Requires-Dist: djangocms-icon~=2.0
-Requires-Dist: djangocms-googlemap~=2.0
+Requires-Dist: argon2-cffi~=23.1
+Requires-Dist: django-axes~=8.0
+Requires-Dist: django-constance~=4.3
+Requires-Dist: django-csp~=4.0
+Requires-Dist: django-import-export~=4.3
 Requires-Dist: django-tablib~=3.2
+Requires-Dist: djangocms-file~=3.0
+Requires-Dist: djangocms-googlemap~=2.2
+Requires-Dist: djangocms-icon~=2.1
+Requires-Dist: djangocms-link~=5.0
+Requires-Dist: djangocms-picture~=4.1
+Requires-Dist: python-environ~=0.4
+Requires-Dist: django-haystack~=3.3
+Requires-Dist: djangocms-aldryn-forms[captcha]~=8.0
+Requires-Dist: djangocms-aldryn-search~=3.0
 Requires-Dist: mailchimp3~=3.0
-Requires-Dist: argon2-cffi~=21.3
-Requires-Dist: djangocms-aldryn-forms[captcha]~=7.7
-Requires-Dist: djangocms-aldryn-search~=2.0
-Requires-Dist: django-haystack~=3.2
-Requires-Dist: pymemcache~=4.0
 Requires-Dist: whoosh~=2.7
-Requires-Dist: djangorestframework~=3.16
-Requires-Dist: markdown~=3.8
+Requires-Dist: Markdown~=3.8
 Requires-Dist: django-filter~=25.1
 Requires-Dist: django-rest-knox~=5.0
+Requires-Dist: djangorestframework~=3.16
 Requires-Dist: drf-spectacular~=0.28
 Provides-Extra: dev
+Requires-Dist: django-simple-captcha~=0.5; extra == "dev"
 Requires-Dist: django-debug-toolbar~=4.1; extra == "dev"
 Requires-Dist: django-extensions~=3.2; extra == "dev"
 Provides-Extra: test
@@ -62,6 +67,7 @@ Requires-Dist: mypy; extra == "test"
 Requires-Dist: pylint; extra == "test"
 Requires-Dist: pylint-django; extra == "test"
 Requires-Dist: pytest~=6.2; extra == "test"
+Requires-Dist: pytest-cov~=6.2; extra == "test"
 Requires-Dist: pytest-data~=0.4; extra == "test"
 Requires-Dist: pytest-django~=3.9; extra == "test"
 Requires-Dist: pytest-env~=0.6; extra == "test"
@@ -81,7 +87,7 @@ Requires-Dist: psycopg2; extra == "psql"
 Provides-Extra: mysql
 Requires-Dist: mysqlclient~=2.2; extra == "mysql"
 Provides-Extra: newsblog
-Requires-Dist: djangocms-aldryn-newsblog~=3.3; extra == "newsblog"
+Requires-Dist: djangocms-aldryn-newsblog~=4.0; extra == "newsblog"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -144,3 +150,36 @@ To find more useful commands, run just `make`.
 ## Upgrade
 
 To upgrade from version `2.2` to version >= `3.0.0`, you can use the [DjangoCMS upgrade plugins](https://gitlab.nic.cz/utils/djangocms-upgrade-plugins) tool.
+
+## Example in Docker
+
+Download example:
+
+    curl https://gitlab.nic.cz/websites/django-cms-qe/-/archive/master/django-cms-qe.zip?path=example --output example.zip
+
+Unzip and go to the example folder:
+
+    unzip example.zip
+    cd django-cms-qe*/example/
+
+Build the site image:
+
+    docker compose build
+
+Run website in docker:
+
+    docker compose up -d
+
+See the website at http://localhost:8000/. Login into http://localhost:8000/admin/ as username ``admin`` with password ``admin``.
+To run on a different port, specify the PORT parameter:
+
+    PORT=8008 docker compose up -d
+
+Please wait a moment before browsing the website. It takes a while for all migrations to be completed and data to be loaded.
+You can monitor the status of this process in the log:
+
+    docker compose logs -f web
+
+Stop the website:
+
+    docker compose down

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/README.md

@@ -46,3 +46,36 @@ To find more useful commands, run just `make`.
 ## Upgrade
 
 To upgrade from version `2.2` to version >= `3.0.0`, you can use the [DjangoCMS upgrade plugins](https://gitlab.nic.cz/utils/djangocms-upgrade-plugins) tool.
+
+## Example in Docker
+
+Download example:
+
+    curl https://gitlab.nic.cz/websites/django-cms-qe/-/archive/master/django-cms-qe.zip?path=example --output example.zip
+
+Unzip and go to the example folder:
+
+    unzip example.zip
+    cd django-cms-qe*/example/
+
+Build the site image:
+
+    docker compose build
+
+Run website in docker:
+
+    docker compose up -d
+
+See the website at http://localhost:8000/. Login into http://localhost:8000/admin/ as username ``admin`` with password ``admin``.
+To run on a different port, specify the PORT parameter:
+
+    PORT=8008 docker compose up -d
+
+Please wait a moment before browsing the website. It takes a while for all migrations to be completed and data to be loaded.
+You can monitor the status of this process in the log:
+
+    docker compose logs -f web
+
+Stop the website:
+
+    docker compose down

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/boilerplates/bootstrap3/templates/cms_qe/home.html

@@ -1,4 +1,4 @@
-{% load static i18n cms_tags sekizai_tags %}
+{% load static i18n cms_tags sekizai_tags djangocms_alias_tags %}
 
 {% addtoblock "css" %}
     <link rel="stylesheet" href="{% static "cms_qe/css/bootstrap.min.css" %}" />
@@ -26,7 +26,7 @@
 
         {% block header %}
             <header>
-                {% static_placeholder "header" %}
+                {% static_alias "header" %}
             </header>
         {% endblock %}
         {% block content %}
@@ -36,7 +36,7 @@
         {% endblock %}
         {% block footers %}
             <footer>
-                {% static_placeholder "footer" %}
+                {% static_alias "footer" %}
             </footer>
         {% endblock %}
 

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/export.py

@@ -137,7 +137,7 @@ def export_data(export_type, modeladmin, queryset):
                 if not field.auto_created or field.name == 'id'
             ]
 
-        def get_export_headers(self) -> list:
+        def get_export_headers(self, selected_fields=None) -> list:
             """
             As header use verbose name which is better than database name.
             """
@@ -153,8 +153,8 @@ def export_data(export_type, modeladmin, queryset):
                 name = force_str(field.verbose_name)
             return name
 
-        def export_field(self, field, obj):
-            value = super().export_field(field, obj)
+        def export_field(self, field, instance, **kwargs):
+            value = super().export_field(field, instance, **kwargs)
             if '__proxy__' in value.__class__.__name__:
                 value = force_str(value)
             return value
@@ -176,11 +176,11 @@ class AdminField(fields.Field):
         self.get_modeladmin = lambda: modeladmin
         super().__init__(*args, **kwds)
 
-    def get_value(self, obj):
+    def get_value(self, instance):
         admin_property = getattr(self.get_modeladmin(), self.attribute, None)
         if admin_property:
-            return admin_property(obj)
-        return super().get_value(obj)
+            return admin_property(instance)
+        return super().get_value(instance)
 
 
 # Taken from https://github.com/django-import-export/django-import-export/issues/525#issuecomment-303046691
@@ -197,12 +197,13 @@ class ChoicesWidget(widgets.Widget):
         """
         self.choices = dict(choices)
         self.revert_choices = {v: k for k, v in self.choices.items()}
+        super().__init__()
 
     # pylint: disable=keyword-arg-before-vararg
     def clean(self, value, row=None, *args, **kwargs):
         """Returns the db value given the display value"""
         return self.revert_choices.get(value, value) if value else None
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         """Returns the display value given the db value"""
         return self.choices.get(value, '')

django_cms_qe-3.7.0/cms_qe/hooks.py

@@ -0,0 +1,90 @@
+from types import MethodType
+
+from django.apps import apps
+from django.conf import settings
+from django.contrib import messages
+from django.contrib.auth.views import LoginView
+from django.db import InternalError, connection
+from django.http import HttpRequest, HttpResponseRedirect
+from django.template.response import TemplateResponse
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+from djangocms_alias.models import AliasContent
+from menus.menu_pool import MenuRenderer, menu_pool
+
+
+def pg_is_in_recovery():
+    """Return True when database is slave or False when database is master."""
+    with connection.cursor() as cursor:
+        if cursor.db.vendor != 'postgresql':
+            return False
+        cursor.execute("SELECT pg_is_in_recovery()")
+        return cursor.fetchone()[0]
+
+
+class PgIsInRecoveryLoginView(LoginView):
+    template_name = 'admin/login.html'
+    url_page_name = "login"
+
+    def get(self, request, *args, **kwargs):
+        if pg_is_in_recovery():
+            messages.add_message(request, messages.WARNING,
+                                 _('The database is in recovery mode. Unable to login. Try it later.'))
+        return super().get(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        if pg_is_in_recovery():
+            messages.add_message(request, messages.ERROR, _('Login failed. The database is in recovery mode.'))
+            return HttpResponseRedirect(reverse(self.url_page_name))
+        return super().post(request, *args, **kwargs)
+
+    def get_template_names(self):
+        if pg_is_in_recovery():
+            return ['pg_is_in_recovery_login.html']
+        return self.template_name
+
+
+class PgIsInRecoveryMenuRenderer(MenuRenderer):
+
+    def get_nodes(self, namespace=None, root_id=None, breadcrumb=False):
+        try:
+            return super().get_nodes(namespace, root_id, breadcrumb)
+        except InternalError:
+            if pg_is_in_recovery():
+                return []
+            raise
+
+
+def render_alias_content(request: HttpRequest, alias_content: AliasContent) -> TemplateResponse:
+    """Render alias content with additionad css class alias-$name.
+
+    This is the same function as on the url
+    https://github.com/django-cms/djangocms-alias/blob/master/djangocms_alias/rendering.py#L4,
+    it just uses a different template. In the template, a css class is added by the alias name.
+    This is necessary so that the appropriate styles can be linked to it.
+    """
+    template = "cms_qe/alias_content_preview.html"
+    context = {
+        "alias_content": alias_content,
+        "site_styles": settings.STYLES_FOR_ALIAS_ADMIN_PREVIEW,
+    }
+    return TemplateResponse(request, template, context)
+
+
+def get_renderer(self, request: HttpRequest) -> PgIsInRecoveryMenuRenderer:
+    self.discover_menus()
+    return PgIsInRecoveryMenuRenderer(pool=self, request=request)
+
+
+def patch_menu_pool_cachekey():
+    """Skip exception when MenuRenderer attempts to write to read only database."""
+    menu_pool.get_renderer = MethodType(get_renderer, menu_pool)
+
+
+def patch_alias():
+    """Patch alias template preview."""
+    try:
+        extension = apps.get_app_config('cms').cms_extension
+        extension.toolbar_enabled_models[AliasContent] = render_alias_content
+    except KeyError:
+        pass

django_cms_qe-3.7.0/cms_qe/ldap.py

@@ -0,0 +1,4 @@
+def clean_user_data(model_fields):
+    """Transform the user data loaded from LDAP into a form suitable for creating a user."""
+    model_fields['is_staff'] = True
+    return model_fields

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/settings/base/app.py

@@ -1,6 +1,7 @@
 """
 Base settings for Django app.
 """
+from .env import ENV
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
@@ -8,8 +9,10 @@ Base settings for Django app.
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 SITE_ID = 1
+CMS_CONFIRM_VERSION4 = True
+DJANGOCMS_VERSIONING_ALLOW_DELETING_VERSIONS = True
 
-INTERNAL_IPS = ['127.0.0.1']
+INTERNAL_IPS = ENV.list("INTERNAL_IPS", default=[])
 
 META_USE_SITES = True
 META_SITE_PROTOCOL = 'https'
@@ -47,8 +50,12 @@ INSTALLED_APPS = [
     'treebeard',  # Tree structure of pages and plugins.
     'sekizai',  # Static file management.
 
+    'djangocms_text',
+    'djangocms_link',
+    'djangocms_alias',
+    'djangocms_versioning',
+
     # Other Django CMS's useful modules.
-    'djangocms_text_ckeditor',
     'djangocms_googlemap',
 
     # Django Filer's modules.
@@ -70,11 +77,13 @@ INSTALLED_APPS = [
     'djangocms_frontend.contrib.collapse',
     'djangocms_frontend.contrib.content',
     'djangocms_frontend.contrib.grid',
+    'djangocms_frontend.contrib.icon',
+    'djangocms_frontend.contrib.image',
     'djangocms_frontend.contrib.jumbotron',
     'djangocms_frontend.contrib.link',
     'djangocms_frontend.contrib.listgroup',
     'djangocms_frontend.contrib.media',
-    'djangocms_frontend.contrib.image',
+    'djangocms_frontend.contrib.navigation',
     'djangocms_frontend.contrib.tabs',
     'djangocms_frontend.contrib.utilities',
 
@@ -83,7 +92,6 @@ INSTALLED_APPS = [
     'constance',
     'constance.backends.database',
     'import_export',
-    'mailqueue',
 
     # Aldryn forms
     'aldryn_forms',

django_cms_qe-3.7.0/cms_qe/settings/base/cache.py

@@ -0,0 +1,15 @@
+"""
+Caching setting by default in-memory without need to configure anything.
+"""
+
+# Caching
+# https://docs.djangoproject.com/en/4.2/topics/cache/
+
+# https://pypi.org/project/python-environ/
+#   Supported types / cache_url
+
+from .env import ENV
+
+CACHES = {
+    "default": ENV.cache("CACHE_URL", default="pymemcache://127.0.0.1:11211"),
+}

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/settings/base/cms.py

@@ -41,7 +41,7 @@ THUMBNAIL_PROCESSORS = (
     'easy_thumbnails.processors.filters'
 )
 
-TEXT_ADDITIONAL_TAGS = ('iframe',)
+TEXT_ADDITIONAL_ATTRIBUTES: dict[str, set] = {"iframe": set()}
 
 # cmsplugin_filer_folder
 CMSPLUGIN_FILER_FOLDER_STYLE_CHOICES = (
@@ -65,3 +65,6 @@ DJANGOCMS_FRONTEND_GRID_CONTAINERS = (
     ("container-full", _("Full container")),
     (" ", "----"),
 )
+
+# For example: ["css/bootstrap.min.css", "css/screen.css"]
+STYLES_FOR_ALIAS_ADMIN_PREVIEW: list[str] = []

django_cms_qe-3.7.0/cms_qe/settings/base/database.py

@@ -0,0 +1,16 @@
+"""
+Database settings, used PostgreSQL without auth by default.
+"""
+
+# Database
+# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
+
+# https://pypi.org/project/python-environ/
+#   Supported types / db_url
+
+from .env import ENV
+
+# Database
+DATABASES = {
+    "default": ENV.db("DATABASE_URL", default='postgres://qe_user:password@/cms_qe'),
+}

django_cms_qe-3.7.0/cms_qe/settings/base/email.py

@@ -0,0 +1,12 @@
+"""
+Mailing settings, by default app looks for smtp server.
+"""
+from .env import ENV
+
+EMAIL_HOST = ENV.str("EMAIL_HOST", default="localhost")
+EMAIL_HOST_USER = ENV.str("EMAIL_USER", default="")
+EMAIL_HOST_PASSWORD = ENV.str("EMAIL_PASSWORD", default="")
+EMAIL_PORT = ENV.int("EMAIL_PORT", default=587)  # TLS uses usually 587, not 22
+EMAIL_USE_TLS = ENV.bool("EMAIL_USE_TLS", default=False)
+EMAIL_SUBJECT_PREFIX = ENV.str("EMAIL_SUBJECT_PREFIX", default="")  # Remove Django default prefix
+DEFAULT_FROM_EMAIL = ENV.str("DEFAULT_FROM_EMAIL", default="django_cms_qe@localhost")

django_cms_qe-3.7.0/cms_qe/settings/base/env.py

@@ -0,0 +1,3 @@
+import environ
+
+ENV = environ.Env()

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/settings/base/logging.py

@@ -1,6 +1,7 @@
 """
 Logging settings with base formatters and handlers.
 """
+from .env import ENV
 
 # Logging
 # https://docs.djangoproject.com/en/1.11/topics/logging/
@@ -49,7 +50,7 @@ LOGGING = {
             'propagate': True,
         },
         '': {
-            'level': 'INFO',
+            'level': ENV.str("LOGGER", default="ERROR"),
             'handlers': ['console'],
         },
     }

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/settings/base/search.py

@@ -1,15 +1,19 @@
 import os
 from pathlib import Path
 
+from .env import ENV
+
 site_resolver = Path(__file__).resolve()
 
 PROJECT_DIR = site_resolver.parent.parent.parent.parent
 
 HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter']
 HAYSTACK_ENGINE = 'cms_qe.whoosh.backend.AnalyzerWhooshEngine'
-_HAYSTACK_PATH = os.path.normpath(os.path.join(PROJECT_DIR, 'whoosh_index'))
+_HAYSTACK_PATH = ENV.str('HAYSTACK_PATH', default=os.path.normpath(os.path.join(PROJECT_DIR, 'whoosh_index')))
 HAYSTACK_CONNECTIONS = {
     'default': {'ENGINE': HAYSTACK_ENGINE, 'PATH': os.path.join(_HAYSTACK_PATH, 'default')},
     'en': {'ENGINE': HAYSTACK_ENGINE, 'PATH': os.path.join(_HAYSTACK_PATH, 'en')},
 }
 HAYSTACK_CUSTOM_HIGHLIGHTER = "cms_qe.haystack.highlighting.HaystackHighlighter"
+
+ALDRYN_NEWSBLOG_UPDATE_SEARCH_DATA_ON_SAVE = True

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/settings/base/security.py

@@ -41,10 +41,11 @@ authorization by one of those options (more about that in `documentation
     AXES_NUM_PROXIES = 1
 
 """
+from .env import ENV
 
 # Cookies.
 
-SESSION_COOKIE_NAME = 'sessionid'
+SESSION_COOKIE_NAME = ENV.str("SESSION_COOKIE_NAME", default="sessionid")
 SESSION_COOKIE_SECURE = True
 
 # Secure headers.

django_cms_qe-3.7.0/cms_qe/settings/dev.py

@@ -0,0 +1,73 @@
+"""
+Configuration for development.
+
+Disables all security options.
+"""
+
+import os
+from pathlib import Path
+
+from .base import *  # noqa: F401,F403 pylint: disable=wildcard-import,unused-wildcard-import
+from .base.env import ENV
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
+
+DEBUG = True
+
+META_SITE_PROTOCOL = 'http'
+
+SECRET_KEY = ENV.str("SECRET_KEY", default='secret')
+
+SESSION_COOKIE_SECURE = False
+
+SECURE_HSTS_SECONDS = 0
+
+ALLOWED_HOSTS = ['localhost', '127.0.0.1']
+
+INSTALLED_APPS += [  # noqa: F405
+    'debug_toolbar',
+    'django_extensions',
+]
+
+ROOT_URLCONF = "cms_qe.urls"
+
+MIDDLEWARE += [  # noqa: F405
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+]
+
+site_resolver = Path(__file__).resolve()
+
+PROJECT_DIR = site_resolver.parent.parent.parent
+RUN_SITE_DIR = os.environ.get("VENV_PATH", PROJECT_DIR)
+
+STATIC_ROOT = ENV.str("STATIC_ROOT", default=os.path.join(PROJECT_DIR, 'staticfiles'))
+MEDIA_ROOT = ENV.str("MEDIA_ROOT", default=os.path.join(RUN_SITE_DIR, 'media'))
+
+# Caching
+CACHES = {
+    "default": ENV.cache("CACHE_URL", default=f'filecache://{os.path.join(RUN_SITE_DIR, "django_cache")}')
+}
+
+# Database
+database_path = os.path.join(RUN_SITE_DIR, 'db.sqlite3')
+database_url_default = f"sqlite:///{database_path}"
+DATABASES = {"default": ENV.db("DATABASE_URL", default=database_url_default)}
+
+EMAIL_BACKEND = 'cms_qe_test.mail_filebased_backend.EmlEmailBackend'
+EMAIL_FILE_PATH = ENV.str("EMAIL_FILE_PATH", default=os.path.join(RUN_SITE_DIR, 'django_mails'))
+
+ALDRYN_FORMS_SUBMISSION_LIST_DISPLAY_FIELD = "aldryn_forms.admin.display_form_submission_data"
+
+SITE_API_ROOT = "/api/v1/"
+
+REST_FRAMEWORK = {
+    'EXCEPTION_HANDLER': 'cms_qe.api.utils.exception_handler',
+    'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
+}
+
+# API views: [("path/", "module.api.views.RecordViewSet", "api-records"), ...]
+API_VIEWS = [
+    ('aldryn-forms/forms', 'aldryn_forms.api.views.FormViewSet', 'aldryn-forms-form'),
+    ('aldryn-forms/submitssions', 'aldryn_forms.api.views.SubmissionsViewSet', 'aldryn-forms-submitssions'),
+]

django_cms_qe-3.7.0/cms_qe/static/cms_qe/css/fix-djangocms-admin-style.css

@@ -0,0 +1,33 @@
+form .selector-chosen-title {
+    background-color: #00bbff;
+}
+
+fieldset .fieldset-heading,
+fieldset .inline-heading,
+:not(.inline-related) .collapse summary {
+    background-color: #00bbff !important;
+}
+
+fieldset h2.fieldset-heading {
+    color: white !important;
+    background-color: #00bbff !important;
+    font-weight: bold !important;
+    padding-left: 1em !important;
+}
+
+.selector .selector-chooser button.selector-add,
+.selector .selector-chooser button.selector-remove {
+    width: 38px !important;
+    height: 32px !important;
+    padding: 0.4em 1em 1em 0.5em !important;
+}
+
+:enabled.selector-add,
+:enabled.selector-remove {
+  opacity: 1 !important;
+}
+
+.selector .selector-available button.selector-chooseall,
+.selector .selector-chosen button.selector-clearall {
+    height: 32px !important;
+}

django_cms_qe-3.7.0/cms_qe/templates/admin/inc/extrastyle.html

@@ -0,0 +1,2 @@
+{% load static %}
+<link rel="stylesheet" href="{% static "cms_qe/css/fix-djangocms-admin-style.css" %}">

{django_cms_qe-3.6.2 → django_cms_qe-3.7.0}/cms_qe/templates/base.html

@@ -1,4 +1,4 @@
-{% load i18n static cms_tags sekizai_tags %}
+{% load i18n static cms_tags djangocms_alias_tags menu_tags sekizai_tags %}
 {# Doctype is important for Django CMS so it can correctly detect height of window. #}
 <!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}">
@@ -9,17 +9,20 @@
         {% include 'cms_qe/include/head.html' %}
     </head>
     <body>
-        {% include 'cms_qe/include/body_top.html' %}
         {% cms_toolbar %}
+        {% block menu %}
+            <menu>{% show_menu 0 100 100 100 %}</menu>
+        {% endblock %}
+        {% include 'cms_qe/include/body_top.html' %}
         {% block header %}
             <header>
-                {% static_placeholder "header" %}
+                {% static_alias "header" %}
             </header>
         {% endblock %}
         {% block content %}{% endblock %}
         {% block footers %}
             <footer>
-                {% static_placeholder "footer" %}
+                {% static_alias "footer" %}
             </footer>
         {% endblock %}
         {% include "cms_qe/include/body_bottom.html" %}