Merge branch 'main' into release/4

Author: vsalvino

azure-pipelines.yml

@@ -81,11 +81,10 @@ stages:
         testResultsFiles: '**/test-*.xml'
         testRunTitle: 'Publish test results for Python $(python.version)'
 
-    - task: PublishCodeCoverageResults@1
+    - task: PublishCodeCoverageResults@2
       displayName: 'Publish code coverage report'
       condition: succeededOrFailed()
       inputs:
-        codeCoverageTool: Cobertura
         summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage.xml'
 
 

ci/compare-codecov.ps1

@@ -68,7 +68,8 @@ foreach ($cov in $mainCoverageJson.coverageData.coverageStats) {
 
 
 # Get current code coverage from coverage.xml file.
-$coveragePath = Get-ChildItem -Recurse -Filter "coverage.xml" $wd
+# Use the first one, if there are multiple i.e. from multiple runs.
+$coveragePath = (Get-ChildItem -Recurse -Filter "coverage.xml" $wd)[0]
 if (Test-Path -Path $coveragePath) {
     [xml]$BranchXML = Get-Content $coveragePath
 }

coderedcms/static/coderedcms/css/crx-admin.css

@@ -27,21 +27,13 @@ textarea.monospace,
 .crx-logo-custom {
   width: auto;
   height: auto;
-  max-height: 80px;
   max-width: 100%;
   display: block;
 }
-.crx-logo-container {
-  box-sizing: border-box;
-  margin: 0 15px;
-}
-.crx-logo-container.navbar-light {
-  background-color: #fff;
-  border-radius: 6px;
-  padding: 0.25em;
-}
-.crx-logo-container.navbar-dark {
-  background-color: transparent;
+
+.sidebar-custom-branding {
+  padding: 20px;
+  margin: 0;
 }
 
 

coderedcms/templates/wagtailadmin/base.html

@@ -1,6 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
 {% load coderedcms_tags wagtailimages_tags wagtailsettings_tags %}
-{% django_setting "CRX_DISABLE_LAYOUT" as disable_layout %}
 
 {% block furniture %}
     {% include "coderedcms/includes/crx_banner.html" %}
@@ -9,4 +8,4 @@
 
 {# NOTE: this must be on a single line, otherwise Django templates will create
   whitespace, and wagtail will think the whitespace is the custom logo! #}
-{% block branding_logo %}{% if not disable_layout and settings.coderedcms.LayoutSettings.logo %}<div class="crx-logo-container {{settings.coderedcms.LayoutSettings.navbar_color_scheme}}">{% image settings.coderedcms.LayoutSettings.logo original format-webp preserve-svg as logo_image %}<img src="{{ logo_image.url }}" class="crx-logo-custom" alt="Dashboard"></div>{% endif %}{% endblock %}
+{% block branding_logo %}{% django_setting "CRX_DISABLE_LAYOUT" as disable_layout %}{% if not disable_layout and settings.coderedcms.LayoutSettings.favicon %}{% image settings.coderedcms.LayoutSettings.favicon original format-webp preserve-svg as logo_image %}<img src="{{ logo_image.url }}" class="crx-logo-custom" alt="Dashboard">{% endif %}{% endblock %}

coderedcms/templates/wagtailadmin/login.html

@@ -1,4 +1,6 @@
 {% extends "wagtailadmin/login.html" %}
 {% load coderedcms_tags i18n %}
+{% block branding_login %}
 {% django_setting "WAGTAIL_SITE_NAME" as wagtail_site_name %}
-{% block branding_login %}{% trans 'Sign in to' %} {{ wagtail_site_name }}{% endblock %}
+{% trans 'Sign in to' %} {{ wagtail_site_name }}
+{% endblock %}

docs/releases/index.rst

@@ -29,6 +29,7 @@ Supported Versions:
 .. toctree::
     :maxdepth: 1
 
+    v4.0.1
     v4.0.0
     v3.0.4
     v3.0.3

docs/releases/v4.0.1.rst

@@ -0,0 +1,19 @@
+v4.0.1 release notes
+====================
+
+
+Bug fixes
+---------
+
+* Fix site name on login screen (bug introduced in 4.0).
+
+Changes
+-------
+
+* Use favicon instead of logo in Wagtail Admin. Starting with 4.0, sites with navbar settings disabled do not have the ability to change the light/dark navbar setting, which was being used in the admin to put a light or dark background on the logo. Because if this, a white logo on the default light background is unreadable. Determining if the logo is light or dark was a perpetual problem. To simplify it, we've switched to using the favicon. The favicon is much more suitable for this kind of situation.
+
+
+Thank you!
+----------
+
+Thanks to everyone who contributed to `4.0.1 on GitHub <https://github.com/coderedcorp/coderedcms/milestone/57?closed=1>`_.