Merge bc52f94 into a173588

django-cms · May 2, 2024 · 150961b · 150961b
2 parents a173588 + bc52f94
commit 150961b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 27 deletions.
diff --git a/cms/static/cms/css/4.1.1/cms.base.css b/cms/static/cms/css/4.1.1/cms.base.css
diff --git a/cms/static/cms/css/4.1.1/cms.pagetree.css b/cms/static/cms/css/4.1.1/cms.pagetree.css
diff --git a/cms/static/cms/sass/components/_modal.scss b/cms/static/cms/sass/components/_modal.scss
@@ -256,6 +256,9 @@
     $margin: math.div($toolbar-height - $toolbar-button-height, 2);
     @extend .cms-toolbar-item-buttons;
     float: right;
+    &:dir(rtl) {
+        float: left;
+    }
     margin-inline-start: $margin;
 
     .cancel-link {
@@ -264,6 +267,9 @@
 }
 .cms-modal-item-buttons-left {
     float: left;
+    &:dir(rtl) {
+        float: right;
+    }
 }
 
 // alter footer when html markup is loaded

diff --git a/cms/static/cms/sass/components/_structureboard.scss b/cms/static/cms/sass/components/_structureboard.scss
@@ -371,7 +371,7 @@
             margin-inline-start: $structure-dragarea-padding-horizontal - 10px;
             cursor: pointer;
             transform: rotate(180deg);
-            [dir="rtl"] & {
+            &:dir(rtl) {
                 transform: rotate(0deg);
             }
         }
@@ -381,7 +381,7 @@
     }
     .cms-dragitem-expanded:before {
         transform: rotate(-90deg);
-        [dir="rtl"] & {
+        &:dir(rtl) {
             transform: rotate(-90deg);
         }
     }

diff --git a/cms/static/cms/sass/components/_toolbar.scss b/cms/static/cms/sass/components/_toolbar.scss
@@ -56,7 +56,7 @@
     // items
     .cms-toolbar-item {
         float: left;
-        [dir=rtl] & {
+        &:dir(rtl) {
             float: right;
         }
     }
@@ -107,13 +107,13 @@
     li {
         position: relative;
         float: left;
-        [dir=rtl] & {
+        &:dir(rtl) {
             float: right;
         }
     }
     li a {
         float: left;
-        [dir=rtl] & {
+        &:dir(rtl) {
             float: right;
         }
         color: $toolbar-menu-item-color;
@@ -184,7 +184,7 @@
                 display: block;
                 .cms-icon {
                     display: block;
-                    [dir="rtl"] & {
+                    &:dir(rtl) {
                         // undo arrow rotation for RTL
                         transform: rotate(0deg);
                     }
@@ -241,20 +241,14 @@
 
     .cms-toolbar-item {
         float: none;
-        [dir=rtl] & {
-            // a bit weird, but if removed, it will best match
-            // with [dir="rtl"] div.cms .cms-toolbar .cms-toolbar-item
-            // and will float to the right
-            float: none;
-        }
         margin: $toolbar-menu-item-padding !important;
         overflow: hidden;
         margin-top: 5px;
         margin-bottom: 8px;
     }
     .cms-toolbar-item-cms-mode-switcher a {
         float: left !important;
-        [dir=rtl] & {
+        &:dir(rtl) {
             float: right !important;
         }
         width: 50%;
@@ -415,7 +409,7 @@
         cursor: pointer;
         display: none;
         float: right;
-        [dir=rtl] & {
+        &:dir(rtl) {
             float: left;
         }
         position: relative;
@@ -570,7 +564,7 @@
 
     a {
         float: left;
-        [dir=rtl] & {
+        &:dir(rtl) {
             float: right;
         }
         line-height: $toolbar-button-height;

diff --git a/cms/static/cms/sass/components/pagetree/_tree.scss b/cms/static/cms/sass/components/pagetree/_tree.scss
@@ -390,7 +390,7 @@
         color: $gray-darkest;
         background: none;
 
-        [dir=rtl] & {
+        &:dir(rtl) {
             // inline-start & inline-end are not widely supported
             float: right;
         }
@@ -451,7 +451,7 @@
     min-width: $pagetree-cell-inner-height;
     height: $pagetree-cell-inner-height;
 
-    [dir=rtl] & {
+    &:dir(rtl) {
         // inline-start & inline-end are not widely supported
         float: left;
     }
@@ -501,7 +501,7 @@
 .cms-tree-reload {
     float: right;
 
-    [dir=rtl] & {
+    &:dir(rtl) {
         // inline-start & inline-end are not widely supported
         float: left;
     }
@@ -652,7 +652,7 @@
     float: left;
     margin-inline-end: 5px;
 
-    [dir=rtl] & {
+    &:dir(rtl) {
         // inline-start & inline-end are not widely supported
         float: right;
     }
@@ -676,7 +676,7 @@
 .cms-tree-filters {
     float: right;
 
-    [dir=rtl] & {
+    &:dir(rtl) {
         // inline-start & inline-end are not widely supported
         float: left;
     }
@@ -822,7 +822,7 @@
         margin-inline-start: -1px;
     }
     .jstree-ocl {
-        float: left; 
+        float: left;
         position: relative;
         inset-inline-start: $pagetree-nesting-padding;
         font-size: 12px;
@@ -832,7 +832,7 @@
         padding-block-end: 10px;
         padding-inline-start: 0px;
 
-        [dir=rtl] & {
+        &:dir(rtl) {
             // inline-start & inline-end are not widely supported
             float: right;
         }
@@ -892,7 +892,7 @@
             color: $gray !important;
         }
 
-        [dir=rtl] & {
+        &:dir(rtl) {
             // no direct logical property for background-position
             background-position: calc(100% - 2px) center;
         }

diff --git a/cms/static/cms/sass/settings/_cms.scss b/cms/static/cms/sass/settings/_cms.scss
@@ -137,8 +137,8 @@ $z-layers: (
     "messages":         999999,
     "toolbar": (
         "base":         9999999,
-        "left":         10,
-        "right":        10,
+        "inset-inline-start": 10,
+        "inset-inline-end": 10,
     ),
     "sideframe": (
         "base":         999999,

diff --git a/cms/templates/cms/toolbar/toolbar.html b/cms/templates/cms/toolbar/toolbar.html
@@ -4,6 +4,8 @@
      class="cms cms-reset
      {% if not user.is_authenticated %} cms-toolbar-auth{% endif %}
      {% if debug %} cms-toolbar-debug{% endif %}"
+     {% if request.toolbar.toolbar_language %}lang="{{ request.toolbar.toolbar_language }}"{% endif %}
+     {% if request.toolbar.toolbar_language_bidi %}dir="{{ request.toolbar.toolbar_language_bidi|yesno:'rtl,ltr,auto' }}"{% endif %}
      data-touch-action="none">
 
     {% block toolbar_top %}

diff --git a/cms/toolbar/toolbar.py b/cms/toolbar/toolbar.py
@@ -168,6 +168,7 @@ def __init__(self, request, request_path=None, _async=False):
         self.is_staff = None
         self.clipboard = None
         self.toolbar_language = None
+        self.toolbar_language_bidi = None
         self.show_toolbar = True
         self.init_toolbar(request, request_path=request_path)
         # Internal attribute to track whether we can cache
@@ -252,6 +253,7 @@ def init_toolbar(self, request, request_path=None):
                 user_settings.language = self.request_language
                 user_settings.save()
             self.clipboard = user_settings.clipboard
+        self.toolbar_language_bidi = self.toolbar_language in settings.LANGUAGES_BIDI
 
         if hasattr(self, 'toolbars'):
             for key, toolbar in self.toolbars.items():