Merge branch 'dev' into 1.10.x-to-dev

.github/workflows/build-crowdin-translation-packages.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Orchard CMS
-        uses: andrii-bodnar/crowdin-request-action@aac9a865d62b37060b0ce530db5ac5cfca02dd2c # 0.0.2
+        uses: andrii-bodnar/crowdin-request-action@ee7a2af9564d8934b5b4a8427185aaaffee0165e # v0.3.0
         with:
           route: POST /projects/{projectId}/translations/builds
           projectId: 46524
@@ -19,7 +19,7 @@ jobs:
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_API_TOKEN }}
 
       - name: Orchard CMS Gallery
-        uses: andrii-bodnar/crowdin-request-action@aac9a865d62b37060b0ce530db5ac5cfca02dd2c # 0.0.2
+        uses: andrii-bodnar/crowdin-request-action@ee7a2af9564d8934b5b4a8427185aaaffee0165e # v0.3.0
         with:
           route: POST /projects/{projectId}/translations/builds
           projectId: 63766

.github/workflows/compile.yml

@@ -18,13 +18,13 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Restore NuGet Packages
         run: nuget restore src/Orchard.sln
 
       - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
 
       - name: Compile
         run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:TreatWarningsAsErrors=true -WarnAsError /p:MvcBuildViews=true
@@ -70,10 +70,10 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Clone Repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
           node-version: 7
 

.github/workflows/release-package.yml

@@ -0,0 +1,39 @@
+name: Release Package
+# Builds the release package and uploads it as an artifact.
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release-package:
+    name: Release Package
+    runs-on: Windows-2025
+    defaults:
+      run:
+        shell: cmd
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
+      - name: Restore NuGet Packages
+        run: nuget restore src/Orchard.sln
+
+      - name: Add MSBuild to PATH
+        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
+
+      - name: Build Precompiled Application
+        run: msbuild Orchard.proj /m /v:minimal /t:Precompiled
+
+      - name: Generate Release Package Name
+        id: package-name
+        shell: pwsh
+        run: |
+          $packageName = "Orchard-$('${{ github.ref_name }}'.Replace('/', '_'))-${{ github.sha }}"
+          "package-name=$packageName" >> $Env:GITHUB_OUTPUT
+
+      - name: Upload Release Package
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: ${{ steps.package-name.outputs.package-name }}
+          path: .\build\Precompiled
+          if-no-files-found: error

.github/workflows/specflow.yml

@@ -39,7 +39,7 @@ jobs:
         shell: cmd
     steps:
       - name: Clone Repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           ref: ${{ matrix.branch }}
 

src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/LayoutEditor/Services/ScopeConfigurator.js

@@ -228,8 +228,8 @@
                                             return $(e).height();
                                         }));
                                         for (i = 1; i <= 12; i++)
-                                            ui.placeholder.removeClass("col-xs-" + i);
-                                        ui.placeholder.addClass("col-xs-" + receivedColumn.width);
+                                            ui.placeholder.removeClass("col-" + i);
+                                        ui.placeholder.addClass("col-" + receivedColumn.width);
                                         if (maxHeight > 0) {
                                             ui.placeholder.height(maxHeight);
                                             ui.placeholder.css("min-height", 0);
@@ -321,8 +321,8 @@
                                 result.push("layout-row-full");
                         }
                         if (child.type == "Column") {
-                            result.push("col-xs-" + child.width);
-                            result.push("col-xs-offset-" + child.offset);
+                            result.push("col-" + child.width);
+                            result.push("col-offset-" + child.offset);
                         }
                         if (child.type == "Content")
                             result.push("layout-content-" + child.contentTypeClass);

src/Orchard.Web/Modules/Orchard.Layouts/Assets/Less/LayoutEditor/Row.less

@@ -17,5 +17,14 @@
                 }
             }
         }
+
+        > div > .layout-children {
+            display: flex;
+            flex-direction: row;
+        }
+    }
+
+    .layout-column > div > .layout-children {
+        flex-direction: column;
     }
 }