Merge branch 'develop' into fix/docs

django-cms · May 7, 2021 · df1f022 · df1f022
2 parents 982bd8f + be6ce06
commit df1f022
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 22 deletions.
diff --git a/.readthedocs.yml → .readthedocs.yaml b/.readthedocs.yml → .readthedocs.yaml
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,15 +10,16 @@ Unreleased
 * Remove debug print from apphook_reload
 * Enforce use of coverage > 4 for python 3.8 support
 * Fixed 66622 bad Title.path in multilingual sites when parent slug is created or modified
+* Temporarily pinned django-treebeard to < 4.5, this avoids breaking changes introduced
+* Fix styles issues, caused by switching to the ``display: flex`` on the page tree renderer.
 * Added django-treebeard 4.5.1 support, previously pinned django-treebeard<4.5 to avoid breaking changes introduced
 * Updated documentation links
 * Added support for Github Actions based CI.
 * Added Support for testing frontend, docs, test and linting in different/parallel CI pipelines.
 * Remove travis integration from the project as the project has moved to Github Actions.
 * Fix all GitHub actions tests run on pull requests
 * Repair broken docs link to users/index.rst
-* Fixed missing builtin arguments on main ``cms`` management command causing it
-  to crash
+* Fixed missing builtin arguments on main ``cms`` management command causing it to crash
 * Fixed template label nested translation
 * Few changes in docs/contributing/code.rst
 

diff --git a/cms/appresolver.py b/cms/appresolver.py
@@ -23,12 +23,10 @@ def clear_app_resolvers():
     APP_RESOLVERS = []
 
 
-def applications_page_check(request, current_page=None, path=None):
+def applications_page_check(request, path=None):
     """Tries to find if given path was resolved over application.
     Applications have higher priority than other cms pages.
     """
-    if current_page:
-        return current_page
     if path is None:
         # We should get in this branch only if an apphook is active on /
         # This removes the non-CMS part of the URL.

diff --git a/cms/signals/__init__.py b/cms/signals/__init__.py
@@ -6,9 +6,9 @@
 from django.db.models import signals
 from django.dispatch import Signal
 
-from cms.models import PagePermission, GlobalPagePermission, PageUser, PageUserGroup
+from cms.models import PagePermission, GlobalPagePermission, User, PageUser, PageUserGroup
 from django.conf import settings
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import Group
 
 #################### Our own signals ###################
 

diff --git a/cms/static/cms/css/3.8.0/cms.pagetree.css b/cms/static/cms/css/3.8.0/cms.pagetree.css
diff --git a/cms/static/cms/css/3.8.0rc1/cms.base.css b/cms/static/cms/css/3.8.0rc1/cms.base.css
diff --git a/cms/static/cms/css/3.8.0rc1/cms.pagetree.css b/cms/static/cms/css/3.8.0rc1/cms.pagetree.css
diff --git a/cms/static/cms/css/3.8.0rc1/cms.welcome.css b/cms/static/cms/css/3.8.0rc1/cms.welcome.css
diff --git a/cms/static/cms/fonts/3.8.0rc1/django-cms-iconfont.woff2 b/cms/static/cms/fonts/3.8.0rc1/django-cms-iconfont.woff2
diff --git a/cms/static/cms/js/dist/3.8.0rc1/bundle.toolbar.min.js b/cms/static/cms/js/dist/3.8.0rc1/bundle.toolbar.min.js
diff --git a/cms/static/cms/sass/components/pagetree/_tree.scss b/cms/static/cms/sass/components/pagetree/_tree.scss
@@ -49,6 +49,7 @@
     // important is to fight with admin-style
     padding: 0 !important;
     box-shadow: $pagetree-box-shadow !important;
+    flex-direction: column;
 }
 .cms-pagetree {
     border: $pagetree-border;
@@ -351,6 +352,11 @@
     border: none !important;
 }
 
+// MAIN TREE
+#changelist-form {
+    width: 100%;
+}
+
 //###########################################################
 // SECTION
 // separates different navigations

diff --git a/cms/templates/admin/cms/page/tree/base.html b/cms/templates/admin/cms/page/tree/base.html
@@ -145,8 +145,6 @@ <h1>
                 </div>
             </div>
 
-            <div class="clear"></div>
-
             <form id="changelist-form" action="" method="post" novalidate>{% csrf_token %}
                 <div class="cms-pagetree cms-pagetree-section">
                     <h2>{% trans "Main Navigation" %}</h2>

diff --git a/docs/introduction/01-install.rst b/docs/introduction/01-install.rst
@@ -103,6 +103,14 @@ The installer creates an admin user for you, with username/password ``admin``/``
 Start up the runserver
 ======================
 
+Go to mysite directory
+
+::
+
+    cd mysite
+
+Start the server using following command
+
 ::
 
     cd mysite

diff --git a/docs/introduction/02-templates_placeholders.rst b/docs/introduction/02-templates_placeholders.rst
@@ -20,7 +20,7 @@ You can define multiple templates, with different layouts or built-in
 components, and choose them for each page as required. A page's template
 can be switched for another at any time.
 
-You'll find the site's templates in ``mysite/templates``.
+You'll find the site's templates in ``tutorial-project/mysite/mysite/templates``.
 
 By default, pages in your site will use the ``fullwidth.html`` template, the first one listed in
 the project's ``settings.py`` ``CMS_TEMPLATES`` tuple:
@@ -65,7 +65,7 @@ placeholder "splashbox" %}`` inside the ``{% block content %}`` section. For exa
         {% placeholder "splashbox" %}
     {% endblock content %}
 
-If you switch to *Structure* mode, you'll see the new placeholders available for use.
+If you switch to *Structure* mode (*button in the upper-right corner of the page*), you'll see the new placeholders available for use.
 
 .. image:: /introduction/images/new-placeholder.png
    :alt: the new 'splashbox' placeholder