From 069f31dbff6a8f772b5763946bb45b96bb323d70 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Mon, 17 Feb 2025 10:42:36 +0000
Subject: [PATCH 01/49] Added support for pre/post appending view paths

---
 modules/system/traits/ViewMaker.php | 32 ++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/system/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php
index 8407e4e033..627e780dd9 100644
--- a/modules/system/traits/ViewMaker.php
+++ b/modules/system/traits/ViewMaker.php
@@ -43,8 +43,11 @@ trait ViewMaker
 
     /**
      * Prepends a path on the available view path locations.
+     *
+     * @param array|string $path
+     * @return void
      */
-    public function addViewPath(string|array $path): void
+    public function prependViewPath(array|string $path): void
     {
         $this->viewPath = (array) $this->viewPath;
 
@@ -55,6 +58,33 @@ public function addViewPath(string|array $path): void
         }
     }
 
+    /**
+     * Append a path on the available view path locations.
+     *
+     * @param array|string $path
+     * @return void
+     */
+    public function appendViewPath(array|string $path): void
+    {
+        $this->viewPath = (array) $this->viewPath;
+
+        if (is_array($path)) {
+            $this->viewPath = array_merge($this->viewPath, $path);
+        } else {
+            $this->viewPath[] = $path;
+        }
+    }
+
+    /**
+     * Prepends a path on the available view path locations.
+     *
+     * @deprecated Use prependViewPath()
+     */
+    public function addViewPath(string|array $path): void
+    {
+        $this->prependViewPath($path);
+    }
+
     /**
      * Returns the active view path locations.
      */

From f3706b8122e3d9fd976edfb827fecdbf430e3216 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Mon, 17 Feb 2025 10:43:21 +0000
Subject: [PATCH 02/49] Added default view files for forms and lists behaviours

---
 modules/backend/behaviors/FormController.php  |  5 ++
 modules/backend/behaviors/ListController.php  |  5 ++
 .../behaviors/formcontroller/create.php       | 53 ++++++++++++++++
 .../behaviors/formcontroller/preview.php      | 24 ++++++++
 .../behaviors/formcontroller/update.php       | 61 +++++++++++++++++++
 .../listcontroller/_list_toolbar.php          | 26 ++++++++
 .../behaviors/listcontroller/index.php        |  1 +
 7 files changed, 175 insertions(+)
 create mode 100644 modules/backend/behaviors/formcontroller/create.php
 create mode 100644 modules/backend/behaviors/formcontroller/preview.php
 create mode 100644 modules/backend/behaviors/formcontroller/update.php
 create mode 100644 modules/backend/behaviors/listcontroller/_list_toolbar.php
 create mode 100644 modules/backend/behaviors/listcontroller/index.php

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index ae58bb475f..11fc7d70ac 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -106,6 +106,11 @@ public function __construct($controller)
          */
         $this->config = $this->makeConfig($controller->formConfig ?: $this->formConfig, $this->requiredConfig);
         $this->config->modelClass = Str::normalizeClassName($this->config->modelClass);
+
+        /*
+         * Set default view path
+         */
+        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     /**
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index d9b25f712a..d060e94b37 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -93,6 +93,11 @@ public function __construct($controller)
          * Build configuration
          */
         $this->setConfig($this->listDefinitions[$this->primaryDefinition], $this->requiredConfig);
+
+        /*
+         * Set default view path
+         */
+        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     /**
diff --git a/modules/backend/behaviors/formcontroller/create.php b/modules/backend/behaviors/formcontroller/create.php
new file mode 100644
index 0000000000..e3835510c5
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/create.php
@@ -0,0 +1,53 @@
+<?php
+$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
+$formConfig = $formController->getConfig();
+?>
+
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?= Form::open(['class' => 'layout']) ?>
+
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.create')); ?>
+                </button>
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.create_and_close')); ?>
+                </button>
+                <span class="btn-text">
+                    or <a href="<?= Backend::url('jaxwilko/test/tests') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                </span>
+            </div>
+        </div>
+
+    <?= Form::close() ?>
+
+<?php else: ?>
+
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/preview.php b/modules/backend/behaviors/formcontroller/preview.php
new file mode 100644
index 0000000000..da239d591f
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/preview.php
@@ -0,0 +1,24 @@
+<?php
+$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
+$formConfig = $formController->getConfig();
+?>
+
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <div class="form-preview">
+        <?= $this->formRenderPreview() ?>
+    </div>
+
+<?php else: ?>
+
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/update.php b/modules/backend/behaviors/formcontroller/update.php
new file mode 100644
index 0000000000..3773eb8f4b
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/update.php
@@ -0,0 +1,61 @@
+<?php
+$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
+$formConfig = $formController->getConfig();
+?>
+
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?= Form::open(['class' => 'layout']) ?>
+
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="redirect:0"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.save')); ?>
+                </button>
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.save_and_close')); ?>
+                </button>
+                <button
+                    type="button"
+                    class="wn-icon-trash-o btn-icon danger pull-right"
+                    data-request="onDelete"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
+                </button>
+                <span class="btn-text">
+                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                </span>
+            </div>
+        </div>
+
+    <?= Form::close() ?>
+
+<?php else: ?>
+
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+
+<?php endif ?>
diff --git a/modules/backend/behaviors/listcontroller/_list_toolbar.php b/modules/backend/behaviors/listcontroller/_list_toolbar.php
new file mode 100644
index 0000000000..453354c11d
--- /dev/null
+++ b/modules/backend/behaviors/listcontroller/_list_toolbar.php
@@ -0,0 +1,26 @@
+<?php
+$listController = $this->getClassExtension(\Backend\Behaviors\ListController::class);
+$listConfig = $listController->getConfig();
+?>
+
+<div data-control="toolbar">
+    <a
+        href="<?= url()->current() . '/create' ?>"
+        class="btn btn-primary wn-icon-plus">
+        <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
+    </a>
+
+    <button
+        class="btn btn-danger wn-icon-trash-o"
+        disabled="disabled"
+        onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
+        data-request="onDelete"
+        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')); ?>"
+        data-trigger-action="enable"
+        data-trigger=".control-list input[type=checkbox]"
+        data-trigger-condition="checked"
+        data-request-success="$(this).prop('disabled', 'disabled')"
+        data-stripe-load-indicator>
+        <?= e(trans('backend::lang.list.delete_selected')); ?>
+    </button>
+</div>
diff --git a/modules/backend/behaviors/listcontroller/index.php b/modules/backend/behaviors/listcontroller/index.php
new file mode 100644
index 0000000000..ea43a3636c
--- /dev/null
+++ b/modules/backend/behaviors/listcontroller/index.php
@@ -0,0 +1 @@
+<?= $this->listRender() ?>

From 67ef0eb9bc263bedd2b59ab6ce48c5a93f39afab Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Mon, 17 Feb 2025 10:49:41 +0000
Subject: [PATCH 03/49] Added --stubs option to create controller command

---
 modules/backend/console/CreateController.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/backend/console/CreateController.php b/modules/backend/console/CreateController.php
index 1528815323..5a40960fbd 100644
--- a/modules/backend/console/CreateController.php
+++ b/modules/backend/console/CreateController.php
@@ -20,6 +20,7 @@ class CreateController extends BaseScaffoldCommand
     protected $signature = 'create:controller
         {plugin : The name of the plugin. <info>(eg: Winter.Blog)</info>}
         {controller : The name of the controller to generate. <info>(eg: Posts)</info>}
+        {--stubs : Create view files for local overwrites.}
         {--force : Overwrite existing files with generated files.}
         {--model= : Defines the model name to use. If not provided, the singular name of the controller is used.}
         {--sidebar : Create stubs for form-with-sidebar layout}
@@ -45,10 +46,8 @@ class CreateController extends BaseScaffoldCommand
      * @var array A mapping of stub to generated file.
      */
     protected $stubs = [
-        'scaffold/controller/_list_toolbar.stub' => 'controllers/{{lower_name}}/_list_toolbar.php',
         'scaffold/controller/config_form.stub'   => 'controllers/{{lower_name}}/config_form.yaml',
         'scaffold/controller/config_list.stub'   => 'controllers/{{lower_name}}/config_list.yaml',
-        'scaffold/controller/index.stub'         => 'controllers/{{lower_name}}/index.php',
         'scaffold/controller/controller.stub'    => 'controllers/{{studly_name}}.php',
     ];
 
@@ -69,11 +68,16 @@ protected function prepareVars(): array
         $vars['model'] = $model;
         $vars['sidebar'] = $this->option('sidebar');
 
-        $layout = $this->option('sidebar') ? 'sidebar' : 'standard';
+        if ($this->option('stubs')) {
+            $this->stubs['scaffold/controller/index.stub'] = 'controllers/{{lower_name}}/index.php';
+            $this->stubs['scaffold/controller/_list_toolbar.stub'] = 'controllers/{{lower_name}}/_list_toolbar.php';
 
-        $this->stubs["scaffold/controller/{$layout}/create.stub"] = 'controllers/{{lower_name}}/create.php';
-        $this->stubs["scaffold/controller/{$layout}/update.stub"] = 'controllers/{{lower_name}}/update.php';
-        $this->stubs["scaffold/controller/{$layout}/preview.stub"] = 'controllers/{{lower_name}}/preview.php';
+            $layout = $this->option('sidebar') ? 'sidebar' : 'standard';
+
+            $this->stubs["scaffold/controller/{$layout}/create.stub"] = 'controllers/{{lower_name}}/create.php';
+            $this->stubs["scaffold/controller/{$layout}/update.stub"] = 'controllers/{{lower_name}}/update.php';
+            $this->stubs["scaffold/controller/{$layout}/preview.stub"] = 'controllers/{{lower_name}}/preview.php';
+        }
 
         return $vars;
     }

From 22d04efa4424ddec8cc2c2f80fde209442d8be93 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Mon, 17 Feb 2025 10:53:34 +0000
Subject: [PATCH 04/49] Added code styling fixes

---
 modules/backend/behaviors/formcontroller/create.php  | 6 ------
 modules/backend/behaviors/formcontroller/preview.php | 4 ----
 modules/backend/behaviors/formcontroller/update.php  | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/create.php b/modules/backend/behaviors/formcontroller/create.php
index e3835510c5..ce9c7ee7cc 100644
--- a/modules/backend/behaviors/formcontroller/create.php
+++ b/modules/backend/behaviors/formcontroller/create.php
@@ -11,9 +11,7 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?= Form::open(['class' => 'layout']) ?>
-
         <div class="layout-row">
             <?= $this->formRender() ?>
         </div>
@@ -42,12 +40,8 @@ class="btn btn-default">
                 </span>
             </div>
         </div>
-
     <?= Form::close() ?>
-
 <?php else: ?>
-
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
 <?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/preview.php b/modules/backend/behaviors/formcontroller/preview.php
index da239d591f..467b1f1528 100644
--- a/modules/backend/behaviors/formcontroller/preview.php
+++ b/modules/backend/behaviors/formcontroller/preview.php
@@ -11,14 +11,10 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <div class="form-preview">
         <?= $this->formRenderPreview() ?>
     </div>
-
 <?php else: ?>
-
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
 <?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/update.php b/modules/backend/behaviors/formcontroller/update.php
index 3773eb8f4b..5422391e92 100644
--- a/modules/backend/behaviors/formcontroller/update.php
+++ b/modules/backend/behaviors/formcontroller/update.php
@@ -11,9 +11,7 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?= Form::open(['class' => 'layout']) ?>
-
         <div class="layout-row">
             <?= $this->formRender() ?>
         </div>
@@ -50,12 +48,8 @@ class="wn-icon-trash-o btn-icon danger pull-right"
                 </span>
             </div>
         </div>
-
     <?= Form::close() ?>
-
 <?php else: ?>
-
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
 <?php endif ?>

From 3feecb6221a1539f0b171993fd94d80928315f0f Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Mon, 17 Feb 2025 12:29:46 +0000
Subject: [PATCH 05/49] Added fix for hardcoded link

---
 modules/backend/behaviors/formcontroller/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/formcontroller/create.php b/modules/backend/behaviors/formcontroller/create.php
index ce9c7ee7cc..5ef97d45fb 100644
--- a/modules/backend/behaviors/formcontroller/create.php
+++ b/modules/backend/behaviors/formcontroller/create.php
@@ -36,7 +36,7 @@ class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')); ?>
                 </button>
                 <span class="btn-text">
-                    or <a href="<?= Backend::url('jaxwilko/test/tests') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                 </span>
             </div>
         </div>

From 8b65ce09b4d59daa6154cfc1d6ee79800e806e9f Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Mon, 17 Feb 2025 07:40:43 -0600
Subject: [PATCH 06/49] Update
 modules/backend/behaviors/listcontroller/_list_toolbar.php

Co-authored-by: Marc Jauvin <marc.jauvin@gmail.com>
---
 modules/backend/behaviors/listcontroller/_list_toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/listcontroller/_list_toolbar.php b/modules/backend/behaviors/listcontroller/_list_toolbar.php
index 453354c11d..5ba126ef63 100644
--- a/modules/backend/behaviors/listcontroller/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/_list_toolbar.php
@@ -5,7 +5,7 @@
 
 <div data-control="toolbar">
     <a
-        href="<?= url()->current() . '/create' ?>"
+        href="<?= $this->actionUrl('create') ?>"
         class="btn btn-primary wn-icon-plus">
         <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
     </a>

From 41f1fb538f8817b18dec37be96da1776744ecf5b Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Mon, 17 Feb 2025 15:01:47 +0000
Subject: [PATCH 07/49] Added support for default reorder views

---
 modules/backend/behaviors/ReorderController.php     |  5 +++++
 .../reordercontroller/_reorder_toolbar.php          | 11 +++++++++++
 .../backend/behaviors/reordercontroller/reorder.php | 13 +++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
 create mode 100644 modules/backend/behaviors/reordercontroller/reorder.php

diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index 20cd3460ff..7d13386e11 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -91,6 +91,11 @@ public function __construct($controller)
          * Populate from config
          */
         $this->nameFrom = $this->getConfig('nameFrom', $this->nameFrom);
+
+        /*
+         * Set default view path
+         */
+        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     //
diff --git a/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php b/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
new file mode 100644
index 0000000000..9985cdc82b
--- /dev/null
+++ b/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
@@ -0,0 +1,11 @@
+<?php
+$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
+$formConfig = $formController?->getConfig();
+?>
+<?php if (!empty($formConfig)): ?>
+    <div data-control="toolbar">
+        <a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-primary oc-icon-caret-left">
+            <?= e(trans('backend::lang.form.return_to_list')) ?>
+        </a>
+    </div>
+<?php endif; ?>
diff --git a/modules/backend/behaviors/reordercontroller/reorder.php b/modules/backend/behaviors/reordercontroller/reorder.php
new file mode 100644
index 0000000000..8c0b9e4233
--- /dev/null
+++ b/modules/backend/behaviors/reordercontroller/reorder.php
@@ -0,0 +1,13 @@
+<?php
+$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
+$formConfig = $formController?->getConfig();
+?>
+<?php if (!empty($formConfig)): ?>
+    <?php Block::put('breadcrumb') ?>
+        <ul>
+            <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
+            <li><?= e(trans('backend::lang.reorder.default_title')) ?></li>
+        </ul>
+    <?php Block::endPut() ?>
+<?php endif; ?>
+<?= $this->reorderRender() ?>

From 8f216a2a186d47d5513285e99e6f5926692d638e Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:13:00 +0000
Subject: [PATCH 08/49] Added support for import export behaviour defaults

---
 .../behaviors/ImportExportController.php      |  5 ++
 .../behaviors/formcontroller/create.php       | 47 -------------------
 2 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 modules/backend/behaviors/formcontroller/create.php

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 057a0758a3..5974897414 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -138,6 +138,11 @@ public function __construct($controller)
         if ($this->exportOptionsFormWidget = $this->makeExportOptionsFormWidget()) {
             $this->exportOptionsFormWidget->bindToController();
         }
+
+        /*
+         * Set default view path
+         */
+        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     //
diff --git a/modules/backend/behaviors/formcontroller/create.php b/modules/backend/behaviors/formcontroller/create.php
deleted file mode 100644
index 5ef97d45fb..0000000000
--- a/modules/backend/behaviors/formcontroller/create.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
-$formConfig = $formController->getConfig();
-?>
-
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-    <?= Form::open(['class' => 'layout']) ?>
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')); ?>
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
-        </div>
-    <?= Form::close() ?>
-<?php else: ?>
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-<?php endif ?>

From fe85e22c54011753e104e9453fa59e95d20151d4 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:13:17 +0000
Subject: [PATCH 09/49] Added default value for bodyClass

---
 modules/backend/classes/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index bb413249fe..53d70038d4 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -95,7 +95,7 @@ class Controller extends ControllerBase
     /**
      * @var string Body class property used for customising the layout on a controller basis.
      */
-    public $bodyClass;
+    public $bodyClass = '';
 
     /**
      * @var array Default methods which cannot be called as actions.

From b77d2839957d1cb1e88bf30da5ff5bcacc4ca8ef Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:13:55 +0000
Subject: [PATCH 10/49] Added self generating breadcrumb partial

---
 modules/backend/layouts/_breadcrumb.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 modules/backend/layouts/_breadcrumb.php

diff --git a/modules/backend/layouts/_breadcrumb.php b/modules/backend/layouts/_breadcrumb.php
new file mode 100644
index 0000000000..e5f7b64313
--- /dev/null
+++ b/modules/backend/layouts/_breadcrumb.php
@@ -0,0 +1,14 @@
+<?php
+$menu = \Backend\Facades\BackendMenu::getActiveMainMenuItem();
+$context = \Backend\Facades\BackendMenu::getContext();
+$sideMenu = $menu->sideMenu[$context->sideMenuCode ?? null] ?? null;
+?>
+<?php if ($menu): ?>
+<ul>
+    <li><a href="<?= $menu->url ?>"><?= e(trans($menu->label)) ?></a></li>
+    <?php if ($sideMenu): ?>
+        <li><a href="<?= $sideMenu->url ?>"><?= e(trans($sideMenu->label)) ?></a></li>
+    <?php endif; ?>
+    <li><?= e(trans($this->pageTitle)) ?></li>
+</ul>
+<?php endif; ?>

From b0bbed0fbbf7fde0da143f868568cf816511f33d Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:14:24 +0000
Subject: [PATCH 11/49] Added default partials for behaviours

---
 .../behaviors/formcontroller/create.php       | 27 +++++++
 .../formcontroller/create/_fancy.php          | 14 ++++
 .../formcontroller/create/_sidebar.php        | 61 ++++++++++++++++
 .../formcontroller/create/_standard.php       | 39 +++++++++++
 .../formcontroller/create/fancy/_toolbar.php  | 11 +++
 .../behaviors/formcontroller/preview.php      | 37 ++++++----
 .../formcontroller/preview/_fancy.php         | 14 ++++
 .../formcontroller/preview/_sidebar.php       | 61 ++++++++++++++++
 .../formcontroller/preview/_standard.php      | 12 ++++
 .../formcontroller/preview/fancy/_toolbar.php |  1 +
 .../behaviors/formcontroller/update.php       | 70 ++++++-------------
 .../formcontroller/update/_fancy.php          | 14 ++++
 .../formcontroller/update/_sidebar.php        | 61 ++++++++++++++++
 .../formcontroller/update/_standard.php       | 50 +++++++++++++
 .../formcontroller/update/fancy/_toolbar.php  | 18 +++++
 .../importexportcontroller/export.php         | 24 +++++++
 .../importexportcontroller/import.php         | 24 +++++++
 17 files changed, 474 insertions(+), 64 deletions(-)
 create mode 100644 modules/backend/behaviors/formcontroller/create.php
 create mode 100644 modules/backend/behaviors/formcontroller/create/_fancy.php
 create mode 100644 modules/backend/behaviors/formcontroller/create/_sidebar.php
 create mode 100644 modules/backend/behaviors/formcontroller/create/_standard.php
 create mode 100644 modules/backend/behaviors/formcontroller/create/fancy/_toolbar.php
 create mode 100644 modules/backend/behaviors/formcontroller/preview/_fancy.php
 create mode 100644 modules/backend/behaviors/formcontroller/preview/_sidebar.php
 create mode 100644 modules/backend/behaviors/formcontroller/preview/_standard.php
 create mode 100644 modules/backend/behaviors/formcontroller/preview/fancy/_toolbar.php
 create mode 100644 modules/backend/behaviors/formcontroller/update/_fancy.php
 create mode 100644 modules/backend/behaviors/formcontroller/update/_sidebar.php
 create mode 100644 modules/backend/behaviors/formcontroller/update/_standard.php
 create mode 100644 modules/backend/behaviors/formcontroller/update/fancy/_toolbar.php
 create mode 100644 modules/backend/behaviors/importexportcontroller/export.php
 create mode 100644 modules/backend/behaviors/importexportcontroller/import.php

diff --git a/modules/backend/behaviors/formcontroller/create.php b/modules/backend/behaviors/formcontroller/create.php
new file mode 100644
index 0000000000..308d711d6b
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/create.php
@@ -0,0 +1,27 @@
+<?php
+
+// Get the form controller and config
+$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
+$formConfig = $formController->getConfig();
+
+// Decide which layout we should be rendering
+$layout = $this->formLayout ?? $formConfig->formLayout ?? null;
+if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
+    $layout = 'standard';
+}
+
+// If required, set the appropriate body classes
+$this->bodyClass = match ($layout) {
+    'fancy' => 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy',
+    'sidebar' => 'compact-container',
+    default => '',
+};
+
+// Define layout mode view path for inclusion
+$this->appendViewPath(sprintf('%s/create/%s', __DIR__, $layout));
+
+// Render the form layout
+echo $this->makePartial(sprintf('create/%s.php', $layout), [
+    'formController' => $formController,
+    'formConfig' => $formConfig,
+]);
diff --git a/modules/backend/behaviors/formcontroller/create/_fancy.php b/modules/backend/behaviors/formcontroller/create/_fancy.php
new file mode 100644
index 0000000000..f6b0008f00
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/create/_fancy.php
@@ -0,0 +1,14 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/create/_sidebar.php b/modules/backend/behaviors/formcontroller/create/_sidebar.php
new file mode 100644
index 0000000000..79798a74d5
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/create/_sidebar.php
@@ -0,0 +1,61 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?php Block::put('form-contents') ?>
+        <div class="layout">
+
+            <div class="layout-row">
+                <?= $this->formRenderOutsideFields() ?>
+                <?= $this->formRenderPrimaryTabs() ?>
+            </div>
+
+            <div class="form-buttons">
+                <div class="loading-indicator-container">
+                    <button
+                        type="button"
+                        data-request="onSave"
+                        data-hotkey="ctrl+s, cmd+s"
+                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        class="btn btn-primary">
+                        <?= e(trans('backend::lang.form.create')); ?>
+                    </button>
+                    <button
+                        type="button"
+                        data-request="onSave"
+                        data-request-data="close:1"
+                        data-hotkey="ctrl+enter, cmd+enter"
+                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        class="btn btn-default">
+                        <?= e(trans('backend::lang.form.create_and_close')); ?>
+                    </button>
+                    <span class="btn-text">
+                        or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                    </span>
+                </div>
+            </div>
+
+        </div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('form-sidebar') ?>
+        <div class="hide-tabs"><?= $this->formRenderSecondaryTabs() ?></div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('body') ?>
+        <?= Form::open(['class'=>'layout stretch']) ?>
+            <?= $this->makeLayout('form-with-sidebar') ?>
+        <?= Form::close() ?>
+    <?php Block::endPut() ?>
+
+<?php else: ?>
+    <div class="control-breadcrumb">
+        <?= Block::placeholder('breadcrumb') ?>
+    </div>
+    <div class="padded-container">
+        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+        <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+    </div>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/create/_standard.php b/modules/backend/behaviors/formcontroller/create/_standard.php
new file mode 100644
index 0000000000..6fb1e1babe
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/create/_standard.php
@@ -0,0 +1,39 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+    <div class="layout-row">
+        <?= $this->formRender() ?>
+    </div>
+
+    <div class="form-buttons">
+        <div class="loading-indicator-container">
+            <button
+                type="button"
+                data-request="onSave"
+                data-hotkey="ctrl+s, cmd+s"
+                data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                class="btn btn-primary">
+                <?= e(trans('backend::lang.form.create')); ?>
+            </button>
+            <button
+                type="button"
+                data-request="onSave"
+                data-request-data="close:1"
+                data-hotkey="ctrl+enter, cmd+enter"
+                data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                class="btn btn-default">
+                <?= e(trans('backend::lang.form.create_and_close')); ?>
+            </button>
+            <span class="btn-text">
+                or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+            </span>
+        </div>
+    </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/create/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/create/fancy/_toolbar.php
new file mode 100644
index 0000000000..3d420b403f
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/create/fancy/_toolbar.php
@@ -0,0 +1,11 @@
+<div class="form-buttons loading-indicator-container">
+    <a
+        type="submit"
+        data-request="onSave"
+        data-hotkey="ctrl+s, cmd+s"
+        data-request-data="redirect:0"
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+        class="btn btn-primary wn-icon-check save">
+        <?= e(trans('backend::lang.form.create')); ?>
+    </a>
+</div>
diff --git a/modules/backend/behaviors/formcontroller/preview.php b/modules/backend/behaviors/formcontroller/preview.php
index 467b1f1528..29d64847e4 100644
--- a/modules/backend/behaviors/formcontroller/preview.php
+++ b/modules/backend/behaviors/formcontroller/preview.php
@@ -1,20 +1,27 @@
 <?php
+
+// Get the form controller and config
 $formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
 $formConfig = $formController->getConfig();
-?>
 
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
+// Decide which layout we should be rendering
+$layout = $this->formLayout ?? $formConfig->formLayout ?? null;
+if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
+    $layout = 'standard';
+}
+
+// If required, set the appropriate body classes
+$this->bodyClass = match ($layout) {
+    'fancy' => 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy',
+    'sidebar' => 'compact-container',
+    default => '',
+};
+
+// Define layout mode view path for inclusion
+$this->appendViewPath(sprintf('%s/preview/%s', __DIR__, $layout));
 
-<?php if (!$this->fatalError): ?>
-    <div class="form-preview">
-        <?= $this->formRenderPreview() ?>
-    </div>
-<?php else: ?>
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-<?php endif ?>
+// Render the form layout
+echo $this->makePartial(sprintf('preview/%s.php', $layout), [
+    'formController' => $formController,
+    'formConfig' => $formConfig,
+]);
diff --git a/modules/backend/behaviors/formcontroller/preview/_fancy.php b/modules/backend/behaviors/formcontroller/preview/_fancy.php
new file mode 100644
index 0000000000..e7f9176c01
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/preview/_fancy.php
@@ -0,0 +1,14 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+        <div class="layout-row form-preview">
+            <?= $this->formRenderPreview() ?>
+        </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/preview/_sidebar.php b/modules/backend/behaviors/formcontroller/preview/_sidebar.php
new file mode 100644
index 0000000000..79798a74d5
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/preview/_sidebar.php
@@ -0,0 +1,61 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?php Block::put('form-contents') ?>
+        <div class="layout">
+
+            <div class="layout-row">
+                <?= $this->formRenderOutsideFields() ?>
+                <?= $this->formRenderPrimaryTabs() ?>
+            </div>
+
+            <div class="form-buttons">
+                <div class="loading-indicator-container">
+                    <button
+                        type="button"
+                        data-request="onSave"
+                        data-hotkey="ctrl+s, cmd+s"
+                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        class="btn btn-primary">
+                        <?= e(trans('backend::lang.form.create')); ?>
+                    </button>
+                    <button
+                        type="button"
+                        data-request="onSave"
+                        data-request-data="close:1"
+                        data-hotkey="ctrl+enter, cmd+enter"
+                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        class="btn btn-default">
+                        <?= e(trans('backend::lang.form.create_and_close')); ?>
+                    </button>
+                    <span class="btn-text">
+                        or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                    </span>
+                </div>
+            </div>
+
+        </div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('form-sidebar') ?>
+        <div class="hide-tabs"><?= $this->formRenderSecondaryTabs() ?></div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('body') ?>
+        <?= Form::open(['class'=>'layout stretch']) ?>
+            <?= $this->makeLayout('form-with-sidebar') ?>
+        <?= Form::close() ?>
+    <?php Block::endPut() ?>
+
+<?php else: ?>
+    <div class="control-breadcrumb">
+        <?= Block::placeholder('breadcrumb') ?>
+    </div>
+    <div class="padded-container">
+        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+        <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+    </div>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/preview/_standard.php b/modules/backend/behaviors/formcontroller/preview/_standard.php
new file mode 100644
index 0000000000..4098a0fe0d
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/preview/_standard.php
@@ -0,0 +1,12 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <div class="form-preview">
+        <?= $this->formRenderPreview() ?>
+    </div>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/preview/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/preview/fancy/_toolbar.php
new file mode 100644
index 0000000000..94212553b3
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/preview/fancy/_toolbar.php
@@ -0,0 +1 @@
+<div class="form-buttons loading-indicator-container"></div>
diff --git a/modules/backend/behaviors/formcontroller/update.php b/modules/backend/behaviors/formcontroller/update.php
index 5422391e92..fe9fe58210 100644
--- a/modules/backend/behaviors/formcontroller/update.php
+++ b/modules/backend/behaviors/formcontroller/update.php
@@ -1,55 +1,27 @@
 <?php
+
+// Get the form controller and config
 $formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
 $formConfig = $formController->getConfig();
-?>
 
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
-<?php Block::endPut() ?>
+// Decide which layout we should be rendering
+$layout = $this->formLayout ?? $formConfig->formLayout ?? null;
+if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
+    $layout = 'standard';
+}
+
+// If required, set the appropriate body classes
+$this->bodyClass .= match ($layout) {
+    'fancy' => ' fancy-layout compact-container breadcrumb-flush breadcrumb-fancy',
+    'sidebar' => ' compact-container',
+    default => '',
+};
 
-<?php if (!$this->fatalError): ?>
-    <?= Form::open(['class' => 'layout']) ?>
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
+// Define layout mode view path for inclusion
+$this->appendViewPath(sprintf('%s/update/%s', __DIR__, $layout));
 
-        <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.save')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.save_and_close')); ?>
-                </button>
-                <button
-                    type="button"
-                    class="wn-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
-                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
-        </div>
-    <?= Form::close() ?>
-<?php else: ?>
-    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
-    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-<?php endif ?>
+// Render the form layout
+echo $this->makePartial(sprintf('update/%s.php', $layout), [
+    'formController' => $formController,
+    'formConfig' => $formConfig,
+]);
diff --git a/modules/backend/behaviors/formcontroller/update/_fancy.php b/modules/backend/behaviors/formcontroller/update/_fancy.php
new file mode 100644
index 0000000000..f6b0008f00
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/update/_fancy.php
@@ -0,0 +1,14 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/update/_sidebar.php b/modules/backend/behaviors/formcontroller/update/_sidebar.php
new file mode 100644
index 0000000000..79798a74d5
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/update/_sidebar.php
@@ -0,0 +1,61 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?php Block::put('form-contents') ?>
+        <div class="layout">
+
+            <div class="layout-row">
+                <?= $this->formRenderOutsideFields() ?>
+                <?= $this->formRenderPrimaryTabs() ?>
+            </div>
+
+            <div class="form-buttons">
+                <div class="loading-indicator-container">
+                    <button
+                        type="button"
+                        data-request="onSave"
+                        data-hotkey="ctrl+s, cmd+s"
+                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        class="btn btn-primary">
+                        <?= e(trans('backend::lang.form.create')); ?>
+                    </button>
+                    <button
+                        type="button"
+                        data-request="onSave"
+                        data-request-data="close:1"
+                        data-hotkey="ctrl+enter, cmd+enter"
+                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        class="btn btn-default">
+                        <?= e(trans('backend::lang.form.create_and_close')); ?>
+                    </button>
+                    <span class="btn-text">
+                        or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                    </span>
+                </div>
+            </div>
+
+        </div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('form-sidebar') ?>
+        <div class="hide-tabs"><?= $this->formRenderSecondaryTabs() ?></div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('body') ?>
+        <?= Form::open(['class'=>'layout stretch']) ?>
+            <?= $this->makeLayout('form-with-sidebar') ?>
+        <?= Form::close() ?>
+    <?php Block::endPut() ?>
+
+<?php else: ?>
+    <div class="control-breadcrumb">
+        <?= Block::placeholder('breadcrumb') ?>
+    </div>
+    <div class="padded-container">
+        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+        <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+    </div>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/update/_standard.php b/modules/backend/behaviors/formcontroller/update/_standard.php
new file mode 100644
index 0000000000..bf53c27202
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/update/_standard.php
@@ -0,0 +1,50 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+
+    <div class="layout-row">
+        <?= $this->formRender() ?>
+    </div>
+
+    <div class="form-buttons">
+        <div class="loading-indicator-container">
+            <button
+                type="button"
+                data-request="onSave"
+                data-request-data="redirect:0"
+                data-hotkey="ctrl+s, cmd+s"
+                data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
+                class="btn btn-primary">
+                <?= e(trans('backend::lang.form.save')); ?>
+            </button>
+            <button
+                type="button"
+                data-request="onSave"
+                data-request-data="close:1"
+                data-hotkey="ctrl+enter, cmd+enter"
+                data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
+                class="btn btn-default">
+                <?= e(trans('backend::lang.form.save_and_close')); ?>
+            </button>
+            <button
+                type="button"
+                class="wn-icon-trash-o btn-icon danger pull-right"
+                data-request="onDelete"
+                data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
+                data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
+            </button>
+            <span class="btn-text">
+                or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+            </span>
+        </div>
+    </div>
+
+    <?= Form::close() ?>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/update/fancy/_toolbar.php
new file mode 100644
index 0000000000..0e9d06b118
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/update/fancy/_toolbar.php
@@ -0,0 +1,18 @@
+<div class="form-buttons loading-indicator-container">
+    <a
+        type="submit"
+        data-request="onSave"
+        data-hotkey="ctrl+s, cmd+s"
+        data-request-data="redirect:0"
+        data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+        class="btn btn-primary wn-icon-check save">
+        <?= e(trans('backend::lang.form.save')); ?>
+    </a>
+    <a
+        type="button"
+        class="btn btn-default wn-icon-trash-o delete"
+        data-request="onDelete"
+        data-load-indicator="<?= e(trans('backend::lang.form.deleting')); ?>"
+        data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
+    </a>
+</div>
diff --git a/modules/backend/behaviors/importexportcontroller/export.php b/modules/backend/behaviors/importexportcontroller/export.php
new file mode 100644
index 0000000000..6c0be77f72
--- /dev/null
+++ b/modules/backend/behaviors/importexportcontroller/export.php
@@ -0,0 +1,24 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?= Form::open(['class' => 'layout']) ?>
+
+    <div class="layout-row">
+        <?= $this->exportRender() ?>
+    </div>
+
+    <div class="form-buttons">
+        <div class="loading-indicator-container">
+            <button
+                type="submit"
+                data-control="popup"
+                data-handler="onExportLoadForm"
+                data-keyboard="false"
+                class="btn btn-primary">
+                <?= e(trans('backend::lang.import_export.export')) ?>
+            </button>
+        </div>
+    </div>
+
+<?= Form::close() ?>
diff --git a/modules/backend/behaviors/importexportcontroller/import.php b/modules/backend/behaviors/importexportcontroller/import.php
new file mode 100644
index 0000000000..f40d5b8d23
--- /dev/null
+++ b/modules/backend/behaviors/importexportcontroller/import.php
@@ -0,0 +1,24 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?= Form::open(['class' => 'layout']) ?>
+
+    <div class="layout-row">
+        <?= $this->importRender() ?>
+    </div>
+
+    <div class="form-buttons">
+        <div class="loading-indicator-container">
+            <button
+                type="submit"
+                data-control="popup"
+                data-handler="onImportLoadForm"
+                data-keyboard="false"
+                class="btn btn-primary">
+                <?= e(trans('backend::lang.import_export.import')) ?>
+            </button>
+        </div>
+    </div>
+
+<?= Form::close() ?>

From 0807dd4b013240745c231e96b4f75a69ca6c422d Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:15:07 +0000
Subject: [PATCH 12/49] Added self generating breadcumb for controller stubs

---
 .../backend/console/scaffold/controller/sidebar/create.stub  | 5 +----
 .../backend/console/scaffold/controller/sidebar/preview.stub | 5 +----
 .../backend/console/scaffold/controller/sidebar/update.stub  | 5 +----
 .../backend/console/scaffold/controller/standard/create.stub | 5 +----
 .../console/scaffold/controller/standard/preview.stub        | 5 +----
 .../backend/console/scaffold/controller/standard/update.stub | 5 +----
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/modules/backend/console/scaffold/controller/sidebar/create.stub b/modules/backend/console/scaffold/controller/sidebar/create.stub
index cfce78fa9c..9e2bbd9cec 100644
--- a/modules/backend/console/scaffold/controller/sidebar/create.stub
+++ b/modules/backend/console/scaffold/controller/sidebar/create.stub
@@ -1,8 +1,5 @@
 <?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('{{ model_lang_key }}.label_plural')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/sidebar/preview.stub b/modules/backend/console/scaffold/controller/sidebar/preview.stub
index 6014bd4585..952038c6ac 100644
--- a/modules/backend/console/scaffold/controller/sidebar/preview.stub
+++ b/modules/backend/console/scaffold/controller/sidebar/preview.stub
@@ -1,8 +1,5 @@
 <?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('{{ model_lang_key }}.label_plural')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/sidebar/update.stub b/modules/backend/console/scaffold/controller/sidebar/update.stub
index bd5677411b..232997fa41 100644
--- a/modules/backend/console/scaffold/controller/sidebar/update.stub
+++ b/modules/backend/console/scaffold/controller/sidebar/update.stub
@@ -1,8 +1,5 @@
 <?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('{{ model_lang_key }}.label_plural')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/standard/create.stub b/modules/backend/console/scaffold/controller/standard/create.stub
index 8836705591..6a91048591 100644
--- a/modules/backend/console/scaffold/controller/standard/create.stub
+++ b/modules/backend/console/scaffold/controller/standard/create.stub
@@ -1,8 +1,5 @@
 <?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('{{ model_lang_key }}.label_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/standard/preview.stub b/modules/backend/console/scaffold/controller/standard/preview.stub
index fbd3d7457d..d50dd41212 100644
--- a/modules/backend/console/scaffold/controller/standard/preview.stub
+++ b/modules/backend/console/scaffold/controller/standard/preview.stub
@@ -1,8 +1,5 @@
 <?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('{{ model_lang_key }}.label_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/standard/update.stub b/modules/backend/console/scaffold/controller/standard/update.stub
index 61e9a0d1c5..67c5a51734 100644
--- a/modules/backend/console/scaffold/controller/standard/update.stub
+++ b/modules/backend/console/scaffold/controller/standard/update.stub
@@ -1,8 +1,5 @@
 <?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('{{ model_lang_key }}.label_plural')); ?></a></li>
-        <li><?= e($this->pageTitle) ?></li>
-    </ul>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>

From cae770417032d8bc26496089dcbe4dee7d36eb9d Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:15:27 +0000
Subject: [PATCH 13/49] Added import export lang keys

---
 modules/backend/lang/en/lang.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 5c1a96f55b..99e9585854 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -518,6 +518,8 @@
         'number_all' => 'all numbers',
     ],
     'import_export' => [
+        'export' => 'Export',
+        'import' => 'Import',
         'upload_csv_file' => '1. Upload a CSV file',
         'import_file' => 'Import file',
         'row' => 'Row :row',

From 2a13527a507ed6f67ff8a8c645afed0665c7552c Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:17:37 +0000
Subject: [PATCH 14/49] Added fix for code styling

---
 modules/backend/behaviors/formcontroller/create/_sidebar.php  | 2 --
 modules/backend/behaviors/formcontroller/preview/_sidebar.php | 2 --
 modules/backend/behaviors/formcontroller/update/_sidebar.php  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/create/_sidebar.php b/modules/backend/behaviors/formcontroller/create/_sidebar.php
index 79798a74d5..fe3ba6eb29 100644
--- a/modules/backend/behaviors/formcontroller/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/create/_sidebar.php
@@ -3,7 +3,6 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?php Block::put('form-contents') ?>
         <div class="layout">
 
@@ -49,7 +48,6 @@ class="btn btn-default">
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
-
 <?php else: ?>
     <div class="control-breadcrumb">
         <?= Block::placeholder('breadcrumb') ?>
diff --git a/modules/backend/behaviors/formcontroller/preview/_sidebar.php b/modules/backend/behaviors/formcontroller/preview/_sidebar.php
index 79798a74d5..fe3ba6eb29 100644
--- a/modules/backend/behaviors/formcontroller/preview/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/preview/_sidebar.php
@@ -3,7 +3,6 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?php Block::put('form-contents') ?>
         <div class="layout">
 
@@ -49,7 +48,6 @@ class="btn btn-default">
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
-
 <?php else: ?>
     <div class="control-breadcrumb">
         <?= Block::placeholder('breadcrumb') ?>
diff --git a/modules/backend/behaviors/formcontroller/update/_sidebar.php b/modules/backend/behaviors/formcontroller/update/_sidebar.php
index 79798a74d5..fe3ba6eb29 100644
--- a/modules/backend/behaviors/formcontroller/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/update/_sidebar.php
@@ -3,7 +3,6 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?php Block::put('form-contents') ?>
         <div class="layout">
 
@@ -49,7 +48,6 @@ class="btn btn-default">
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
-
 <?php else: ?>
     <div class="control-breadcrumb">
         <?= Block::placeholder('breadcrumb') ?>

From 2f616e0f8e9e31669b546b83af159c0e8cc51e00 Mon Sep 17 00:00:00 2001
From: Jack Wilkinson <me@jackwilky.com>
Date: Tue, 18 Feb 2025 17:43:26 +0000
Subject: [PATCH 15/49] Added fixes for reorder partials

---
 .../reordercontroller/_reorder_toolbar.php       | 16 +++++-----------
 .../behaviors/reordercontroller/reorder.php      | 16 ++++------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php b/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
index 9985cdc82b..6320a60db7 100644
--- a/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
+++ b/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
@@ -1,11 +1,5 @@
-<?php
-$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
-$formConfig = $formController?->getConfig();
-?>
-<?php if (!empty($formConfig)): ?>
-    <div data-control="toolbar">
-        <a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-primary oc-icon-caret-left">
-            <?= e(trans('backend::lang.form.return_to_list')) ?>
-        </a>
-    </div>
-<?php endif; ?>
+<div data-control="toolbar">
+    <a href="<?= $this->actionUrl('/') ?>" class="btn btn-primary oc-icon-caret-left">
+        <?= e(trans('backend::lang.form.return_to_list')) ?>
+    </a>
+</div>
diff --git a/modules/backend/behaviors/reordercontroller/reorder.php b/modules/backend/behaviors/reordercontroller/reorder.php
index 8c0b9e4233..92925d4425 100644
--- a/modules/backend/behaviors/reordercontroller/reorder.php
+++ b/modules/backend/behaviors/reordercontroller/reorder.php
@@ -1,13 +1,5 @@
-<?php
-$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
-$formConfig = $formController?->getConfig();
-?>
-<?php if (!empty($formConfig)): ?>
-    <?php Block::put('breadcrumb') ?>
-        <ul>
-            <li><a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans($formConfig->name . '_plural')); ?></a></li>
-            <li><?= e(trans('backend::lang.reorder.default_title')) ?></li>
-        </ul>
-    <?php Block::endPut() ?>
-<?php endif; ?>
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
 <?= $this->reorderRender() ?>

From 5102170d58f414b3d773c24dc3a6068df26d3e94 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Fri, 21 Feb 2025 16:16:54 -0600
Subject: [PATCH 16/49] Move controllerbehavior default views to /views

---
 modules/backend/behaviors/FormController.php                 | 5 -----
 modules/backend/behaviors/ImportExportController.php         | 5 -----
 modules/backend/behaviors/ListController.php                 | 5 -----
 modules/backend/behaviors/ReorderController.php              | 5 -----
 .../backend/behaviors/formcontroller/{ => views}/create.php  | 0
 .../behaviors/formcontroller/{ => views}/create/_fancy.php   | 0
 .../behaviors/formcontroller/{ => views}/create/_sidebar.php | 0
 .../formcontroller/{ => views}/create/_standard.php          | 0
 .../formcontroller/{ => views}/create/fancy/_toolbar.php     | 0
 .../backend/behaviors/formcontroller/{ => views}/preview.php | 0
 .../behaviors/formcontroller/{ => views}/preview/_fancy.php  | 0
 .../formcontroller/{ => views}/preview/_sidebar.php          | 0
 .../formcontroller/{ => views}/preview/_standard.php         | 0
 .../formcontroller/{ => views}/preview/fancy/_toolbar.php    | 0
 .../backend/behaviors/formcontroller/{ => views}/update.php  | 0
 .../behaviors/formcontroller/{ => views}/update/_fancy.php   | 0
 .../behaviors/formcontroller/{ => views}/update/_sidebar.php | 0
 .../formcontroller/{ => views}/update/_standard.php          | 0
 .../formcontroller/{ => views}/update/fancy/_toolbar.php     | 0
 .../behaviors/importexportcontroller/{ => views}/export.php  | 0
 .../behaviors/importexportcontroller/{ => views}/import.php  | 0
 .../behaviors/listcontroller/{ => views}/_list_toolbar.php   | 0
 .../backend/behaviors/listcontroller/{ => views}/index.php   | 0
 .../reordercontroller/{ => views}/_reorder_toolbar.php       | 0
 .../behaviors/reordercontroller/{ => views}/reorder.php      | 0
 modules/backend/classes/ControllerBehavior.php               | 3 +++
 26 files changed, 3 insertions(+), 20 deletions(-)
 rename modules/backend/behaviors/formcontroller/{ => views}/create.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/create/_fancy.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/create/_sidebar.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/create/_standard.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/create/fancy/_toolbar.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/preview.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/preview/_fancy.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/preview/_sidebar.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/preview/_standard.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/preview/fancy/_toolbar.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/update.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/update/_fancy.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/update/_sidebar.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/update/_standard.php (100%)
 rename modules/backend/behaviors/formcontroller/{ => views}/update/fancy/_toolbar.php (100%)
 rename modules/backend/behaviors/importexportcontroller/{ => views}/export.php (100%)
 rename modules/backend/behaviors/importexportcontroller/{ => views}/import.php (100%)
 rename modules/backend/behaviors/listcontroller/{ => views}/_list_toolbar.php (100%)
 rename modules/backend/behaviors/listcontroller/{ => views}/index.php (100%)
 rename modules/backend/behaviors/reordercontroller/{ => views}/_reorder_toolbar.php (100%)
 rename modules/backend/behaviors/reordercontroller/{ => views}/reorder.php (100%)

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index 11fc7d70ac..ae58bb475f 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -106,11 +106,6 @@ public function __construct($controller)
          */
         $this->config = $this->makeConfig($controller->formConfig ?: $this->formConfig, $this->requiredConfig);
         $this->config->modelClass = Str::normalizeClassName($this->config->modelClass);
-
-        /*
-         * Set default view path
-         */
-        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     /**
diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 5974897414..057a0758a3 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -138,11 +138,6 @@ public function __construct($controller)
         if ($this->exportOptionsFormWidget = $this->makeExportOptionsFormWidget()) {
             $this->exportOptionsFormWidget->bindToController();
         }
-
-        /*
-         * Set default view path
-         */
-        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     //
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index d060e94b37..d9b25f712a 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -93,11 +93,6 @@ public function __construct($controller)
          * Build configuration
          */
         $this->setConfig($this->listDefinitions[$this->primaryDefinition], $this->requiredConfig);
-
-        /*
-         * Set default view path
-         */
-        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     /**
diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index 7d13386e11..20cd3460ff 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -91,11 +91,6 @@ public function __construct($controller)
          * Populate from config
          */
         $this->nameFrom = $this->getConfig('nameFrom', $this->nameFrom);
-
-        /*
-         * Set default view path
-         */
-        $this->controller->appendViewPath($this->guessViewPath());
     }
 
     //
diff --git a/modules/backend/behaviors/formcontroller/create.php b/modules/backend/behaviors/formcontroller/views/create.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/create.php
rename to modules/backend/behaviors/formcontroller/views/create.php
diff --git a/modules/backend/behaviors/formcontroller/create/_fancy.php b/modules/backend/behaviors/formcontroller/views/create/_fancy.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/create/_fancy.php
rename to modules/backend/behaviors/formcontroller/views/create/_fancy.php
diff --git a/modules/backend/behaviors/formcontroller/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/create/_sidebar.php
rename to modules/backend/behaviors/formcontroller/views/create/_sidebar.php
diff --git a/modules/backend/behaviors/formcontroller/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/create/_standard.php
rename to modules/backend/behaviors/formcontroller/views/create/_standard.php
diff --git a/modules/backend/behaviors/formcontroller/create/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/create/fancy/_toolbar.php
rename to modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
diff --git a/modules/backend/behaviors/formcontroller/preview.php b/modules/backend/behaviors/formcontroller/views/preview.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/preview.php
rename to modules/backend/behaviors/formcontroller/views/preview.php
diff --git a/modules/backend/behaviors/formcontroller/preview/_fancy.php b/modules/backend/behaviors/formcontroller/views/preview/_fancy.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/preview/_fancy.php
rename to modules/backend/behaviors/formcontroller/views/preview/_fancy.php
diff --git a/modules/backend/behaviors/formcontroller/preview/_sidebar.php b/modules/backend/behaviors/formcontroller/views/preview/_sidebar.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/preview/_sidebar.php
rename to modules/backend/behaviors/formcontroller/views/preview/_sidebar.php
diff --git a/modules/backend/behaviors/formcontroller/preview/_standard.php b/modules/backend/behaviors/formcontroller/views/preview/_standard.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/preview/_standard.php
rename to modules/backend/behaviors/formcontroller/views/preview/_standard.php
diff --git a/modules/backend/behaviors/formcontroller/preview/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/preview/fancy/_toolbar.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/preview/fancy/_toolbar.php
rename to modules/backend/behaviors/formcontroller/views/preview/fancy/_toolbar.php
diff --git a/modules/backend/behaviors/formcontroller/update.php b/modules/backend/behaviors/formcontroller/views/update.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/update.php
rename to modules/backend/behaviors/formcontroller/views/update.php
diff --git a/modules/backend/behaviors/formcontroller/update/_fancy.php b/modules/backend/behaviors/formcontroller/views/update/_fancy.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/update/_fancy.php
rename to modules/backend/behaviors/formcontroller/views/update/_fancy.php
diff --git a/modules/backend/behaviors/formcontroller/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/update/_sidebar.php
rename to modules/backend/behaviors/formcontroller/views/update/_sidebar.php
diff --git a/modules/backend/behaviors/formcontroller/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/update/_standard.php
rename to modules/backend/behaviors/formcontroller/views/update/_standard.php
diff --git a/modules/backend/behaviors/formcontroller/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
similarity index 100%
rename from modules/backend/behaviors/formcontroller/update/fancy/_toolbar.php
rename to modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
diff --git a/modules/backend/behaviors/importexportcontroller/export.php b/modules/backend/behaviors/importexportcontroller/views/export.php
similarity index 100%
rename from modules/backend/behaviors/importexportcontroller/export.php
rename to modules/backend/behaviors/importexportcontroller/views/export.php
diff --git a/modules/backend/behaviors/importexportcontroller/import.php b/modules/backend/behaviors/importexportcontroller/views/import.php
similarity index 100%
rename from modules/backend/behaviors/importexportcontroller/import.php
rename to modules/backend/behaviors/importexportcontroller/views/import.php
diff --git a/modules/backend/behaviors/listcontroller/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
similarity index 100%
rename from modules/backend/behaviors/listcontroller/_list_toolbar.php
rename to modules/backend/behaviors/listcontroller/views/_list_toolbar.php
diff --git a/modules/backend/behaviors/listcontroller/index.php b/modules/backend/behaviors/listcontroller/views/index.php
similarity index 100%
rename from modules/backend/behaviors/listcontroller/index.php
rename to modules/backend/behaviors/listcontroller/views/index.php
diff --git a/modules/backend/behaviors/reordercontroller/_reorder_toolbar.php b/modules/backend/behaviors/reordercontroller/views/_reorder_toolbar.php
similarity index 100%
rename from modules/backend/behaviors/reordercontroller/_reorder_toolbar.php
rename to modules/backend/behaviors/reordercontroller/views/_reorder_toolbar.php
diff --git a/modules/backend/behaviors/reordercontroller/reorder.php b/modules/backend/behaviors/reordercontroller/views/reorder.php
similarity index 100%
rename from modules/backend/behaviors/reordercontroller/reorder.php
rename to modules/backend/behaviors/reordercontroller/views/reorder.php
diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php
index 9b7dbee165..9effeb7285 100644
--- a/modules/backend/classes/ControllerBehavior.php
+++ b/modules/backend/classes/ControllerBehavior.php
@@ -68,6 +68,9 @@ public function __construct($controller)
         if (is_array($this->actions)) {
             $this->hideAction(array_diff(get_class_methods(get_class($this)), $this->actions));
         }
+
+        // Include this behavior's default views in the controller's view paths
+        $this->controller->appendViewPath($this->guessViewPath('/views'));
     }
 
     /**

From 3fe07ef14f51a910e94ace24fdadf77b81661109 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Wed, 26 Feb 2025 16:35:26 -0600
Subject: [PATCH 17/49] Update
 modules/backend/behaviors/reordercontroller/views/reorder.php

---
 modules/backend/behaviors/reordercontroller/views/reorder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/reordercontroller/views/reorder.php b/modules/backend/behaviors/reordercontroller/views/reorder.php
index 92925d4425..fc56b60337 100644
--- a/modules/backend/behaviors/reordercontroller/views/reorder.php
+++ b/modules/backend/behaviors/reordercontroller/views/reorder.php
@@ -1,5 +1,5 @@
 <?php Block::put('breadcrumb') ?>
     <?= $this->makeLayoutPartial('breadcrumb') ?>
 <?php Block::endPut() ?>
-
+<!-- Reorder Controller Widget -->
 <?= $this->reorderRender() ?>

From 41f643b9b64025c18c7edcd0f9bcf6a96171d179 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 26 Feb 2025 17:18:21 -0600
Subject: [PATCH 18/49] Switch to new prependViewPath() method

---
 modules/backend/classes/Controller.php        | 2 +-
 modules/backend/widgets/Lists.php             | 2 +-
 modules/system/tests/traits/ViewMakerTest.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 53d70038d4..5324fe76df 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -671,7 +671,7 @@ protected function runAjaxHandler($handler)
      */
     protected function runAjaxHandlerForWidget($widget, $handler)
     {
-        $this->addViewPath($widget->getViewPaths());
+        $this->prependViewPath($widget->getViewPaths());
 
         $result = call_user_func_array([$widget, $handler], array_values($this->params));
 
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index e34da43664..d6a1eac2aa 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -238,7 +238,7 @@ public function init()
         }
 
         if ($this->customViewPath) {
-            $this->addViewPath($this->customViewPath);
+            $this->prependViewPath($this->customViewPath);
         }
 
         $this->validateModel();
diff --git a/modules/system/tests/traits/ViewMakerTest.php b/modules/system/tests/traits/ViewMakerTest.php
index 3dab780e76..ca32d757df 100644
--- a/modules/system/tests/traits/ViewMakerTest.php
+++ b/modules/system/tests/traits/ViewMakerTest.php
@@ -47,9 +47,9 @@ public function testViewPaths()
             $this->normalizePath($path)
         );
 
-        // Test addViewPath() & getViewPaths()
+        // Test prependViewPath() & getViewPaths()
         $overridePath = "~/{$this->relativePath}override";
-        $this->stub->addViewPath($overridePath);
+        $this->stub->prependViewPath($overridePath);
         $this->assertEquals(
             [
                 $this->normalizePath($overridePath),

From 5d0b9cabc1ae10ac7360833c9beb5d550f3babc7 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 26 Feb 2025 17:46:21 -0600
Subject: [PATCH 19/49] Automatically set BackendMenu context from controller
 path

Credit to @sephyld. Replaces #1311. Closes #1269.
---
 modules/backend/classes/Controller.php        | 44 +++++++++++++++----
 .../scaffold/controller/controller.stub       |  7 +--
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 5324fe76df..441b677bc1 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -2,16 +2,17 @@
 
 namespace Backend\Classes;
 
-use Lang;
-use View;
-use Flash;
-use Config;
-use Request;
-use Backend;
-use Redirect;
-use Response;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\View;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Config;
+use Illuminate\Support\Facades\Request;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendMenu;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
 use Exception;
-use BackendAuth;
+use Backend\Facades\BackendAuth;
 use Backend\Models\UserPreference;
 use Backend\Models\Preference as BackendPreference;
 use Backend\Widgets\MediaManager;
@@ -199,6 +200,26 @@ public static function __callStatic($name, $params)
         return self::extendableCallStatic($name, $params);
     }
 
+    /**
+     * Set the navigation context based on the current action & parameters
+     */
+    protected function setNavigationContext(?string $action = null, array $params = []): void
+    {
+        $context = BackendMenu::getContext();
+
+        // @TODO: Support detecting module controllers as well
+        $currentClass = explode('\\', get_class($this));
+        $author = $currentClass[0];
+        $plugin = $currentClass[1];
+        $controller = $currentClass[count($currentClass) - 1];
+
+        $owner = $context->owner ?? "$author.$plugin";
+        $mainMenuCode = $context->mainMenuCode ?? strtolower($plugin);
+        $sideMenuCode = $context->sideMenuCode ?? strtolower($controller);
+
+        BackendMenu::setContext($owner, $mainMenuCode, $sideMenuCode);
+    }
+
     /**
      * Execute the controller action.
      * @param string $action The action name.
@@ -281,6 +302,11 @@ public function run($action = null, $params = [])
         BackendPreference::setAppLocale();
         BackendPreference::setAppFallbackLocale();
 
+        /*
+         * Set the navigation context
+         */
+        $this->setNavigationContext($action, $params);
+
         /*
          * Execute AJAX event
          */
diff --git a/modules/backend/console/scaffold/controller/controller.stub b/modules/backend/console/scaffold/controller/controller.stub
index 1d0b5c8cda..5859fd506b 100644
--- a/modules/backend/console/scaffold/controller/controller.stub
+++ b/modules/backend/console/scaffold/controller/controller.stub
@@ -22,15 +22,12 @@ class {{ studly_name }} extends Controller
     protected $requiredPermissions = [
         '{{ lower_author }}.{{ lower_plugin }}.{{ lower_name }}.manage_all',
     ];
+{% if sidebar %}
 
     public function __construct()
     {
         parent::__construct();
-
-        BackendMenu::setContext('{{ plugin_code }}', '{{ lower_plugin }}', '{{ lower_name }}');
-    {% if sidebar %}
-
         $this->bodyClass = 'compact-container';
-    {% endif -%}
     }
+{% endif -%}
 }

From e0e6cb9701d24c22335018f06f10cf68003084b8 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 26 Feb 2025 18:20:54 -0600
Subject: [PATCH 20/49] Tweaks to the default views based on migrating
 Winter.Blog

---
 .../formcontroller/views/create/_fancy.php    | 16 ++--
 .../formcontroller/views/create/_sidebar.php  |  8 +-
 .../formcontroller/views/create/_standard.php | 58 +++++++-------
 .../views/create/fancy/_toolbar.php           | 12 +--
 .../formcontroller/views/update/_fancy.php    | 16 ++--
 .../formcontroller/views/update/_sidebar.php  | 24 +++---
 .../formcontroller/views/update/_standard.php | 80 ++++++++++---------
 .../views/update/fancy/_toolbar.php           | 46 +++++++++--
 modules/backend/lang/en/lang.php              |  1 +
 9 files changed, 161 insertions(+), 100 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/views/create/_fancy.php b/modules/backend/behaviors/formcontroller/views/create/_fancy.php
index f6b0008f00..2358dfc9d0 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_fancy.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_fancy.php
@@ -3,11 +3,17 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-    <?= Form::open(['class' => 'layout']) ?>
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-    <?= Form::close() ?>
+    <div class="layout fancy-layout">
+        <?= Form::open([
+            'class' => 'layout',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
+            <div class="layout-row">
+                <?= $this->formRender() ?>
+            </div>
+        <?= Form::close() ?>
+    </div>
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
diff --git a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
index fe3ba6eb29..de444cc9fb 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
@@ -5,7 +5,6 @@
 <?php if (!$this->fatalError): ?>
     <?php Block::put('form-contents') ?>
         <div class="layout">
-
             <div class="layout-row">
                 <?= $this->formRenderOutsideFields() ?>
                 <?= $this->formRenderPrimaryTabs() ?>
@@ -35,7 +34,6 @@ class="btn btn-default">
                     </span>
                 </div>
             </div>
-
         </div>
     <?php Block::endPut() ?>
 
@@ -44,7 +42,11 @@ class="btn btn-default">
     <?php Block::endPut() ?>
 
     <?php Block::put('body') ?>
-        <?= Form::open(['class'=>'layout stretch']) ?>
+        <?= Form::open([
+            'class' => 'layout stretch',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
diff --git a/modules/backend/behaviors/formcontroller/views/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
index 6fb1e1babe..bd917cf32b 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_standard.php
@@ -3,35 +3,39 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-    <?= Form::open(['class' => 'layout']) ?>
-    <div class="layout-row">
-        <?= $this->formRender() ?>
-    </div>
+    <?= Form::open([
+        'class' => 'layout',
+        'data-change-monitor' => 'true',
+        'data-window-close-confirm' => 'true',
+    ]) ?>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
 
-    <div class="form-buttons">
-        <div class="loading-indicator-container">
-            <button
-                type="button"
-                data-request="onSave"
-                data-hotkey="ctrl+s, cmd+s"
-                data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                class="btn btn-primary">
-                <?= e(trans('backend::lang.form.create')); ?>
-            </button>
-            <button
-                type="button"
-                data-request="onSave"
-                data-request-data="close:1"
-                data-hotkey="ctrl+enter, cmd+enter"
-                data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                class="btn btn-default">
-                <?= e(trans('backend::lang.form.create_and_close')); ?>
-            </button>
-            <span class="btn-text">
-                or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-            </span>
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.create')); ?>
+                </button>
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.create_and_close')); ?>
+                </button>
+                <span class="btn-text">
+                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                </span>
+            </div>
         </div>
-    </div>
     <?= Form::close() ?>
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
diff --git a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
index 3d420b403f..156d53da1d 100644
--- a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
@@ -1,11 +1,13 @@
 <div class="form-buttons loading-indicator-container">
+    <!-- Save -->
     <a
-        type="submit"
+        href="javascript:;"
+        class="btn btn-primary wn-icon-check save"
         data-request="onSave"
+        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
         data-hotkey="ctrl+s, cmd+s"
-        data-request-data="redirect:0"
-        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
-        class="btn btn-primary wn-icon-check save">
-        <?= e(trans('backend::lang.form.create')); ?>
+    >
+        <?= e(trans('backend::lang.form.save')) ?>
     </a>
 </div>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_fancy.php b/modules/backend/behaviors/formcontroller/views/update/_fancy.php
index f6b0008f00..2358dfc9d0 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_fancy.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_fancy.php
@@ -3,11 +3,17 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-    <?= Form::open(['class' => 'layout']) ?>
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-    <?= Form::close() ?>
+    <div class="layout fancy-layout">
+        <?= Form::open([
+            'class' => 'layout',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
+            <div class="layout-row">
+                <?= $this->formRender() ?>
+            </div>
+        <?= Form::close() ?>
+    </div>
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index fe3ba6eb29..f1009b2901 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -5,7 +5,6 @@
 <?php if (!$this->fatalError): ?>
     <?php Block::put('form-contents') ?>
         <div class="layout">
-
             <div class="layout-row">
                 <?= $this->formRenderOutsideFields() ?>
                 <?= $this->formRenderPrimaryTabs() ?>
@@ -16,26 +15,29 @@
                     <button
                         type="button"
                         data-request="onSave"
+                        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+                        data-request-data="redirect:0"
                         data-hotkey="ctrl+s, cmd+s"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                        class="btn btn-primary">
-                        <?= e(trans('backend::lang.form.create')); ?>
+                        class="btn btn-primary"
+                    >
+                        <?= e(trans('backend::lang.form.save')); ?>
                     </button>
                     <button
                         type="button"
                         data-request="onSave"
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.create_and_close')); ?>
+                        data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+                        class="btn btn-default"
+                    >
+                        <?= e(trans('backend::lang.form.save_and_close')); ?>
                     </button>
                     <span class="btn-text">
                         or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                     </span>
                 </div>
             </div>
-
         </div>
     <?php Block::endPut() ?>
 
@@ -44,7 +46,11 @@ class="btn btn-default">
     <?php Block::endPut() ?>
 
     <?php Block::put('body') ?>
-        <?= Form::open(['class'=>'layout stretch']) ?>
+        <?= Form::open([
+            'class' => 'layout stretch',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
index bf53c27202..50ce12f29d 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_standard.php
@@ -3,47 +3,51 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-    <?= Form::open(['class' => 'layout']) ?>
-
-    <div class="layout-row">
-        <?= $this->formRender() ?>
-    </div>
-
-    <div class="form-buttons">
-        <div class="loading-indicator-container">
-            <button
-                type="button"
-                data-request="onSave"
-                data-request-data="redirect:0"
-                data-hotkey="ctrl+s, cmd+s"
-                data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
-                class="btn btn-primary">
-                <?= e(trans('backend::lang.form.save')); ?>
-            </button>
-            <button
-                type="button"
-                data-request="onSave"
-                data-request-data="close:1"
-                data-hotkey="ctrl+enter, cmd+enter"
-                data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans($formConfig->name)])); ?>"
-                class="btn btn-default">
-                <?= e(trans('backend::lang.form.save_and_close')); ?>
-            </button>
-            <button
-                type="button"
-                class="wn-icon-trash-o btn-icon danger pull-right"
-                data-request="onDelete"
-                data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
-                data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-            </button>
-            <span class="btn-text">
-                or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-            </span>
+    <?= Form::open([
+        'class' => 'layout',
+        'data-change-monitor' => 'true',
+        'data-window-close-confirm' => 'true',
+    ]) ?>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
         </div>
-    </div>
 
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+                    data-request-data="redirect:0"
+                    data-hotkey="ctrl+s, cmd+s"
+                    class="btn btn-primary"
+                >
+                    <?= e(trans('backend::lang.form.save')); ?>
+                </button>
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+                    class="btn btn-default"
+                >
+                    <?= e(trans('backend::lang.form.save_and_close')); ?>
+                </button>
+                <button
+                    type="button"
+                    class="wn-icon-trash-o btn-icon danger pull-right"
+                    data-request="onDelete"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
+                </button>
+                <span class="btn-text">
+                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                </span>
+            </div>
+        </div>
     <?= Form::close() ?>
-
 <?php else: ?>
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
diff --git a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
index 0e9d06b118..2a9cf0686e 100644
--- a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
@@ -1,18 +1,48 @@
 <div class="form-buttons loading-indicator-container">
+    <!-- Save -->
     <a
-        type="submit"
+        href="javascript:;"
+        class="btn btn-primary wn-icon-check save"
         data-request="onSave"
-        data-hotkey="ctrl+s, cmd+s"
+        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
         data-request-data="redirect:0"
-        data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
-        class="btn btn-primary wn-icon-check save">
-        <?= e(trans('backend::lang.form.save')); ?>
+        data-hotkey="ctrl+s, cmd+s"
+    >
+        <?= e(trans('backend::lang.form.save')) ?>
     </a>
+
+    <!-- Save and Close -->
     <a
+        href="javascript:;"
+        class="btn btn-primary wn-icon-check save"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        data-request="onSave"
+        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+    >
+        <?= e(trans('backend::lang.form.save_and_close')) ?>
+    </a>
+
+    <?php if ($formModel->url): ?>
+        <!-- Preview -->
+        <a
+            href="<?= e($formModel->url) ?>"
+            target="_blank"
+            class="btn btn-primary wn-icon-crosshairs"
+            data-control="preview-button"
+        >
+            <?= e(trans('backend::lang.form.save_and_close')) ?>
+        </a>
+    <?php endif ?>
+
+    <!-- Delete -->
+    <button
         type="button"
-        class="btn btn-default wn-icon-trash-o delete"
+        class="btn btn-default empty wn-icon-trash-o"
         data-request="onDelete"
+        title="<?= e(trans('backend::lang.form.delete')); ?>"
         data-load-indicator="<?= e(trans('backend::lang.form.deleting')); ?>"
-        data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-    </a>
+        data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
+        data-control="delete-button"
+    ></button>
 </div>
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 99e9585854..92888d965d 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -252,6 +252,7 @@
     'form' => [
         'create_title' => 'New :name',
         'update_title' => 'Edit :name',
+        'preview' => 'Preview',
         'preview_title' => 'Preview :name',
         'create_success' => ':name created',
         'update_success' => ':name updated',

From d6449e87723fd98475cf9df142a3509c2ef9bf6d Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 5 Mar 2025 15:02:03 -0600
Subject: [PATCH 21/49] Improve breadcrumb generation logic to take into
 account settings contexts

---
 modules/backend/layouts/_breadcrumb.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/backend/layouts/_breadcrumb.php b/modules/backend/layouts/_breadcrumb.php
index e5f7b64313..c9f5755392 100644
--- a/modules/backend/layouts/_breadcrumb.php
+++ b/modules/backend/layouts/_breadcrumb.php
@@ -2,12 +2,20 @@
 $menu = \Backend\Facades\BackendMenu::getActiveMainMenuItem();
 $context = \Backend\Facades\BackendMenu::getContext();
 $sideMenu = $menu->sideMenu[$context->sideMenuCode ?? null] ?? null;
+$settingsManager = \System\Classes\SettingsManager::instance();
+$settingsContext = $settingsManager->getContext();
+$settingsItem = null;
+if ($settingsContext) {
+    $settingsItem = $settingsManager->findSettingItem($settingsContext->owner, $settingsContext->itemCode);
+}
 ?>
 <?php if ($menu): ?>
 <ul>
     <li><a href="<?= $menu->url ?>"><?= e(trans($menu->label)) ?></a></li>
     <?php if ($sideMenu): ?>
         <li><a href="<?= $sideMenu->url ?>"><?= e(trans($sideMenu->label)) ?></a></li>
+    <?php elseif ($settingsItem): ?>
+        <li><a href="<?= $settingsItem->url ?>"><?= e(trans($settingsItem->label)) ?></a></li>
     <?php endif; ?>
     <li><?= e(trans($this->pageTitle)) ?></li>
 </ul>

From b4c66d619d65ffda8f82071dfdec696861e96d68 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 5 Mar 2025 15:20:01 -0600
Subject: [PATCH 22/49] Update the changemonitor status after the AJAX requests
 complete

---
 .../backend/behaviors/formcontroller/views/create/_sidebar.php  | 2 ++
 .../backend/behaviors/formcontroller/views/create/_standard.php | 2 ++
 .../backend/behaviors/formcontroller/views/update/_sidebar.php  | 1 +
 .../backend/behaviors/formcontroller/views/update/_standard.php | 2 ++
 .../behaviors/formcontroller/views/update/fancy/_toolbar.php    | 1 +
 5 files changed, 8 insertions(+)

diff --git a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
index de444cc9fb..6eeb77b6fa 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
@@ -17,6 +17,7 @@
                         data-request="onSave"
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                         class="btn btn-primary">
                         <?= e(trans('backend::lang.form.create')); ?>
                     </button>
@@ -26,6 +27,7 @@ class="btn btn-primary">
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                         class="btn btn-default">
                         <?= e(trans('backend::lang.form.create_and_close')); ?>
                     </button>
diff --git a/modules/backend/behaviors/formcontroller/views/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
index bd917cf32b..cd5147dfdf 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_standard.php
@@ -19,6 +19,7 @@
                     data-request="onSave"
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                     class="btn btn-primary">
                     <?= e(trans('backend::lang.form.create')); ?>
                 </button>
@@ -28,6 +29,7 @@ class="btn btn-primary">
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
+                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                     class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')); ?>
                 </button>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index f1009b2901..6f72d907c8 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -29,6 +29,7 @@ class="btn btn-primary"
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                         class="btn btn-default"
                     >
                         <?= e(trans('backend::lang.form.save_and_close')); ?>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
index 50ce12f29d..2fe5361e21 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_standard.php
@@ -31,6 +31,7 @@ class="btn btn-primary"
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                     class="btn btn-default"
                 >
                     <?= e(trans('backend::lang.form.save_and_close')); ?>
@@ -40,6 +41,7 @@ class="btn btn-default"
                     class="wn-icon-trash-o btn-icon danger pull-right"
                     data-request="onDelete"
                     data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
+                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                     data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
                 </button>
                 <span class="btn-text">
diff --git a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
index 2a9cf0686e..65184fa279 100644
--- a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
@@ -42,6 +42,7 @@ class="btn btn-default empty wn-icon-trash-o"
         data-request="onDelete"
         title="<?= e(trans('backend::lang.form.delete')); ?>"
         data-load-indicator="<?= e(trans('backend::lang.form.deleting')); ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
         data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
         data-control="delete-button"
     ></button>

From 143dfe495078b870fb3f32893e9ebd0289a049be Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 5 Mar 2025 15:34:32 -0600
Subject: [PATCH 23/49] Add top padding to form buttons container & remove
 buttons from the sidebar preview view

---
 .../formcontroller/views/create/_sidebar.php  |  2 +-
 .../formcontroller/views/create/_standard.php |  2 +-
 .../formcontroller/views/preview/_sidebar.php | 27 -------------------
 .../formcontroller/views/update/_sidebar.php  |  2 +-
 .../formcontroller/views/update/_standard.php |  2 +-
 5 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
index 6eeb77b6fa..6c8b44e0ac 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
@@ -10,7 +10,7 @@
                 <?= $this->formRenderPrimaryTabs() ?>
             </div>
 
-            <div class="form-buttons">
+            <div class="form-buttons p-t">
                 <div class="loading-indicator-container">
                     <button
                         type="button"
diff --git a/modules/backend/behaviors/formcontroller/views/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
index cd5147dfdf..6366538792 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_standard.php
@@ -12,7 +12,7 @@
             <?= $this->formRender() ?>
         </div>
 
-        <div class="form-buttons">
+        <div class="form-buttons p-t">
             <div class="loading-indicator-container">
                 <button
                     type="button"
diff --git a/modules/backend/behaviors/formcontroller/views/preview/_sidebar.php b/modules/backend/behaviors/formcontroller/views/preview/_sidebar.php
index fe3ba6eb29..ab51d25c0f 100644
--- a/modules/backend/behaviors/formcontroller/views/preview/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/preview/_sidebar.php
@@ -5,37 +5,10 @@
 <?php if (!$this->fatalError): ?>
     <?php Block::put('form-contents') ?>
         <div class="layout">
-
             <div class="layout-row">
                 <?= $this->formRenderOutsideFields() ?>
                 <?= $this->formRenderPrimaryTabs() ?>
             </div>
-
-            <div class="form-buttons">
-                <div class="loading-indicator-container">
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-hotkey="ctrl+s, cmd+s"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                        class="btn btn-primary">
-                        <?= e(trans('backend::lang.form.create')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.create_and_close')); ?>
-                    </button>
-                    <span class="btn-text">
-                        or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                    </span>
-                </div>
-            </div>
-
         </div>
     <?php Block::endPut() ?>
 
diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index 6f72d907c8..331f9c7625 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -10,7 +10,7 @@
                 <?= $this->formRenderPrimaryTabs() ?>
             </div>
 
-            <div class="form-buttons">
+            <div class="form-buttons p-t">
                 <div class="loading-indicator-container">
                     <button
                         type="button"
diff --git a/modules/backend/behaviors/formcontroller/views/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
index 2fe5361e21..8d37d3378b 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_standard.php
@@ -12,7 +12,7 @@
             <?= $this->formRender() ?>
         </div>
 
-        <div class="form-buttons">
+        <div class="form-buttons p-t">
             <div class="loading-indicator-container">
                 <button
                     type="button"

From fced797df6419c831274d1c30acb5aff0879d950 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 5 Mar 2025 15:35:34 -0600
Subject: [PATCH 24/49] Remove unnecessary backend controller views

---
 modules/backend/controllers/Users.php         |  2 +
 .../backend/controllers/usergroups/index.php  |  8 ---
 .../backend/controllers/userroles/index.php   |  8 ---
 modules/backend/controllers/users/create.php  | 66 -------------------
 modules/backend/controllers/users/index.php   |  1 -
 .../system/controllers/maillayouts/create.php | 50 --------------
 .../controllers/mailpartials/create.php       | 50 --------------
 .../controllers/mailtemplates/create.php      | 50 --------------
 8 files changed, 2 insertions(+), 233 deletions(-)
 delete mode 100644 modules/backend/controllers/usergroups/index.php
 delete mode 100644 modules/backend/controllers/userroles/index.php
 delete mode 100644 modules/backend/controllers/users/create.php
 delete mode 100644 modules/backend/controllers/users/index.php
 delete mode 100644 modules/system/controllers/maillayouts/create.php
 delete mode 100644 modules/system/controllers/mailpartials/create.php
 delete mode 100644 modules/system/controllers/mailtemplates/create.php

diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php
index 9151933e76..172b13771f 100644
--- a/modules/backend/controllers/Users.php
+++ b/modules/backend/controllers/Users.php
@@ -39,6 +39,8 @@ class Users extends Controller
      */
     public $bodyClass = 'compact-container';
 
+    public $formLayout = 'sidebar';
+
     /**
      * Constructor.
      */
diff --git a/modules/backend/controllers/usergroups/index.php b/modules/backend/controllers/usergroups/index.php
deleted file mode 100644
index ee75b8527c..0000000000
--- a/modules/backend/controllers/usergroups/index.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?= $this->listRender() ?>
diff --git a/modules/backend/controllers/userroles/index.php b/modules/backend/controllers/userroles/index.php
deleted file mode 100644
index ee75b8527c..0000000000
--- a/modules/backend/controllers/userroles/index.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?= $this->listRender() ?>
diff --git a/modules/backend/controllers/users/create.php b/modules/backend/controllers/users/create.php
deleted file mode 100644
index 4638a6a2d9..0000000000
--- a/modules/backend/controllers/users/create.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.user.menu_label')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?php Block::put('form-contents') ?>
-        <div class="layout">
-
-            <div class="layout-row">
-                <?= $this->formRenderOutsideFields() ?>
-                <?= $this->formRenderPrimaryTabs() ?>
-            </div>
-
-            <div class="form-buttons">
-                <div class="loading-indicator-container">
-                    <button
-                        type="submit"
-                        data-request="onSave"
-                        data-browser-validate
-                        data-hotkey="ctrl+s, cmd+s"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
-                        class="btn btn-primary">
-                        <?= e(trans('backend::lang.form.create')) ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-browser-validate
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating')) ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.create_and_close')) ?>
-                    </button>
-                    <span class="btn-text">
-                        <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('backend/users') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
-                    </span>
-                </div>
-            </div>
-
-        </div>
-    <?php Block::endPut() ?>
-
-    <?php Block::put('form-sidebar') ?>
-        <div class="hide-tabs"><?= $this->formRenderSecondaryTabs() ?></div>
-    <?php Block::endPut() ?>
-
-    <?php Block::put('body') ?>
-        <?= Form::open(['class'=>'layout stretch']) ?>
-            <?= $this->makeLayout('form-with-sidebar') ?>
-        <?= Form::close() ?>
-    <?php Block::endPut() ?>
-
-<?php else: ?>
-    <div class="control-breadcrumb">
-        <?= Block::placeholder('breadcrumb') ?>
-    </div>
-    <div class="padded-container">
-        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-        <p><a href="<?= Backend::url('backend/users') ?>" class="btn btn-default"><?= e(trans('backend::lang.user.return')) ?></a></p>
-    </div>
-<?php endif ?>
diff --git a/modules/backend/controllers/users/index.php b/modules/backend/controllers/users/index.php
deleted file mode 100644
index ea43a3636c..0000000000
--- a/modules/backend/controllers/users/index.php
+++ /dev/null
@@ -1 +0,0 @@
-<?= $this->listRender() ?>
diff --git a/modules/system/controllers/maillayouts/create.php b/modules/system/controllers/maillayouts/create.php
deleted file mode 100644
index fcde00a9d3..0000000000
--- a/modules/system/controllers/maillayouts/create.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>"><?= e(trans('system::lang.mail_templates.menu_layouts_label')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class'=>'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons p-t">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_layout')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')) ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_layout')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')) ?>
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates/index/layouts') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
-
-<?php endif ?>
diff --git a/modules/system/controllers/mailpartials/create.php b/modules/system/controllers/mailpartials/create.php
deleted file mode 100644
index 78942e0c18..0000000000
--- a/modules/system/controllers/mailpartials/create.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates/index/partials') ?>"><?= e(trans('system::lang.mail_templates.menu_partials_label')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class'=>'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons p-t">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_partial')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')) ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('system::lang.mail_templates.creating_partial')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')) ?>
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates/index/partials') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates/index/partials') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
-
-<?php endif ?>
diff --git a/modules/system/controllers/mailtemplates/create.php b/modules/system/controllers/mailtemplates/create.php
deleted file mode 100644
index 19995235af..0000000000
--- a/modules/system/controllers/mailtemplates/create.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php Block::put('breadcrumb') ?>
-    <ul>
-        <li><a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('system::lang.mail_templates.menu_label')) ?></a></li>
-        <li><?= e(trans($this->pageTitle)) ?></li>
-    </ul>
-<?php Block::endPut() ?>
-
-<?php if (!$this->fatalError): ?>
-
-    <?= Form::open(['class'=>'layout']) ?>
-
-        <div class="layout-row">
-            <?= $this->formRender() ?>
-        </div>
-
-        <div class="form-buttons p-t">
-            <div class="loading-indicator-container">
-                <button
-                    type="submit"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('system::lang.mail_templates.creating')) ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')) ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('system::lang.mail_templates.creating')) ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')) ?>
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('system/mailtemplates') ?>"><?= e(trans('backend::lang.form.close')) ?></a>
-                </span>
-            </div>
-        </div>
-
-    <?= Form::close() ?>
-
-<?php else: ?>
-
-    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
-    <p><a href="<?= Backend::url('system/mailtemplates') ?>" class="btn btn-default"><?= e(trans('system::lang.mail_templates.return')) ?></a></p>
-
-<?php endif ?>

From ce48714ecbd3f2ca407bd355c34595f4fd45b6f9 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 5 Mar 2025 15:37:57 -0600
Subject: [PATCH 25/49] Add localized "or" string

---
 .../backend/behaviors/formcontroller/views/create/_sidebar.php  | 2 +-
 .../backend/behaviors/formcontroller/views/create/_standard.php | 2 +-
 .../backend/behaviors/formcontroller/views/update/_sidebar.php  | 2 +-
 .../backend/behaviors/formcontroller/views/update/_standard.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
index 6c8b44e0ac..5608ec75f9 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
@@ -32,7 +32,7 @@ class="btn btn-default">
                         <?= e(trans('backend::lang.form.create_and_close')); ?>
                     </button>
                     <span class="btn-text">
-                        or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                        <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                     </span>
                 </div>
             </div>
diff --git a/modules/backend/behaviors/formcontroller/views/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
index 6366538792..3cc308eee8 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_standard.php
@@ -34,7 +34,7 @@ class="btn btn-default">
                     <?= e(trans('backend::lang.form.create_and_close')); ?>
                 </button>
                 <span class="btn-text">
-                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                 </span>
             </div>
         </div>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index 331f9c7625..d5a35dd34c 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -35,7 +35,7 @@ class="btn btn-default"
                         <?= e(trans('backend::lang.form.save_and_close')); ?>
                     </button>
                     <span class="btn-text">
-                        or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                        <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                     </span>
                 </div>
             </div>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
index 8d37d3378b..91dc44bba5 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_standard.php
@@ -45,7 +45,7 @@ class="wn-icon-trash-o btn-icon danger pull-right"
                     data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
                 </button>
                 <span class="btn-text">
-                    or <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                 </span>
             </div>
         </div>

From 8689e4003af935eb795eadf9c88d7883cb812ceb Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 5 Mar 2025 15:40:05 -0600
Subject: [PATCH 26/49] Add data-browser-validate to all form saving buttons

---
 .../backend/behaviors/formcontroller/views/create/_sidebar.php  | 2 ++
 .../backend/behaviors/formcontroller/views/create/_standard.php | 2 ++
 .../behaviors/formcontroller/views/create/fancy/_toolbar.php    | 1 +
 .../backend/behaviors/formcontroller/views/update/_sidebar.php  | 2 ++
 .../backend/behaviors/formcontroller/views/update/_standard.php | 2 ++
 .../behaviors/formcontroller/views/update/fancy/_toolbar.php    | 2 ++
 6 files changed, 11 insertions(+)

diff --git a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
index 5608ec75f9..2e65cdf8bb 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
@@ -15,6 +15,7 @@
                     <button
                         type="button"
                         data-request="onSave"
+                        data-browser-validate
                         data-hotkey="ctrl+s, cmd+s"
                         data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
                         data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
@@ -24,6 +25,7 @@ class="btn btn-primary">
                     <button
                         type="button"
                         data-request="onSave"
+                        data-browser-validate
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
diff --git a/modules/backend/behaviors/formcontroller/views/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
index 3cc308eee8..45a39802f7 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_standard.php
@@ -17,6 +17,7 @@
                 <button
                     type="button"
                     data-request="onSave"
+                    data-browser-validate
                     data-hotkey="ctrl+s, cmd+s"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
                     data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
@@ -26,6 +27,7 @@ class="btn btn-primary">
                 <button
                     type="button"
                     data-request="onSave"
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
diff --git a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
index 156d53da1d..db806e41f0 100644
--- a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
@@ -4,6 +4,7 @@
         href="javascript:;"
         class="btn btn-primary wn-icon-check save"
         data-request="onSave"
+        data-browser-validate
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
         data-hotkey="ctrl+s, cmd+s"
diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index d5a35dd34c..312776d2a5 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -15,6 +15,7 @@
                     <button
                         type="button"
                         data-request="onSave"
+                        data-browser-validate
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                         data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                         data-request-data="redirect:0"
@@ -26,6 +27,7 @@ class="btn btn-primary"
                     <button
                         type="button"
                         data-request="onSave"
+                        data-browser-validate
                         data-request-data="close:1"
                         data-hotkey="ctrl+enter, cmd+enter"
                         data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
diff --git a/modules/backend/behaviors/formcontroller/views/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
index 91dc44bba5..b9327585a2 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_standard.php
@@ -17,6 +17,7 @@
                 <button
                     type="button"
                     data-request="onSave"
+                    data-browser-validate
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
                     data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
                     data-request-data="redirect:0"
@@ -28,6 +29,7 @@ class="btn btn-primary"
                 <button
                     type="button"
                     data-request="onSave"
+                    data-browser-validate
                     data-request-data="close:1"
                     data-hotkey="ctrl+enter, cmd+enter"
                     data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
diff --git a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
index 65184fa279..fc628ea7d3 100644
--- a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
@@ -4,6 +4,7 @@
         href="javascript:;"
         class="btn btn-primary wn-icon-check save"
         data-request="onSave"
+        data-browser-validate
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
         data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
         data-request-data="redirect:0"
@@ -18,6 +19,7 @@ class="btn btn-primary wn-icon-check save"
         class="btn btn-primary wn-icon-check save"
         data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
         data-request="onSave"
+        data-browser-validate
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
     >
         <?= e(trans('backend::lang.form.save_and_close')) ?>

From 5de7bd7a87ca201de8e4dccaa92cdef8094f49df Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 15 Mar 2025 15:03:49 -0400
Subject: [PATCH 27/49] add missing delete button to sidebar layout update view

---
 .../behaviors/formcontroller/views/update/_sidebar.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index 312776d2a5..75ac048f69 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -36,6 +36,16 @@ class="btn btn-default"
                     >
                         <?= e(trans('backend::lang.form.save_and_close')); ?>
                     </button>
+                    <button
+                        type="button"
+                        data-request="onDelete"
+                        data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
+                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+                        data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
+                        class="wn-icon-trash-o btn-icon danger pull-right"
+                    >
+                    </button>
+
                     <span class="btn-text">
                         <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
                     </span>

From bc7e4937110e2f386901021df330eaca66ec5909 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 15 Mar 2025 16:28:57 -0400
Subject: [PATCH 28/49] no need for two links with the same url

---
 modules/backend/layouts/_breadcrumb.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/layouts/_breadcrumb.php b/modules/backend/layouts/_breadcrumb.php
index c9f5755392..cc56ddfda8 100644
--- a/modules/backend/layouts/_breadcrumb.php
+++ b/modules/backend/layouts/_breadcrumb.php
@@ -12,7 +12,7 @@
 <?php if ($menu): ?>
 <ul>
     <li><a href="<?= $menu->url ?>"><?= e(trans($menu->label)) ?></a></li>
-    <?php if ($sideMenu): ?>
+    <?php if ($sideMenu && $sideMenu->url !== $menu->url): ?>
         <li><a href="<?= $sideMenu->url ?>"><?= e(trans($sideMenu->label)) ?></a></li>
     <?php elseif ($settingsItem): ?>
         <li><a href="<?= $settingsItem->url ?>"><?= e(trans($settingsItem->label)) ?></a></li>

From 077d4c4767caca053b11e1e19c22547445863534 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 6 May 2025 10:11:14 -0400
Subject: [PATCH 29/49] do not show "delete selected" button if the list does
 not show the records checkboxes

---
 .../backend/behaviors/listcontroller/views/_list_toolbar.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index 5ba126ef63..8ee88e231d 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -10,6 +10,7 @@ class="btn btn-primary wn-icon-plus">
         <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
     </a>
 
+  <?php if (isset($listConfig->showCheckboxes) && $listConfig->showCheckboxes != false) : ?>
     <button
         class="btn btn-danger wn-icon-trash-o"
         disabled="disabled"
@@ -23,4 +24,5 @@ class="btn btn-danger wn-icon-trash-o"
         data-stripe-load-indicator>
         <?= e(trans('backend::lang.list.delete_selected')); ?>
     </button>
+  <?php endif ?>
 </div>

From acc69e8a2c4b9be0c966ab60460fb280fc752e6f Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 6 May 2025 11:22:59 -0400
Subject: [PATCH 30/49] add cancel button in default fancy toolbar

---
 .../behaviors/formcontroller/views/create/fancy/_toolbar.php    | 2 ++
 .../behaviors/formcontroller/views/update/fancy/_toolbar.php    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
index db806e41f0..d8c7fd3604 100644
--- a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
@@ -11,4 +11,6 @@ class="btn btn-primary wn-icon-check save"
     >
         <?= e(trans('backend::lang.form.save')) ?>
     </a>
+
+    <a class="btn btn-default" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
 </div>
diff --git a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
index fc628ea7d3..e30e433e44 100644
--- a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
@@ -37,6 +37,8 @@ class="btn btn-primary wn-icon-crosshairs"
         </a>
     <?php endif ?>
 
+    <a class="btn btn-default" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+
     <!-- Delete -->
     <button
         type="button"

From e7032e80f8aabbc68545c8ae8d7d05375c35f6cc Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 6 May 2025 11:36:12 -0400
Subject: [PATCH 31/49] remove extra space after closing parenthesis

---
 .../backend/behaviors/listcontroller/views/_list_toolbar.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index 8ee88e231d..b7648a4a4f 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -10,7 +10,7 @@ class="btn btn-primary wn-icon-plus">
         <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
     </a>
 
-  <?php if (isset($listConfig->showCheckboxes) && $listConfig->showCheckboxes != false) : ?>
+  <?php if (isset($listConfig->showCheckboxes) && $listConfig->showCheckboxes != false): ?>
     <button
         class="btn btn-danger wn-icon-trash-o"
         disabled="disabled"

From fe0abe71e69c379df6213e68e9712d7a5414153d Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Tue, 6 May 2025 10:23:22 -0600
Subject: [PATCH 32/49] Update
 modules/backend/behaviors/listcontroller/views/_list_toolbar.php

---
 .../listcontroller/views/_list_toolbar.php    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index b7648a4a4f..55b8fde06d 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -10,19 +10,20 @@ class="btn btn-primary wn-icon-plus">
         <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
     </a>
 
-  <?php if (isset($listConfig->showCheckboxes) && $listConfig->showCheckboxes != false): ?>
-    <button
-        class="btn btn-danger wn-icon-trash-o"
-        disabled="disabled"
-        onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
-        data-request="onDelete"
-        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')); ?>"
-        data-trigger-action="enable"
-        data-trigger=".control-list input[type=checkbox]"
-        data-trigger-condition="checked"
-        data-request-success="$(this).prop('disabled', 'disabled')"
-        data-stripe-load-indicator>
-        <?= e(trans('backend::lang.list.delete_selected')); ?>
-    </button>
-  <?php endif ?>
+    <?php if (isset($listConfig->showCheckboxes) && $listConfig->showCheckboxes != false): ?>
+        <button
+            class="btn btn-danger wn-icon-trash-o"
+            disabled="disabled"
+            onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
+            data-request="onDelete"
+            data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')); ?>"
+            data-trigger-action="enable"
+            data-trigger=".control-list input[type=checkbox]"
+            data-trigger-condition="checked"
+            data-request-success="$(this).prop('disabled', 'disabled')"
+            data-stripe-load-indicator
+        >
+            <?= e(trans('backend::lang.list.delete_selected')); ?>
+        </button>
+    <?php endif ?>
 </div>

From a36b3e073c5e926c1836a1a0605aabfc6c8a79a7 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 May 2025 02:54:13 -0400
Subject: [PATCH 33/49] Extract create/update form buttons into their own
 partials (#1352)

Co-authored-by: Luke Towers <git@luketowers.ca>

There is now a single partial for the formcontroller create/update buttons.

This partial can be overridden in your controllers using the partial names below:

create: _form_create_toolbar.php
update: _form_update_toolbar.php
both: _form_toolbar.php

Also adds Create and new button/action to FormController.
---
 modules/backend/behaviors/FormController.php  | 22 +++++
 .../formcontroller/partials/_toolbar.php      | 81 +++++++++++++++++++
 .../behaviors/formcontroller/views/create.php |  9 +--
 .../formcontroller/views/create/_sidebar.php  | 27 +------
 .../formcontroller/views/create/_standard.php | 27 +------
 .../formcontroller/views/preview.php          |  8 +-
 .../behaviors/formcontroller/views/update.php |  9 +--
 .../formcontroller/views/update/_sidebar.php  | 40 +--------
 .../formcontroller/views/update/_standard.php | 38 +--------
 modules/backend/lang/en/lang.php              |  1 +
 modules/backend/lang/es/lang.php              |  1 +
 modules/backend/lang/fr/lang.php              |  1 +
 modules/backend/lang/nl/lang.php              |  1 +
 modules/backend/lang/pl/lang.php              |  1 +
 modules/backend/lang/ru/lang.php              |  1 +
 15 files changed, 116 insertions(+), 151 deletions(-)
 create mode 100644 modules/backend/behaviors/formcontroller/partials/_toolbar.php

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index ae58bb475f..1b6c125296 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -191,7 +191,9 @@ public function initForm($model, $context = null)
     protected function prepareVars($model)
     {
         $this->controller->vars['formModel'] = $model;
+        $this->controller->vars['formConfig'] = $this->getConfig();
         $this->controller->vars['formContext'] = $this->formGetContext();
+        $this->controller->vars['formController'] = $this;
         $this->controller->vars['formRecordName'] = Lang::get($this->getConfig('name', 'backend::lang.model.name'));
     }
 
@@ -473,6 +475,10 @@ public function makeRedirect($context = null, $model = null)
             return Redirect::refresh();
         }
 
+        if (post('new', false)) {
+            return Redirect::to($this->controller->actionUrl('create'));
+        }
+
         if (post('redirect', true)) {
             $redirectUrl = $this->controller->formGetRedirectUrl($context, $model);
         }
@@ -882,4 +888,20 @@ public static function extendFormFields($callback)
             call_user_func_array($callback, [$widget, $widget->model, $widget->getContext()]);
         });
     }
+
+    /**
+     * Controller accessor for making partials within this behavior.
+     */
+    public function formMakePartial(string $partial, array $params = []): string
+    {
+        $contents = $this->controller->makePartial('form_' . $this->context . '_' . $partial, $params + $this->vars, false);
+        if (!$contents) {
+            $contents = $this->controller->makePartial('form_' . $partial, $params + $this->vars, false);
+        }
+        if (!$contents) {
+            $contents = $this->makePartial($partial, $params);
+        }
+
+        return $contents;
+    }
 }
diff --git a/modules/backend/behaviors/formcontroller/partials/_toolbar.php b/modules/backend/behaviors/formcontroller/partials/_toolbar.php
new file mode 100644
index 0000000000..d4929319fb
--- /dev/null
+++ b/modules/backend/behaviors/formcontroller/partials/_toolbar.php
@@ -0,0 +1,81 @@
+<?php
+    $modelName = $formConfig->name ?? '';
+?>
+<?php if ($formContext === 'create'): ?>
+    <div class="loading-indicator-container">
+        <button
+            type="submit"
+            data-request="onSave"
+            data-request-data="new:1"
+            data-browser-validate
+            data-hotkey="ctrl+shift+s, cmd+shift+s"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-primary">
+            <?= e(trans('backend::lang.form.create_and_new')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-hotkey="ctrl+s, cmd+s"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-primary">
+            <?= e(trans('backend::lang.form.create')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-request-data="close:1"
+            data-hotkey="ctrl+enter, cmd+enter"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-default">
+            <?= e(trans('backend::lang.form.create_and_close')); ?>
+        </button>
+        <span class="btn-text">
+            <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+        </span>
+    </div>
+<?php elseif ($formContext === 'update'): ?>
+    <div class="loading-indicator-container">
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request-data="redirect:0"
+            data-hotkey="ctrl+s, cmd+s"
+            class="btn btn-primary"
+        >
+            <?= e(trans('backend::lang.form.save')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-request-data="close:1"
+            data-hotkey="ctrl+enter, cmd+enter"
+            data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-default"
+        >
+            <?= e(trans('backend::lang.form.save_and_close')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onDelete"
+            data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
+            class="wn-icon-trash-o btn-icon danger pull-right"
+        >
+        </button>
+        <span class="btn-text">
+            <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+        </span>
+    </div>
+<?php endif ?>
diff --git a/modules/backend/behaviors/formcontroller/views/create.php b/modules/backend/behaviors/formcontroller/views/create.php
index 308d711d6b..12080a6fc8 100644
--- a/modules/backend/behaviors/formcontroller/views/create.php
+++ b/modules/backend/behaviors/formcontroller/views/create.php
@@ -1,9 +1,5 @@
 <?php
 
-// Get the form controller and config
-$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
-$formConfig = $formController->getConfig();
-
 // Decide which layout we should be rendering
 $layout = $this->formLayout ?? $formConfig->formLayout ?? null;
 if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
@@ -21,7 +17,4 @@
 $this->appendViewPath(sprintf('%s/create/%s', __DIR__, $layout));
 
 // Render the form layout
-echo $this->makePartial(sprintf('create/%s.php', $layout), [
-    'formController' => $formController,
-    'formConfig' => $formConfig,
-]);
+echo $this->makePartial(sprintf('create/%s.php', $layout));
diff --git a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
index 2e65cdf8bb..f278789de0 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_sidebar.php
@@ -11,32 +11,7 @@
             </div>
 
             <div class="form-buttons p-t">
-                <div class="loading-indicator-container">
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-browser-validate
-                        data-hotkey="ctrl+s, cmd+s"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                        class="btn btn-primary">
-                        <?= e(trans('backend::lang.form.create')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-browser-validate
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.create_and_close')); ?>
-                    </button>
-                    <span class="btn-text">
-                        <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                    </span>
-                </div>
+                <?= $this->formMakePartial('toolbar') ?>
             </div>
         </div>
     <?php Block::endPut() ?>
diff --git a/modules/backend/behaviors/formcontroller/views/create/_standard.php b/modules/backend/behaviors/formcontroller/views/create/_standard.php
index 45a39802f7..7b88ff8b33 100644
--- a/modules/backend/behaviors/formcontroller/views/create/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/create/_standard.php
@@ -13,32 +13,7 @@
         </div>
 
         <div class="form-buttons p-t">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($formConfig->name)])); ?>"
-                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')); ?>
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
+            <?= $this->formMakePartial('toolbar') ?>
         </div>
     <?= Form::close() ?>
 <?php else: ?>
diff --git a/modules/backend/behaviors/formcontroller/views/preview.php b/modules/backend/behaviors/formcontroller/views/preview.php
index 29d64847e4..1429909ce1 100644
--- a/modules/backend/behaviors/formcontroller/views/preview.php
+++ b/modules/backend/behaviors/formcontroller/views/preview.php
@@ -1,8 +1,5 @@
 <?php
 
-// Get the form controller and config
-$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
-$formConfig = $formController->getConfig();
 
 // Decide which layout we should be rendering
 $layout = $this->formLayout ?? $formConfig->formLayout ?? null;
@@ -21,7 +18,4 @@
 $this->appendViewPath(sprintf('%s/preview/%s', __DIR__, $layout));
 
 // Render the form layout
-echo $this->makePartial(sprintf('preview/%s.php', $layout), [
-    'formController' => $formController,
-    'formConfig' => $formConfig,
-]);
+echo $this->makePartial(sprintf('preview/%s.php', $layout));
diff --git a/modules/backend/behaviors/formcontroller/views/update.php b/modules/backend/behaviors/formcontroller/views/update.php
index fe9fe58210..eb439c1f9a 100644
--- a/modules/backend/behaviors/formcontroller/views/update.php
+++ b/modules/backend/behaviors/formcontroller/views/update.php
@@ -1,9 +1,5 @@
 <?php
 
-// Get the form controller and config
-$formController = $this->getClassExtension(\Backend\Behaviors\FormController::class);
-$formConfig = $formController->getConfig();
-
 // Decide which layout we should be rendering
 $layout = $this->formLayout ?? $formConfig->formLayout ?? null;
 if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
@@ -21,7 +17,4 @@
 $this->appendViewPath(sprintf('%s/update/%s', __DIR__, $layout));
 
 // Render the form layout
-echo $this->makePartial(sprintf('update/%s.php', $layout), [
-    'formController' => $formController,
-    'formConfig' => $formConfig,
-]);
+echo $this->makePartial(sprintf('update/%s.php', $layout));
diff --git a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
index 75ac048f69..f278789de0 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_sidebar.php
@@ -11,45 +11,7 @@
             </div>
 
             <div class="form-buttons p-t">
-                <div class="loading-indicator-container">
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-browser-validate
-                        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                        data-request-data="redirect:0"
-                        data-hotkey="ctrl+s, cmd+s"
-                        class="btn btn-primary"
-                    >
-                        <?= e(trans('backend::lang.form.save')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-browser-validate
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
-                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                        class="btn btn-default"
-                    >
-                        <?= e(trans('backend::lang.form.save_and_close')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onDelete"
-                        data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
-                        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                        data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
-                        class="wn-icon-trash-o btn-icon danger pull-right"
-                    >
-                    </button>
-
-                    <span class="btn-text">
-                        <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                    </span>
-                </div>
+                <?= $this->formMakePartial('toolbar') ?>
             </div>
         </div>
     <?php Block::endPut() ?>
diff --git a/modules/backend/behaviors/formcontroller/views/update/_standard.php b/modules/backend/behaviors/formcontroller/views/update/_standard.php
index b9327585a2..7b88ff8b33 100644
--- a/modules/backend/behaviors/formcontroller/views/update/_standard.php
+++ b/modules/backend/behaviors/formcontroller/views/update/_standard.php
@@ -13,43 +13,7 @@
         </div>
 
         <div class="form-buttons p-t">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    class="btn btn-primary"
-                >
-                    <?= e(trans('backend::lang.form.save')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-browser-validate
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
-                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                    class="btn btn-default"
-                >
-                    <?= e(trans('backend::lang.form.save_and_close')); ?>
-                </button>
-                <button
-                    type="button"
-                    class="wn-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($formConfig->name)])); ?>"
-                    data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-                </button>
-                <span class="btn-text">
-                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
+            <?= $this->formMakePartial('toolbar') ?>
         </div>
     <?= Form::close() ?>
 <?php else: ?>
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 92888d965d..2645960d33 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -265,6 +265,7 @@
         'not_found' => 'Form record with an ID of :id could not be found.',
         'action_confirm' => 'Are you sure?',
         'create' => 'Create',
+        'create_and_new' => 'Create and new',
         'create_and_close' => 'Create and close',
         'creating' => 'Creating...',
         'creating_name' => 'Creating :name...',
diff --git a/modules/backend/lang/es/lang.php b/modules/backend/lang/es/lang.php
index c10026cf7f..9a06c3719a 100644
--- a/modules/backend/lang/es/lang.php
+++ b/modules/backend/lang/es/lang.php
@@ -195,6 +195,7 @@
         'not_found' => 'El registro del formulario con un ID de :id no se pudo encontrar.',
         'action_confirm' => '¿Está usted seguro?',
         'create' => 'Crear',
+        'create_and_new' => 'Crear y nuevo',
         'create_and_close' => 'Crear y cerrar',
         'creating' => 'Creando...',
         'creating_name' => 'Creando :name...',
diff --git a/modules/backend/lang/fr/lang.php b/modules/backend/lang/fr/lang.php
index 251d800c18..ef499132bf 100644
--- a/modules/backend/lang/fr/lang.php
+++ b/modules/backend/lang/fr/lang.php
@@ -263,6 +263,7 @@
         'not_found' => 'Aucun enregistrement de formulaire ne correspond à l\'ID :id.',
         'action_confirm' => 'Confirmer l\'action ?',
         'create' => 'Créer',
+        'create_and_new' => 'Créer et nouveau',
         'create_and_close' => 'Créer et fermer',
         'creating' => 'Création en cours…',
         'creating_name' => 'Création d\'un(e) :name en cours…',
diff --git a/modules/backend/lang/nl/lang.php b/modules/backend/lang/nl/lang.php
index 425a3f4c10..52495bb734 100644
--- a/modules/backend/lang/nl/lang.php
+++ b/modules/backend/lang/nl/lang.php
@@ -259,6 +259,7 @@
         'not_found' => 'Het formulier met record ID :id is niet gevonden.',
         'action_confirm' => 'Weet je het zeker?',
         'create' => 'Maken',
+        'create_and_new' => 'Maken en nieuw',
         'create_and_close' => 'Maken en sluiten',
         'creating' => 'Maken...',
         'creating_name' => ':name maken...',
diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php
index 1e9a18a5d0..8d47307cd1 100644
--- a/modules/backend/lang/pl/lang.php
+++ b/modules/backend/lang/pl/lang.php
@@ -253,6 +253,7 @@
         'not_found' => 'Rekord formularza o ID :id nie został znaleziony.',
         'action_confirm' => 'Czy jesteś pewny?',
         'create' => 'Stwórz',
+        'create_and_new' => 'Utwórz i nowe',
         'create_and_close' => 'Stwórz i zamknij',
         'creating' => 'Tworzenie...',
         'creating_name' => 'Tworzenie :name...',
diff --git a/modules/backend/lang/ru/lang.php b/modules/backend/lang/ru/lang.php
index 828f5e1b52..ec071a9590 100644
--- a/modules/backend/lang/ru/lang.php
+++ b/modules/backend/lang/ru/lang.php
@@ -264,6 +264,7 @@
         'not_found' => 'Форма записи с идентификатором :ID не найдена.',
         'action_confirm' => 'Вы уверены, что хотите сделать это?',
         'create' => 'Создать',
+        'create_and_new' => 'Создать и новый',
         'create_and_close' => 'Создать и закрыть',
         'creating' => 'Создание...',
         'creating_name' => 'Создание :name...',

From 451f4f9f18dfe10b1abe88c6b51c8ab44b9b15f1 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sat, 10 May 2025 01:02:06 -0600
Subject: [PATCH 34/49] Use toolbar partial

---
 .../scaffold/controller/sidebar/create.stub   | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/modules/backend/console/scaffold/controller/sidebar/create.stub b/modules/backend/console/scaffold/controller/sidebar/create.stub
index 9e2bbd9cec..fcdcfafeca 100644
--- a/modules/backend/console/scaffold/controller/sidebar/create.stub
+++ b/modules/backend/console/scaffold/controller/sidebar/create.stub
@@ -3,40 +3,16 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?php Block::put('form-contents') ?>
         <div class="layout">
-
             <div class="layout-row">
                 <?= $this->formRenderOutsideFields() ?>
                 <?= $this->formRenderPrimaryTabs() ?>
             </div>
 
             <div class="form-buttons">
-                <div class="loading-indicator-container">
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-hotkey="ctrl+s, cmd+s"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                        class="btn btn-primary">
-                        <?= e(trans('backend::lang.form.create')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.create_and_close')); ?>
-                    </button>
-                    <span class="btn-text">
-                        or <a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                    </span>
-                </div>
+                <?= $this->formMakePartial('toolbar') ?>
             </div>
-
         </div>
     <?php Block::endPut() ?>
 
@@ -49,7 +25,6 @@
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
-
 <?php else: ?>
     <div class="control-breadcrumb">
         <?= Block::placeholder('breadcrumb') ?>

From 22ab21eab51550e75efffe82b05bf5049ce430e7 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sat, 10 May 2025 01:02:52 -0600
Subject: [PATCH 35/49] Update update.stub

---
 .../scaffold/controller/sidebar/update.stub   | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/modules/backend/console/scaffold/controller/sidebar/update.stub b/modules/backend/console/scaffold/controller/sidebar/update.stub
index 232997fa41..5d1ef6f7bd 100644
--- a/modules/backend/console/scaffold/controller/sidebar/update.stub
+++ b/modules/backend/console/scaffold/controller/sidebar/update.stub
@@ -3,48 +3,15 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?php Block::put('form-contents') ?>
         <div class="layout">
-
             <div class="layout-row">
                 <?= $this->formRenderOutsideFields() ?>
                 <?= $this->formRenderPrimaryTabs() ?>
             </div>
-
             <div class="form-buttons">
-                <div class="loading-indicator-container">
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-request-data="redirect:0"
-                        data-hotkey="ctrl+s, cmd+s"
-                        data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                        class="btn btn-primary">
-                        <?= e(trans('backend::lang.form.save')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.save_and_close')); ?>
-                    </button>
-                    <button
-                        type="button"
-                        class="wn-icon-trash-o btn-icon danger pull-right"
-                        data-request="onDelete"
-                        data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                        data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-                    </button>
-                    <span class="btn-text">
-                        or <a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                    </span>
-                </div>
+                <?= $this->formMakePartial('toolbar') ?>
             </div>
-
         </div>
     <?php Block::endPut() ?>
 
@@ -57,7 +24,6 @@
             <?= $this->makeLayout('form-with-sidebar') ?>
         <?= Form::close() ?>
     <?php Block::endPut() ?>
-
 <?php else: ?>
     <div class="control-breadcrumb">
         <?= Block::placeholder('breadcrumb') ?>

From 37322603a4d22c30f9b31716b4150e53d297505b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sat, 10 May 2025 01:03:24 -0600
Subject: [PATCH 36/49] Update create.stub

---
 .../scaffold/controller/standard/create.stub  | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/modules/backend/console/scaffold/controller/standard/create.stub b/modules/backend/console/scaffold/controller/standard/create.stub
index 6a91048591..2a936e607a 100644
--- a/modules/backend/console/scaffold/controller/standard/create.stub
+++ b/modules/backend/console/scaffold/controller/standard/create.stub
@@ -3,43 +3,16 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?= Form::open(['class' => 'layout']) ?>
-
         <div class="layout-row">
             <?= $this->formRender() ?>
         </div>
 
         <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')); ?>
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
+            <?= $this->formMakePartial('toolbar') ?>
         </div>
-
     <?= Form::close() ?>
-
 <?php else: ?>
-
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url('{{ controller_url }}') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
 <?php endif ?>

From 76b833c36be2284e8f07c59afa35d729eaf5223b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sat, 10 May 2025 01:03:53 -0600
Subject: [PATCH 37/49] Update update.stub

---
 .../scaffold/controller/standard/update.stub  | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/modules/backend/console/scaffold/controller/standard/update.stub b/modules/backend/console/scaffold/controller/standard/update.stub
index 67c5a51734..b4da197e06 100644
--- a/modules/backend/console/scaffold/controller/standard/update.stub
+++ b/modules/backend/console/scaffold/controller/standard/update.stub
@@ -3,51 +3,15 @@
 <?php Block::endPut() ?>
 
 <?php if (!$this->fatalError): ?>
-
     <?= Form::open(['class' => 'layout']) ?>
-
         <div class="layout-row">
             <?= $this->formRender() ?>
         </div>
-
         <div class="form-buttons">
-            <div class="loading-indicator-container">
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="redirect:0"
-                    data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                    class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.save')); ?>
-                </button>
-                <button
-                    type="button"
-                    data-request="onSave"
-                    data-request-data="close:1"
-                    data-hotkey="ctrl+enter, cmd+enter"
-                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                    class="btn btn-default">
-                    <?= e(trans('backend::lang.form.save_and_close')); ?>
-                </button>
-                <button
-                    type="button"
-                    class="wn-icon-trash-o btn-icon danger pull-right"
-                    data-request="onDelete"
-                    data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans('{{ model_lang_key }}.label')])); ?>"
-                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>">
-                </button>
-                <span class="btn-text">
-                    or <a href="<?= Backend::url('{{ controller_url }}') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
-                </span>
-            </div>
+            <?= $this->formMakePartial('toolbar') ?>
         </div>
-
     <?= Form::close() ?>
-
 <?php else: ?>
-
     <p class="flash-message static error"><?= e($this->fatalError) ?></p>
     <p><a href="<?= Backend::url('{{ controller_url }}') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
-
 <?php endif ?>

From 9bbdfa54673069a27af02752a38ebf05ac0c1817 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 May 2025 14:47:56 -0400
Subject: [PATCH 38/49] add reorder button on default list toolbar

---
 .../behaviors/listcontroller/views/_list_toolbar.php        | 6 ++++++
 modules/backend/lang/en/lang.php                            | 1 +
 2 files changed, 7 insertions(+)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index 55b8fde06d..c059fc2e28 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -26,4 +26,10 @@ class="btn btn-danger wn-icon-trash-o"
             <?= e(trans('backend::lang.list.delete_selected')); ?>
         </button>
     <?php endif ?>
+
+    <?php if ($this->isClassExtendedWith(\Backend\Behaviors\ReorderController::class)): ?>
+        <a href="<?= $this->actionUrl('reorder') ?>" class="btn btn-default icon-sitemap">
+            <?= e(trans('backend::lang.reorder.reorder_title', ['name' => trans($listConfig->title)])); ?>
+        </a>
+    <?php endif ?>
 </div>
diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 2645960d33..ee4e5bd019 100644
--- a/modules/backend/lang/en/lang.php
+++ b/modules/backend/lang/en/lang.php
@@ -360,6 +360,7 @@
     ],
     'reorder' => [
         'default_title' => 'Reorder records',
+        'reorder_title' => 'Reorder :name',
         'no_records' => 'There are no records available to sort.',
     ],
     'model' => [

From 33e1d3bd33b569dfe999903ae840b6b9e9833212 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 May 2025 15:02:52 -0400
Subject: [PATCH 39/49] fix icon class

---
 .../backend/behaviors/listcontroller/views/_list_toolbar.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index c059fc2e28..1881f25598 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -28,7 +28,7 @@ class="btn btn-danger wn-icon-trash-o"
     <?php endif ?>
 
     <?php if ($this->isClassExtendedWith(\Backend\Behaviors\ReorderController::class)): ?>
-        <a href="<?= $this->actionUrl('reorder') ?>" class="btn btn-default icon-sitemap">
+        <a href="<?= $this->actionUrl('reorder') ?>" class="btn btn-default wn-icon-sitemap">
             <?= e(trans('backend::lang.reorder.reorder_title', ['name' => trans($listConfig->title)])); ?>
         </a>
     <?php endif ?>

From 3cff2dc4f7c66df7c5eb4110ef85b452b28b646d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 May 2025 15:11:41 -0400
Subject: [PATCH 40/49] only add create button if FormController is used

---
 .../listcontroller/views/_list_toolbar.php       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index 1881f25598..de27b60948 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -4,11 +4,13 @@
 ?>
 
 <div data-control="toolbar">
-    <a
-        href="<?= $this->actionUrl('create') ?>"
-        class="btn btn-primary wn-icon-plus">
-        <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
-    </a>
+    <?php if ($this->isClassExtendedWith(\Backend\Behaviors\FormController::class)): ?>
+        <a
+            href="<?= $this->actionUrl('create') ?>"
+            class="btn btn-primary wn-icon-plus">
+            <?= e(trans('backend::lang.form.create_title', ['name' => trans(\Winter\Storm\Support\Str::before($listConfig->title, '_plural'))])); ?>
+        </a>
+    <?php endif ?>
 
     <?php if (isset($listConfig->showCheckboxes) && $listConfig->showCheckboxes != false): ?>
         <button
@@ -28,7 +30,9 @@ class="btn btn-danger wn-icon-trash-o"
     <?php endif ?>
 
     <?php if ($this->isClassExtendedWith(\Backend\Behaviors\ReorderController::class)): ?>
-        <a href="<?= $this->actionUrl('reorder') ?>" class="btn btn-default wn-icon-sitemap">
+        <a
+            href="<?= $this->actionUrl('reorder') ?>"
+            class="btn btn-default wn-icon-sitemap">
             <?= e(trans('backend::lang.reorder.reorder_title', ['name' => trans($listConfig->title)])); ?>
         </a>
     <?php endif ?>

From 777a556010f615111a93460a8b1022eef39659c9 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 May 2025 15:44:23 -0400
Subject: [PATCH 41/49] use more appropriate reorder icon

---
 .../backend/behaviors/listcontroller/views/_list_toolbar.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index de27b60948..18c96fc5bb 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -32,7 +32,7 @@ class="btn btn-danger wn-icon-trash-o"
     <?php if ($this->isClassExtendedWith(\Backend\Behaviors\ReorderController::class)): ?>
         <a
             href="<?= $this->actionUrl('reorder') ?>"
-            class="btn btn-default wn-icon-sitemap">
+            class="btn btn-default wn-icon-bars">
             <?= e(trans('backend::lang.reorder.reorder_title', ['name' => trans($listConfig->title)])); ?>
         </a>
     <?php endif ?>

From 0776b9807f9707c28386165c3dfc36bf2aec6466 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 10 May 2025 15:54:28 -0400
Subject: [PATCH 42/49] use arrows-up-down icon for reorder action

---
 .../backend/behaviors/listcontroller/views/_list_toolbar.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index 18c96fc5bb..f45cbb171a 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -32,7 +32,7 @@ class="btn btn-danger wn-icon-trash-o"
     <?php if ($this->isClassExtendedWith(\Backend\Behaviors\ReorderController::class)): ?>
         <a
             href="<?= $this->actionUrl('reorder') ?>"
-            class="btn btn-default wn-icon-bars">
+            class="btn btn-default wn-icon-arrows-up-down">
             <?= e(trans('backend::lang.reorder.reorder_title', ['name' => trans($listConfig->title)])); ?>
         </a>
     <?php endif ?>

From c5fc31b17ed7344bb44ecf8752d05b5351efd271 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 28 May 2025 14:59:17 -0600
Subject: [PATCH 43/49] Add buttons for import export behavior to list default
 toolbar when behavior is present

---
 .../behaviors/ImportExportController.php      | 46 ++++++++++---------
 .../listcontroller/views/_list_toolbar.php    | 20 ++++++++
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 057a0758a3..3688e1b06e 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -1,21 +1,23 @@
-<?php namespace Backend\Behaviors;
-
-use Str;
-use Lang;
-use View;
-use Response;
-use Backend;
-use BackendAuth;
-use Backend\Classes\ControllerBehavior;
+<?php
+
+namespace Backend\Behaviors;
+
 use Backend\Behaviors\ImportExportController\TranscodeFilter;
+use Backend\Classes\ControllerBehavior;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Exception;
 use Illuminate\Database\Eloquent\MassAssignmentException;
-use League\Csv\Reader as CsvReader;
-use League\Csv\Writer as CsvWriter;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 use League\Csv\EscapeFormula as CsvEscapeFormula;
+use League\Csv\Reader as CsvReader;
 use League\Csv\Statement as CsvStatement;
-use ApplicationException;
+use League\Csv\Writer as CsvWriter;
 use SplTempFileObject;
-use Exception;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Str;
 
 /**
  * Adds features for importing and exporting data.
@@ -146,8 +148,8 @@ public function __construct($controller)
 
     public function import()
     {
-        if ($response = $this->checkPermissionsForType('import')) {
-            return $response;
+        if (!$this->userHasAccess('import')) {
+            return Response::make(View::make('backend::access_denied'), 403);
         }
 
         $this->addJs('js/winter.import.js', 'core');
@@ -161,8 +163,8 @@ public function import()
 
     public function export()
     {
-        if ($response = $this->checkPermissionsForType('export')) {
-            return $response;
+        if (!$this->userHasAccess('export')) {
+            return Response::make(View::make('backend::access_denied'), 403);
         }
 
         if ($response = $this->checkUseListExportMode()) {
@@ -697,18 +699,18 @@ public function importExportMakePartial($partial, $params = [])
     }
 
     /**
-     * Checks to see if the import/export is controlled by permissions
-     * and if the logged in user has permissions.
-     * @return \View
+     * Check if the current user has access to the provided import/export action
      */
-    protected function checkPermissionsForType($type)
+    public function userHasAccess(string $type): bool
     {
         if (
             ($permissions = $this->getConfig($type.'[permissions]')) &&
             (!BackendAuth::getUser()->hasAnyAccess((array) $permissions))
         ) {
-            return Response::make(View::make('backend::access_denied'), 403);
+            return false;
         }
+
+        return true;
     }
 
     protected function makeOptionsFormWidgetForType($type)
diff --git a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
index f45cbb171a..f1dbb6f822 100644
--- a/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
+++ b/modules/backend/behaviors/listcontroller/views/_list_toolbar.php
@@ -36,4 +36,24 @@ class="btn btn-default wn-icon-arrows-up-down">
             <?= e(trans('backend::lang.reorder.reorder_title', ['name' => trans($listConfig->title)])); ?>
         </a>
     <?php endif ?>
+
+    <?php if ($this->isClassExtendedWith(\Backend\Behaviors\ImportExportController::class)): ?>
+        <div class="btn-group">
+            <?php $importExport = $this->asExtension(\Backend\Behaviors\ImportExportController::class); ?>
+            <?php if ($importExport->userHasAccess('export')): ?>
+                <a
+                    href="<?= $this->actionUrl('export') ?>"
+                    class="btn btn-default wn-icon-download">
+                    <?= e(trans('backend::lang.import_export.export')) ?>
+                </a>
+            <?php endif ?>
+            <?php if ($importExport->userHasAccess('import')): ?>
+                <a
+                    href="<?= $this->actionUrl('import') ?>"
+                    class="btn btn-default wn-icon-upload">
+                    <?= e(trans('backend::lang.import_export.import')) ?>
+                </a>
+            <?php endif ?>
+        </div>
+    <?php endif ?>
 </div>

From 0d7e874815a236c4f7164146322bb70f4421b8c2 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 28 May 2025 15:21:51 -0600
Subject: [PATCH 44/49] Add support for abort(403) in the backend

---
 .../behaviors/ImportExportController.php      |  5 +--
 modules/backend/classes/BackendController.php | 42 +++++++++++++------
 modules/backend/classes/Controller.php        |  2 +-
 modules/backend/controllers/UserRoles.php     | 10 ++---
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 3688e1b06e..d8a4a02360 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -10,7 +10,6 @@
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\View;
 use League\Csv\EscapeFormula as CsvEscapeFormula;
 use League\Csv\Reader as CsvReader;
 use League\Csv\Statement as CsvStatement;
@@ -149,7 +148,7 @@ public function __construct($controller)
     public function import()
     {
         if (!$this->userHasAccess('import')) {
-            return Response::make(View::make('backend::access_denied'), 403);
+            abort(403);
         }
 
         $this->addJs('js/winter.import.js', 'core');
@@ -164,7 +163,7 @@ public function import()
     public function export()
     {
         if (!$this->userHasAccess('export')) {
-            return Response::make(View::make('backend::access_denied'), 403);
+            abort(403);
         }
 
         if ($response = $this->checkUseListExportMode()) {
diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php
index 1dfb370d4e..e816e8ee8b 100644
--- a/modules/backend/classes/BackendController.php
+++ b/modules/backend/classes/BackendController.php
@@ -1,17 +1,21 @@
-<?php namespace Backend\Classes;
+<?php
+
+namespace Backend\Classes;
 
-use App;
 use Closure;
-use Config;
-use Event;
-use File;
 use Illuminate\Routing\Controller as ControllerBase;
-use Request;
-use Response;
-use Str;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use System\Classes\PluginManager;
-use View;
 use Winter\Storm\Router\Helper as RouterHelper;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Event;
+use Winter\Storm\Support\Facades\File;
+use Winter\Storm\Support\Str;
 
 /**
  * This is the master controller for all back-end pages.
@@ -124,10 +128,13 @@ protected function passToCmsController($url)
             class_exists('\Cms\Classes\Controller')
         ) {
             $this->cmsHandling = true;
-            return App::make('Cms\Classes\Controller')->run($url);
-        } else {
-            return Response::make(View::make('backend::404'), 404);
+            $response = App::make('Cms\Classes\Controller')->run($url);
+            if ($response->getStatusCode() !== 404) {
+                return $response;
+            }
         }
+
+        return Response::make(View::make('backend::404'), 404);
     }
 
     /**
@@ -142,8 +149,17 @@ public function run($url = null)
     {
         // Handle NotFoundHttpExceptions in the backend (usually triggered by abort(404))
         Event::listen('exception.beforeRender', function ($exception, $httpCode, $request) {
-            if (!$this->cmsHandling && $exception instanceof \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) {
+            if ($this->cmsHandling) {
+                return;
+            }
+
+            if ($exception instanceof NotFoundHttpException) {
                 return View::make('backend::404');
+            } elseif (
+                $exception instanceof HttpException
+                && $exception->getStatusCode() === 403
+            ) {
+                return View::make('backend::access_denied');
             }
         }, 1);
 
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 447adcbec0..a4d8a9b151 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -269,7 +269,7 @@ public function run($action = null, $params = [])
              * Check access groups against the page definition
              */
             if ($this->requiredPermissions && !$this->user->hasAnyAccess($this->requiredPermissions)) {
-                return Response::make(View::make('backend::access_denied'), 403);
+                abort(403);
             }
         }
 
diff --git a/modules/backend/controllers/UserRoles.php b/modules/backend/controllers/UserRoles.php
index 7aa23d0458..765063a067 100644
--- a/modules/backend/controllers/UserRoles.php
+++ b/modules/backend/controllers/UserRoles.php
@@ -1,9 +1,9 @@
-<?php namespace Backend\Controllers;
+<?php
+
+namespace Backend\Controllers;
 
-use View;
-use Response;
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 use System\Classes\SettingsManager;
 
 /**
@@ -44,7 +44,7 @@ public function __construct()
          */
         $this->bindEvent('page.beforeDisplay', function () {
             if (!$this->user->isSuperUser()) {
-                return Response::make(View::make('backend::access_denied'), 403);
+                abort(403);
             }
         });
     }

From e24f395aebd7946258114922c4e99c6d22caf43c Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 28 May 2025 15:39:51 -0600
Subject: [PATCH 45/49] Improve abort(404) handling in the backend

---
 modules/backend/classes/BackendController.php | 3 ++-
 modules/cms/ServiceProvider.php               | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php
index e816e8ee8b..9f73346d24 100644
--- a/modules/backend/classes/BackendController.php
+++ b/modules/backend/classes/BackendController.php
@@ -2,6 +2,7 @@
 
 namespace Backend\Classes;
 
+use Backend\Facades\BackendAuth;
 use Closure;
 use Illuminate\Routing\Controller as ControllerBase;
 use Illuminate\Support\Facades\App;
@@ -129,7 +130,7 @@ class_exists('\Cms\Classes\Controller')
         ) {
             $this->cmsHandling = true;
             $response = App::make('Cms\Classes\Controller')->run($url);
-            if ($response->getStatusCode() !== 404) {
+            if ($response->getStatusCode() !== 404 || !BackendAuth::check()) {
                 return $response;
             }
         }
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index f114cb9238..6f3a03aeea 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -94,6 +94,10 @@ protected function registerConsole()
     protected function registerErrorHandler()
     {
         $this->app->error(function (HttpExceptionInterface $exception, $code, $fromConsole) {
+            if ($this->app->runningInBackend() && BackendAuth::check()) {
+                return;
+            }
+
             $theme = Theme::getActiveTheme();
             $controller = new CmsController($theme);
             if ($code === 404) {

From 8eb44e9eb5797f7931b30b74a9d45986a5fdee01 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 18 Jun 2025 14:17:30 -0600
Subject: [PATCH 46/49] Add icons to the default form buttons

---
 .../behaviors/formcontroller/partials/_toolbar.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/partials/_toolbar.php b/modules/backend/behaviors/formcontroller/partials/_toolbar.php
index d4929319fb..64e67a637e 100644
--- a/modules/backend/behaviors/formcontroller/partials/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/partials/_toolbar.php
@@ -11,7 +11,7 @@
             data-hotkey="ctrl+shift+s, cmd+shift+s"
             data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
             data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-            class="btn btn-primary">
+            class="btn btn-primary wn-icon-plus">
             <?= e(trans('backend::lang.form.create_and_new')); ?>
         </button>
         <button
@@ -21,7 +21,7 @@ class="btn btn-primary">
             data-hotkey="ctrl+s, cmd+s"
             data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
             data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-            class="btn btn-primary">
+            class="btn btn-primary wn-icon-save">
             <?= e(trans('backend::lang.form.create')); ?>
         </button>
         <button
@@ -32,7 +32,7 @@ class="btn btn-primary">
             data-hotkey="ctrl+enter, cmd+enter"
             data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
             data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-            class="btn btn-default">
+            class="btn btn-default wn-icon-check">
             <?= e(trans('backend::lang.form.create_and_close')); ?>
         </button>
         <span class="btn-text">
@@ -49,7 +49,7 @@ class="btn btn-default">
             data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
             data-request-data="redirect:0"
             data-hotkey="ctrl+s, cmd+s"
-            class="btn btn-primary"
+            class="btn btn-primary wn-icon-save"
         >
             <?= e(trans('backend::lang.form.save')); ?>
         </button>
@@ -61,7 +61,7 @@ class="btn btn-primary"
             data-hotkey="ctrl+enter, cmd+enter"
             data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
             data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
-            class="btn btn-default"
+            class="btn btn-default wn-icon-check"
         >
             <?= e(trans('backend::lang.form.save_and_close')); ?>
         </button>

From fe10d4249814a310e046f3a2fb787fe45a2653f6 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 18 Jun 2025 15:32:54 -0600
Subject: [PATCH 47/49] Add missing buttons and icons to the form fancy
 toolbars

---
 .../views/create/fancy/_toolbar.php           | 38 ++++++++++++++-----
 .../views/update/fancy/_toolbar.php           |  4 +-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
index d8c7fd3604..df4540d560 100644
--- a/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php
@@ -1,16 +1,36 @@
 <div class="form-buttons loading-indicator-container">
-    <!-- Save -->
-    <a
-        href="javascript:;"
-        class="btn btn-primary wn-icon-check save"
+    <button
+        type="submit"
         data-request="onSave"
+        data-request-data="new:1"
         data-browser-validate
-        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+        data-hotkey="ctrl+shift+s, cmd+shift+s"
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
         data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        class="btn btn-primary wn-icon-plus">
+        <?= e(trans('backend::lang.form.create_and_new')); ?>
+    </button>
+    <button
+        type="button"
+        data-request="onSave"
+        data-browser-validate
         data-hotkey="ctrl+s, cmd+s"
-    >
-        <?= e(trans('backend::lang.form.save')) ?>
-    </a>
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        class="btn btn-primary wn-icon-save">
+        <?= e(trans('backend::lang.form.create')); ?>
+    </button>
+    <button
+        type="button"
+        data-request="onSave"
+        data-browser-validate
+        data-request-data="close:1"
+        data-hotkey="ctrl+enter, cmd+enter"
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        class="btn btn-default wn-icon-check">
+        <?= e(trans('backend::lang.form.create_and_close')); ?>
+    </button>
 
-    <a class="btn btn-default" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+    <a class="btn btn-default wn-icon-ban" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
 </div>
diff --git a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
index e30e433e44..a7eaf55ec0 100644
--- a/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
+++ b/modules/backend/behaviors/formcontroller/views/update/fancy/_toolbar.php
@@ -2,7 +2,7 @@
     <!-- Save -->
     <a
         href="javascript:;"
-        class="btn btn-primary wn-icon-check save"
+        class="btn btn-primary wn-icon-save save"
         data-request="onSave"
         data-browser-validate
         data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
@@ -37,7 +37,7 @@ class="btn btn-primary wn-icon-crosshairs"
         </a>
     <?php endif ?>
 
-    <a class="btn btn-default" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+    <a class="btn btn-default wn-icon-ban" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
 
     <!-- Delete -->
     <button

From 8d6bd7b6ec4d8cb6e9e31e2363a76633f707fdfe Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 18 Jun 2025 15:39:34 -0600
Subject: [PATCH 48/49] Fix disabled styling for outside tab fields in the
 fancy form layout

Also recompiled the other less assets since the dependency update to the less compiler.
---
 modules/backend/assets/css/winter.css         | 55 ++++++++++---------
 .../assets/less/layout/fancylayout.less       |  4 ++
 .../codeeditor/assets/css/codeeditor.css      |  2 +-
 .../fileupload/assets/css/fileupload.css      | 12 ++--
 .../assets/css/permissioneditor.css           |  4 +-
 .../repeater/assets/css/repeater.css          |  2 +-
 .../mediamanager/assets/css/mediamanager.css  | 10 ++--
 .../widgets/table/assets/css/table.css        |  2 +-
 modules/cms/assets/css/winter.components.css  |  4 +-
 .../cms/assets/css/winter.theme-selector.css  |  2 +-
 .../assetlist/assets/css/assetlist.css        |  6 +-
 11 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/modules/backend/assets/css/winter.css b/modules/backend/assets/css/winter.css
index c2349a681a..ae48dbb44c 100644
--- a/modules/backend/assets/css/winter.css
+++ b/modules/backend/assets/css/winter.css
@@ -66,9 +66,9 @@
 .sweet-alert p{margin:0}
 .sweet-alert p.text-muted{margin-bottom:20px;color:#555}
 .global-notice{position:sticky;top:0;display:flex;align-items:center;flex-wrap:wrap;gap:0.5em;justify-content:space-between;z-index:10500;background:#ab2a1c;color:#FFF;padding:0.5em 0.75em}
-.global-notice .notice-icon{font-size:1.5em;vertical-align:bottom;display:inline-block;margin-right:.25em}
+.global-notice .notice-icon{font-size:1.5em;vertical-align:bottom;display:inline-block;margin-right:0.25em}
 .global-notice .notice-text{display:inline-block;vertical-align:middle}
-.control-simplelist{font-size:13px;padding:20px 20px 2px 20px;margin-bottom:20px;background:#fff;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
+.control-simplelist{font-size:13px;padding:20px 20px 2px 20px;margin-bottom:20px;background:#FFF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
 .control-simplelist ul{padding-left:15px}
 .control-simplelist.form-control ul{margin-bottom:0}
 .control-simplelist.form-control li{padding-top:5px;padding-bottom:5px}
@@ -96,7 +96,7 @@
 .control-simplelist.is-selectable li .heading,
 .control-simplelist.is-selectable-box li .heading{font-size:14px;font-weight:500}
 .control-simplelist.is-divided li,
-.control-simplelist.is-selectable li{padding:5px 10px;border-bottom:1px solid #d4d8da}
+.control-simplelist.is-selectable li{padding:5px 10px;border-bottom:1px solid #D4D8DA}
 .control-simplelist.is-divided li:last-child,
 .control-simplelist.is-selectable li:last-child{border-bottom:none}
 .control-simplelist.is-selectable li a{padding:5px 10px;margin:-5px -10px;display:block;color:#333}
@@ -145,7 +145,7 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .no-touch .control-scrollbar>.scrollbar-scrollbar{opacity:0;-webkit-transition:opacity 0.3s;transition:opacity 0.3s}
 .no-touch .control-scrollbar:active>.scrollbar-scrollbar,
 .no-touch .control-scrollbar:hover>.scrollbar-scrollbar{opacity:1}
-@media (max-width:768px){.responsive-sidebar>.layout-cell:last-child .control-scrollbar{overflow:visible;height:auto}.responsive-sidebar>.layout-cell:last-child .control-scrollbar .scrollbar-scrollbar{display:none !important}}
+@media (max-width:768px){.responsive-sidebar>.layout-cell:last-child .control-scrollbar{overflow:visible;height:auto}.responsive-sidebar>.layout-cell:last-child .control-scrollbar .scrollbar-scrollbar{display:none!important}}
 .control-filelist p.no-data{padding:22px 0;margin:0;color:#666;font-size:14px;text-align:center;font-weight:normal;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
 .control-filelist ul{padding:0;margin:0}
 .control-filelist ul li{font-weight:normal;line-height:150%;position:relative;list-style:none}
@@ -192,21 +192,21 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-filelist ul li.group[data-status=collapsed]>div.subitems{display:none}
 .control-filelist ul li>div.controls{position:absolute;right:19px;top:6px}
 .control-filelist ul li>div.controls .dropdown{width:14px;height:21px}
-.control-filelist ul li>div.controls .dropdown.open a.control{display:block !important}
+.control-filelist ul li>div.controls .dropdown.open a.control{display:block!important}
 .control-filelist ul li>div.controls .dropdown.open a.control:before{visibility:visible;display:block}
 .control-filelist ul li>div.controls a.control{color:#405261;font-size:14px;visibility:hidden;overflow:hidden;width:14px;height:21px;display:none;text-decoration:none;cursor:pointer;padding:0;opacity:0.5;filter:alpha(opacity=50)}
 .control-filelist ul li>div.controls a.control:before{visibility:visible;display:block;margin-right:0}
 .control-filelist ul li>div.controls a.control:hover{opacity:1;filter:alpha(opacity=100)}
 .control-filelist ul li:hover>div.controls,
-.control-filelist ul li:hover>a.control{display:block !important}
+.control-filelist ul li:hover>a.control{display:block!important}
 .control-filelist ul li:hover>div.controls>a.control,
-.control-filelist ul li:hover>a.control>a.control{display:block !important}
+.control-filelist ul li:hover>a.control>a.control{display:block!important}
 .control-filelist ul li .checkbox{position:absolute;top:-5px;right:0}
 .control-filelist ul li .checkbox label{margin-right:0}
 .control-filelist ul li .checkbox label:before{border-color:#ccc}
 .control-filelist.single-line ul li a span.title{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}
 .control-filelist.filelist-hero ul li{background:#fff;border-bottom:none}
-.control-filelist.filelist-hero ul li>a{padding:11px 45px 10px 50px;font-size:13px;border-bottom:1px solid #ecf0f1}
+.control-filelist.filelist-hero ul li>a{padding:11px 45px 10px 50px;font-size:13px;border-bottom:1px solid #ECF0F1}
 .control-filelist.filelist-hero ul li>a span.title{font-size:14px;font-weight:normal;color:#2b3e50}
 .control-filelist.filelist-hero ul li>a span.description{font-size:13px}
 .control-filelist.filelist-hero ul li>a .list-icon{position:absolute;left:14px;top:50%;transform:translateY(-50%);font-size:22px;color:#b7c0c2}
@@ -225,13 +225,13 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-filelist.filelist-hero ul li.active>a>span.borders:before{top:-1px}
 .control-filelist.filelist-hero ul li.active>a:hover>span.borders:before{background-color:#48b2ce}
 .control-filelist.filelist-hero ul li.active>a:active>span.borders:before{background-color:#6cc551}
-.control-filelist.filelist-hero ul li>h4{padding-top:7px;padding-bottom:6px;border-bottom:1px solid #ecf0f1}
+.control-filelist.filelist-hero ul li>h4{padding-top:7px;padding-bottom:6px;border-bottom:1px solid #ECF0F1}
 .control-filelist.filelist-hero ul li>div.controls{display:none;position:absolute;right:16px;top:15px}
 .control-filelist.filelist-hero ul li>div.controls>a.control{width:16px;height:23px;background:transparent;overflow:hidden;display:inline-block;color:#fff !important;padding:0}
 .control-filelist.filelist-hero ul li>div.controls>a.control:before{font-size:17px}
 .control-filelist.filelist-hero ul li:hover>div.controls{display:block}
 .control-filelist.filelist-hero ul li.separator{position:relative;border-bottom:1px solid #95a5a6;padding:12px 15px 13px 15px}
-.control-filelist.filelist-hero ul li.separator:before{z-index:31;content:'';display:block;width:0;height:0;border-left:9.5px solid transparent;border-right:9.5px solid transparent;border-top:11px solid #fff;border-bottom-width:0;position:absolute;left:13px;bottom:-8px}
+.control-filelist.filelist-hero ul li.separator:before{z-index:31;content:'';display:block;width:0;height:0;border-left:9.5px solid transparent;border-right:9.5px solid transparent;border-top:11px solid white;border-bottom-width:0;position:absolute;left:13px;bottom:-8px}
 .control-filelist.filelist-hero ul li.separator:after{z-index:30;content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-top:9px solid #95a5a6;border-bottom-width:0;position:absolute;left:14px;bottom:-9px}
 .control-filelist.filelist-hero ul li.separator h5{color:#2b3e50;font-size:14px;margin:0;font-weight:normal;padding:0}
 .control-filelist.filelist-hero ul>li.group>ul>li>a{padding-left:66px}
@@ -245,7 +245,7 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-filelist.filelist-hero.single-level ul li:active>a span.title,
 .control-filelist.filelist-hero.single-level ul li:active>a span.description{color:#fff !important}
 .control-filelist.filelist-hero.single-level ul li:active>a .list-icon{color:#fff !important}
-.control-scrollpanel{position:relative;background:#ecf0f1}
+.control-scrollpanel{position:relative;background:#ECF0F1}
 .control-scrollpanel .control-scrollbar.vertical>.scrollbar-scrollbar{right:0}
 .tooltip .tooltip-inner{text-align:left;padding:5px 8px}
 .tooltip.in{opacity:1;filter:alpha(opacity=100)}
@@ -301,7 +301,7 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-treeview{margin-bottom:40px}
 .control-treeview ol{margin:0;padding:0;list-style:none;background:#fff}
 .control-treeview ol>li{-webkit-transition:width 1s;transition:width 1s}
-.control-treeview ol>li>div{font-size:14px;font-weight:normal;background:#fff;border-bottom:1px solid #ecf0f1;position:relative}
+.control-treeview ol>li>div{font-size:14px;font-weight:normal;background:#fff;border-bottom:1px solid #ECF0F1;position:relative}
 .control-treeview ol>li>div>a{color:#2b3e50;padding:11px 45px 10px 61px;display:block;line-height:150%;text-decoration:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
 .control-treeview ol>li>div:before{content:' ';background-image:url(../images/treeview-icons.png);background-position:0 -28px;background-repeat:no-repeat;background-size:42px auto;position:absolute;width:21px;height:22px;left:28px;top:15px}
 .control-treeview ol>li>div span.comment{display:block;font-weight:400;color:#95a5a6;font-size:13px;margin-top:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
@@ -330,7 +330,7 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-treeview ol>li>div.popover-highlight>a{color:#fff !important;cursor:default}
 .control-treeview ol>li>div.popover-highlight span{color:#fff !important}
 .control-treeview ol>li>div.popover-highlight>ul.submenu,
-.control-treeview ol>li>div.popover-highlight>span.drag-handle{display:none !important}
+.control-treeview ol>li>div.popover-highlight>span.drag-handle{display:none!important}
 .control-treeview ol>li.dragged div,
 .control-treeview ol>li>div:hover{background-color:#48b2ce !important}
 .control-treeview ol>li.dragged div>a,
@@ -347,10 +347,10 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-treeview ol>li>div:hover span.borders{display:none}
 .control-treeview ol>li>div:active{background-color:#6cc551 !important}
 .control-treeview ol>li>div:active>a{color:#fff !important}
-.control-treeview ol>li[data-no-drag-mode] div:hover span.drag-handle{cursor:default !important;opacity:0.3 !important;filter:alpha(opacity=30) !important}
+.control-treeview ol>li[data-no-drag-mode] div:hover span.drag-handle{cursor:default!important;opacity:0.3 !important;filter:alpha(opacity=30) !important}
 .control-treeview ol>li.dragged li.has-subitems>div:before,
 .control-treeview ol>li.dragged.has-subitems>div:before{background-position:0 -52px}
-.control-treeview ol>li.dragged div>ul.submenu{display:none !important}
+.control-treeview ol>li.dragged div>ul.submenu{display:none!important}
 .control-treeview ol>li>ol{padding-left:20px;padding-right:20px}
 .control-treeview ol>li[data-status=collapsed]>ol{display:none}
 .control-treeview ol>li.has-subitems>div:before{background-position:0 0;width:23px;height:26px;left:26px}
@@ -447,7 +447,7 @@ body.dragging .control-treeview ol.dragging>li>div .custom-checkbox,
 body.dragging .control-treeview ol.dragging ol>li>div .custom-checkbox{-webkit-transition:opacity 0.5s;transition:opacity 0.5s;opacity:0;filter:alpha(opacity=0)}
 body.dragging .control-treeview.treeview-light ol.dragging>li>div,
 body.dragging .control-treeview.treeview-light ol.dragging ol>li>div{background-color:#f9f9f9}
-@media only screen and (min--moz-device-pixel-ratio:1.5),only screen and (-o-min-device-pixel-ratio:3/2),only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-devicepixel-ratio:1.5),only screen and (min-resolution:1.5dppx){.control-treeview ol>li>div:before{background-position:0 -79px;background-size:21px auto}.control-treeview ol>li.has-subitems>div:before{background-position:0 -52px}.control-treeview ol>li.has-subitems>div:hover:before,.control-treeview ol>li.has-subitems>div.popover-highlight:before{background-position:0 -102px}.control-treeview ol>li.dragged>div:before,.control-treeview ol>li.dragged li>div:before,.control-treeview ol>li>div:hover:before,.control-treeview ol>li>div.popover-highlight:before{background-position:0 -129px}.control-treeview ol>li.dragged li.has-subitems>div:before,.control-treeview ol>li.dragged.has-subitems>div:before{background-position:0 -102px}.control-treeview ol>li.drop-target>div:before{background-position:0 -129px}.control-treeview ol>li.drop-target.has-subitems>div:before{background-position:0 -102px}}
+@media only screen and (min--moz-device-pixel-ratio:1.5),only screen and (-o-min-device-pixel-ratio:1.5),only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-devicepixel-ratio:1.5),only screen and (min-resolution:1.5dppx){.control-treeview ol>li>div:before{background-position:0 -79px;background-size:21px auto}.control-treeview ol>li.has-subitems>div:before{background-position:0 -52px}.control-treeview ol>li.has-subitems>div:hover:before,.control-treeview ol>li.has-subitems>div.popover-highlight:before{background-position:0 -102px}.control-treeview ol>li.dragged>div:before,.control-treeview ol>li.dragged li>div:before,.control-treeview ol>li>div:hover:before,.control-treeview ol>li>div.popover-highlight:before{background-position:0 -129px}.control-treeview ol>li.dragged li.has-subitems>div:before,.control-treeview ol>li.dragged.has-subitems>div:before{background-position:0 -102px}.control-treeview ol>li.drop-target>div:before{background-position:0 -129px}.control-treeview ol>li.drop-target.has-subitems>div:before{background-position:0 -102px}}
 .sidenav-tree{width:300px}
 .sidenav-tree .control-toolbar{padding:0}
 .sidenav-tree .control-toolbar .toolbar-item{display:block}
@@ -494,7 +494,7 @@ div.panel.border-right{border-right:1px solid #e8eaeb}
 div.panel.border-bottom{border-bottom:1px solid #e8eaeb}
 div.panel.border-top{border-top:1px solid #e8eaeb}
 div.panel.triangle-down{position:relative}
-div.panel.triangle-down:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #fff;border-bottom-width:0;position:absolute;left:15px;bottom:-8px;z-index:101}
+div.panel.triangle-down:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid white;border-bottom-width:0;position:absolute;left:15px;bottom:-8px;z-index:101}
 div.panel.triangle-down:before{content:'';display:block;width:0;height:0;border-left:8.5px solid transparent;border-right:8.5px solid transparent;border-top:9px solid #e8eaeb;border-bottom-width:0;position:absolute;left:14px;bottom:-9px;z-index:100}
 div.panel h3.section,
 div.panel>label{text-transform:uppercase;color:#95a5a6;font-size:13px;font-weight:600;margin:0 0 15px 0}
@@ -650,7 +650,7 @@ body.slim-container .layout .layout-container{padding-left:0 !important;padding-
 @supports (-moz-appearance:none){a:focus:not(:focus-visible){outline:none}}
 .flex-layout-column{display:-webkit-box;display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex;display:flex;-webkit-flex-direction:column;-moz-flex-direction:column;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column}
 .flex-layout-column.full-height-strict{height:100%}
-.flex-layout-column.absolute{position:absolute !important}
+.flex-layout-column.absolute{position:absolute!important}
 .flex-layout-column.fill-container{position:absolute;left:0;top:0;width:100%;height:100%}
 .flex-layout-row{display:-webkit-box;display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex;display:flex;-webkit-flex-direction:row;-moz-flex-direction:row;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row}
 .flex-layout-column.justify-center,
@@ -671,7 +671,7 @@ body.mainmenu-open{overflow:hidden;position:fixed}
 ul.mainmenu-nav{font-size:14px}
 ul.mainmenu-nav li{}
 ul.mainmenu-nav li .svg-icon{-webkit-backface-visibility:hidden;backface-visibility:hidden}
-ul.mainmenu-nav li span.counter{display:block;position:absolute;top:.143em;right:0;padding:.143em .429em .214em .286em;background-color:#d9350f;color:#fff;font-size:.786em;line-height:100%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1,);-ms-transform:scale(1,);transform:scale(1,);-webkit-transition:all 0.3s;transition:all 0.3s}
+ul.mainmenu-nav li span.counter{display:block;position:absolute;top:0.143em;right:0;padding:0.143em 0.429em 0.214em 0.286em;background-color:#d9350f;color:#fff;font-size:0.786em;line-height:100%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1,);-ms-transform:scale(1,);transform:scale(1,);-webkit-transition:all 0.3s;transition:all 0.3s}
 ul.mainmenu-nav li span.counter.empty{opacity:0;filter:alpha(opacity=0);-webkit-transform:scale(0,);-ms-transform:scale(0,);transform:scale(0,)}
 nav#layout-mainmenu{background-color:#151515;padding:0 0 0 20px;line-height:0;white-space:nowrap;display:flex}
 nav#layout-mainmenu a{text-decoration:none}
@@ -758,7 +758,7 @@ nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:first-child{margin-left:
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li:hover .nav-label{width:auto;min-width:100px;text-overflow:all;overflow:visible;z-index:2}
 nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li.active:first-child{margin-left:0}
 nav#layout-mainmenu .menu-toggle{height:45px;line-height:45px;font-size:16px;display:none}
-nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inline-block;height:45px;line-height:45px;width:45px;text-align:center;opacity:.7}
+nav#layout-mainmenu .menu-toggle .menu-toggle-icon{background:#333;display:inline-block;height:45px;line-height:45px;width:45px;text-align:center;opacity:0.7}
 nav#layout-mainmenu .menu-toggle .menu-toggle-icon i{line-height:45px;font-size:20px;vertical-align:bottom}
 nav#layout-mainmenu .menu-toggle .menu-toggle-title{margin-left:10px}
 nav#layout-mainmenu .menu-toggle:hover .menu-toggle-icon{opacity:1}
@@ -820,7 +820,7 @@ body.drag .mainmenu-collapsed ul li:hover{color:rgba(255,255,255,0.6)}
 #layout-sidenav{position:absolute;height:100%;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:14px}
 #layout-sidenav ul{position:relative;margin:0;padding:0;height:100%;overflow:hidden}
 #layout-sidenav ul li{display:block;text-align:center;position:relative}
-#layout-sidenav ul li a{padding:1.429em .714em;display:block;font-size:.929em;color:rgba(255,255,255,0.6);font-weight:normal;position:relative}
+#layout-sidenav ul li a{padding:1.429em 0.714em;display:block;font-size:0.929em;color:rgba(255,255,255,0.6);font-weight:normal;position:relative}
 #layout-sidenav ul li a:hover{text-decoration:none;background-color:transparent}
 #layout-sidenav ul li a:focus{background:transparent}
 #layout-sidenav ul li a i{color:rgba(255,255,255,0.6);display:block;margin-bottom:5px;font-size:2em}
@@ -829,7 +829,7 @@ body.drag .mainmenu-collapsed ul li:hover{color:rgba(255,255,255,0.6)}
 #layout-sidenav ul li a:hover{color:#fff}
 #layout-sidenav ul li.active a i,
 #layout-sidenav ul li a:hover i{color:#fff}
-#layout-sidenav ul li span.counter{display:block;position:absolute;top:1.071em;right:1.071em;padding:.143em .429em .214em .286em;background-color:#d9350f;color:#fff;font-size:.786em;line-height:100%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1,);-ms-transform:scale(1,);transform:scale(1,);-webkit-transition:all 0.3s;transition:all 0.3s}
+#layout-sidenav ul li span.counter{display:block;position:absolute;top:1.071em;right:1.071em;padding:0.143em 0.429em 0.214em 0.286em;background-color:#d9350f;color:#fff;font-size:0.786em;line-height:100%;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;opacity:1;filter:alpha(opacity=100);-webkit-transform:scale(1,);-ms-transform:scale(1,);transform:scale(1,);-webkit-transition:all 0.3s;transition:all 0.3s}
 #layout-sidenav ul li span.counter.empty{opacity:0;filter:alpha(opacity=0);-webkit-transform:scale(0,);-ms-transform:scale(0,);transform:scale(0,)}
 @media (min-width:768px) and (max-width:991px){#layout-sidenav{font-size:12px}.layout-sidenav-container{width:100px}}
 @media (max-width:767px){#layout-sidenav{font-size:10px}.layout-sidenav-container{width:80px}}
@@ -955,7 +955,7 @@ body.fancy-layout .master-tabs.control-tabs>.tab-content>.tab-pane.padded-pane,
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.primary-tabs.master-area>div>ul.nav-tabs,
 *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.fancy-layout.primary-tabs.master-area>div>ul.nav-tabs{-webkit-transition:background-color 0.5s;transition:background-color 0.5s;background:#2da7c7}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.primary-tabs>div>ul.nav-tabs,
-*:not(.nested-form)>.form-widget>.layout-row>.control-tabs.fancy-layout.primary-tabs>div>ul.nav-tabs{background:#7f8c8d;margin-left:0 !important;margin-right:0 !important}
+*:not(.nested-form)>.form-widget>.layout-row>.control-tabs.fancy-layout.primary-tabs>div>ul.nav-tabs{background:#7F8C8D;margin-left:0!important;margin-right:0!important}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.primary-tabs>div>ul.nav-tabs:before,
 *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.fancy-layout.primary-tabs>div>ul.nav-tabs:before{display:none}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.primary-tabs>div>ul.nav-tabs>li,
@@ -1011,7 +1011,7 @@ body.fancy-layout .master-tabs.control-tabs>.tab-content>.tab-pane.padded-pane,
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li{margin-left:-19px}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li:first-child{margin-left:0;padding-left:8px}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li a{padding:8px 16px 0 16px;font-weight:400;height:36px;color:#2b3e50;opacity:0.6;filter:alpha(opacity=60)}
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li a>span.title{position:relative;display:inline-block;padding:8px 5px 9px 5px;font-size:14px;z-index:100;height:27px !important;background-color:transparent}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li a>span.title{position:relative;display:inline-block;padding:8px 5px 9px 5px;font-size:14px;z-index:100;height:27px!important;background-color:transparent}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li a>span.title:before,
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li a>span.title:after{content:' ';position:absolute;background-color:white;width:15px;height:28px;top:0;z-index:100;display:none}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li a>span.title:before{left:-11px;-webkit-border-radius:8px 0 0 0;-moz-border-radius:8px 0 0 0;border-radius:8px 0 0 0;-webkit-transform:skewX(-20deg);-ms-transform:skewX(-20deg);transform:skewX(-20deg)}
@@ -1035,6 +1035,7 @@ body.fancy-layout .master-tabs.control-tabs>.tab-content>.tab-pane.padded-pane,
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields:after{content:" ";display:table}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields:after{clear:both}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields label{text-transform:uppercase;color:rgba(255,255,255,0.5);margin-bottom:0}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-control[disabled]{background-color:rgba(29,29,29,0.11) !important}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields input[type=text]{background:transparent;border:none;color:#fff;font-size:35px;font-weight:100;height:auto;padding:0;-webkit-box-shadow:none;box-shadow:none}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields input[type=text]::-moz-placeholder{color:rgba(255,255,255,0.5);opacity:1}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields input[type=text]:-ms-input-placeholder{color:rgba(255,255,255,0.5)}
@@ -1059,11 +1060,11 @@ body.breadcrumb-fancy .control-breadcrumb,
 body.breadcrumb-fancy .control-breadcrumb li,
 .control-breadcrumb.breadcrumb-fancy li{background-color:#0e7d9a;color:rgba(255,255,255,0.5)}
 body.breadcrumb-fancy .control-breadcrumb li a,
-.control-breadcrumb.breadcrumb-fancy li a{opacity:.5;-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
+.control-breadcrumb.breadcrumb-fancy li a{opacity:0.5;-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
 body.breadcrumb-fancy .control-breadcrumb li a:hover,
 .control-breadcrumb.breadcrumb-fancy li a:hover{opacity:1}
 body.breadcrumb-fancy .control-breadcrumb li:not(:last-child)::before,
-.control-breadcrumb.breadcrumb-fancy li:not(:last-child)::before{border-left-color:#2da7c7;opacity:.5}
+.control-breadcrumb.breadcrumb-fancy li:not(:last-child)::before{border-left-color:#2da7c7;opacity:0.5}
 body.breadcrumb-fancy .control-breadcrumb li:after,
 .control-breadcrumb.breadcrumb-fancy li:after{border-left-color:#0e7d9a}
 body.breadcrumb-fancy .control-breadcrumb li:last-child,
@@ -1097,7 +1098,7 @@ body.breadcrumb-fancy .control-breadcrumb li:last-child:before,
 body.side-panel-not-fixed .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs>.tab-content>.tab-pane>.form-group>.field-richeditor,
 body.side-panel-not-fixed.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs>.tab-content>.tab-pane>.form-group>.field-richeditor{border-left:none}
 html.cssanimations .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .loading-indicator-container .loading-indicator>span{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite;background-image:url('../../../system/assets/ui/images/loader-white.svg');background-size:20px 20px}
-.flyout-container>.flyout{overflow:hidden;width:0;left:0 !important;-webkit-transition:width 0.1s;transition:width 0.1s}
+.flyout-container>.flyout{overflow:hidden;width:0;left:0!important;-webkit-transition:width 0.1s;transition:width 0.1s}
 .flyout-overlay{width:100%;height:100%;top:0;z-index:5000;position:absolute;background-color:rgba(0,0,0,0);-webkit-transition:background-color 0.3s;transition:background-color 0.3s}
 .flyout-toggle{position:absolute;top:20px;left:0;width:23px;height:25px;background:#2b3e50;cursor:pointer;border-bottom-right-radius:4px;border-top-right-radius:4px;color:#bdc3c7;font-size:10px}
 .flyout-toggle i{margin:7px 0 0 6px;display:inline-block}
diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less
index 61681fdc40..3fa21146fb 100644
--- a/modules/backend/assets/less/layout/fancylayout.less
+++ b/modules/backend/assets/less/layout/fancylayout.less
@@ -493,6 +493,10 @@ body.fancy-layout .master-tabs.control-tabs,
         margin-bottom: 0;
     }
 
+    .form-control[disabled] {
+        background-color: rgba(29, 29, 29, 0.11) !important;
+    }
+
     input[type=text] {
         background: transparent;
         border: none;
diff --git a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
index 59cfa51420..8f8aaa18b5 100644
--- a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
+++ b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
@@ -8,7 +8,7 @@
 .field-codeeditor.size-giant{min-height:350px}
 .field-codeeditor .ace_search{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:14px;color:#333;z-index:13}
 .field-codeeditor .ace_search .ace_search_form.ace_nomatch{outline:none !important}
-.field-codeeditor .ace_search .ace_search_form.ace_nomatch .ace_search_field{border:.0625rem solid red;-webkit-box-shadow:0 0 .1875rem .125rem red;box-shadow:0 0 .1875rem .125rem red;z-index:1;position:relative}
+.field-codeeditor .ace_search .ace_search_form.ace_nomatch .ace_search_field{border:0.0625rem solid red;-webkit-box-shadow:0 0 0.1875rem 0.125rem red;box-shadow:0 0 0.1875rem 0.125rem red;z-index:1;position:relative}
 .field-codeeditor .editor-code{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
 .field-codeeditor .editor-toolbar{position:absolute;padding:0 5px;bottom:10px;right:25px;z-index:10;background:rgba(0,0,0,0.8);border-radius:5px}
 .field-codeeditor .editor-toolbar>ul,
diff --git a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
index 32570fc62f..1f1ed08881 100644
--- a/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
+++ b/modules/backend/formwidgets/fileupload/assets/css/fileupload.css
@@ -1,6 +1,6 @@
 .field-fileupload .upload-object{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;position:relative;outline:none;overflow:hidden;display:inline-block;vertical-align:top}
 .field-fileupload .upload-object img{width:100%;height:100%}
-.field-fileupload .upload-object .icon-container{display:table;opacity:.6}
+.field-fileupload .upload-object .icon-container{display:table;opacity:0.6}
 .field-fileupload .upload-object .icon-container i{color:#95a5a6;display:inline-block}
 .field-fileupload .upload-object .icon-container div{display:table-cell;text-align:center;vertical-align:middle}
 .field-fileupload .upload-object .icon-container.image>div.icon-wrapper{display:none}
@@ -17,7 +17,7 @@
 .field-fileupload .upload-object.is-success .icon-container{opacity:1}
 .field-fileupload .upload-object.is-success .icon-container:after{opacity:0;-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease}
 .field-fileupload .upload-object.is-error .icon-container:after{content:"";background:none;font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f071";-webkit-animation:none;animation:none;font-size:40px;color:#e01346;margin-top:-20px;margin-left:-20px;text-shadow:2px 2px 0 #fff}
-.field-fileupload .upload-object.is-loading .icon-container{opacity:.6}
+.field-fileupload .upload-object.is-loading .icon-container{opacity:0.6}
 .field-fileupload .upload-object.is-loading .icon-container:after{opacity:1;-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease}
 .field-fileupload .upload-object.is-success{cursor:pointer}
 .field-fileupload .upload-object.is-success .progress-bar{opacity:0;-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease}
@@ -27,7 +27,7 @@
 .field-fileupload .upload-object.is-error{cursor:pointer}
 .field-fileupload .upload-object.is-error .icon-container{opacity:1}
 .field-fileupload .upload-object.is-error .icon-container>img,
-.field-fileupload .upload-object.is-error .icon-container>i{opacity:.5}
+.field-fileupload .upload-object.is-error .icon-container>i{opacity:0.5}
 .field-fileupload .upload-object.is-error .info h4{color:#e01346}
 .field-fileupload .upload-object.is-error .info h4 a{display:none}
 .field-fileupload .upload-object.is-error .meta{display:none}
@@ -41,12 +41,12 @@
 @media (max-width:1024px){.field-fileupload .upload-object.is-success h4 a,.field-fileupload .upload-object.is-success .meta .upload-remove-button,.field-fileupload .upload-object.is-success .meta .drag-handle{display:block !important}}
 .fileupload-config-form .fileupload-url-button{padding-left:0}
 .fileupload-config-form .fileupload-url-button>i{color:#666}
-.fileupload-config-form .file-upload-modal-image-header{background-color:#FEFEFE;background-image:-webkit-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-webkit-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:-moz-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-moz-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:-o-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-o-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:-ms-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),-ms-linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);background-image:linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb),linear-gradient(45deg,#cbcbcb 25%,transparent 25%,transparent 75%,#cbcbcb 75%,#cbcbcb);-webkit-background-size:20px 20px;-moz-background-size:20px 20px;background-size:20px 20px;background-position:0 0,10px 10px}
+.fileupload-config-form .file-upload-modal-image-header{background-color:#FEFEFE;background-image:-webkit-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB),-webkit-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB);background-image:-moz-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB),-moz-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB);background-image:-o-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB),-o-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB);background-image:-ms-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB),-ms-linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB);background-image:linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB),linear-gradient(45deg,#CBCBCB 25%,transparent 25%,transparent 75%,#CBCBCB 75%,#CBCBCB);-webkit-background-size:20px 20px;-moz-background-size:20px 20px;background-size:20px 20px;background-position:0 0,10px 10px}
 .fileupload-config-form .file-upload-modal-image-header,
 .fileupload-config-form .file-upload-modal-image-header img{border-top-right-radius:2px;border-top-left-radius:2px}
-.fileupload-config-form .file-upload-modal-image-header .close{position:absolute;top:20px;right:20px;background:#BDC3C7;opacity:.7;height:24px;width:22px;z-index:1}
+.fileupload-config-form .file-upload-modal-image-header .close{position:absolute;top:20px;right:20px;background:#BDC3C7;opacity:0.7;height:24px;width:22px;z-index:1}
 .fileupload-config-form .file-upload-modal-image-header .close:hover,
-.fileupload-config-form .file-upload-modal-image-header .close:focus{opacity:.9}
+.fileupload-config-form .file-upload-modal-image-header .close:focus{opacity:0.9}
 .fileupload-config-form .file-upload-modal-image-header + .modal-body{padding-top:20px}
 .field-fileupload.style-image-multi .upload-button,
 .field-fileupload.style-image-multi .upload-object{margin:0 10px 10px 0}
diff --git a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css
index 20c2df7e25..65f737bd23 100644
--- a/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css
+++ b/modules/backend/formwidgets/permissioneditor/assets/css/permissioneditor.css
@@ -2,10 +2,10 @@
 .permissioneditor.control-disabled .permissions-overlay{position:absolute;left:0;top:0;width:100%;height:100%;background:rgba(255,255,255,0.01);cursor:not-allowed}
 .permissioneditor.control-disabled table{opacity:0.5;filter:alpha(opacity=50)}
 .permissioneditor table{width:100%}
-.permissioneditor table th{padding:30px 4px 8px 4px;color:#2a3e51;font-weight:normal;border-bottom:1px solid #dbe1e3}
+.permissioneditor table th{padding:30px 4px 8px 4px;color:#2A3E51;font-weight:normal;border-bottom:1px solid #DBE1E3}
 .permissioneditor table th.tab{font-size:13px}
 .permissioneditor table th.permission-type{text-transform:uppercase;font-size:11px;text-align:center;cursor:pointer}
-.permissioneditor table td{padding:10px 4px;vertical-align:top;border-bottom:1px solid #ecf0f1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
+.permissioneditor table td{padding:10px 4px;vertical-align:top;border-bottom:1px solid #ECF0F1;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
 .permissioneditor table td.permission-value{text-align:center}
 .permissioneditor table td.permission-name{font-size:13px;cursor:pointer;color:#777}
 .permissioneditor table td p.comment{margin-top:5px;margin-bottom:0}
diff --git a/modules/backend/formwidgets/repeater/assets/css/repeater.css b/modules/backend/formwidgets/repeater/assets/css/repeater.css
index 5162497b11..abe19da38b 100644
--- a/modules/backend/formwidgets/repeater/assets/css/repeater.css
+++ b/modules/backend/formwidgets/repeater/assets/css/repeater.css
@@ -2,7 +2,7 @@
 .field-repeater .field-repeater-items{counter-reset:repeater-index-counter}
 .field-repeater ul.field-repeater-items,
 .field-repeater li.field-repeater-item{padding:0;margin:0;list-style:none}
-.field-repeater ul.field-repeater-items>li.dragged{opacity:.7;position:absolute;padding-top:15px;padding-right:15px;z-index:2000;background-color:#f9f9f9;border:1px dashed #dbdee0}
+.field-repeater ul.field-repeater-items>li.dragged{opacity:0.7;position:absolute;padding-top:15px;padding-right:15px;z-index:2000;background-color:#f9f9f9;border:1px dashed #dbdee0}
 .field-repeater ul.field-repeater-items>li.dragged .repeater-item-remove{opacity:0}
 .field-repeater ul.field-repeater-items>li.dragged .repeater-item-collapsed-title{top:5px}
 .field-repeater ul.field-repeater-items>li.placeholder{display:block;position:relative;height:25px;margin-bottom:5px}
diff --git a/modules/backend/widgets/mediamanager/assets/css/mediamanager.css b/modules/backend/widgets/mediamanager/assets/css/mediamanager.css
index c3287a1afa..9d943e4beb 100644
--- a/modules/backend/widgets/mediamanager/assets/css/mediamanager.css
+++ b/modules/backend/widgets/mediamanager/assets/css/mediamanager.css
@@ -61,7 +61,7 @@ div[data-control="media-manager"] .media-list.list li .icon-container{border-rig
 div[data-control="media-manager"] .media-list.list li .icon-container img{max-height:75px}
 div[data-control="media-manager"] .media-list.list li .icon-container i{font-size:35px}
 div[data-control="media-manager"] .media-list.list li .icon-container svg{max-height:44px}
-div[data-control="media-manager"] .media-list.list li .icon-container.image{border-right:1px solid #ecf0f1!important}
+div[data-control="media-manager"] .media-list.list li .icon-container.image{border-right:1px solid #ecf0f1 !important}
 div[data-control="media-manager"] .media-list.list li .icon-container p.thumbnail-error-message{display:none}
 div[data-control="media-manager"] .media-list.list .icon-wrapper{width:75px}
 div[data-control="media-manager"] .media-list.list li .info{margin-left:90px}
@@ -129,12 +129,12 @@ div[data-control="media-manager"] .upload-progress h5{margin:0 0 10px 0;font-siz
 div[data-control="media-manager"] .upload-progress h5 span{display:inline-block;margin-left:10px;color:#95a5a6;font-size:15px}
 div[data-control="media-manager"] .upload-progress .progress-controls{padding-right:30px;position:relative}
 div[data-control="media-manager"] .upload-progress .progress-controls .controls{position:absolute;right:0;bottom:0}
-div[data-control="media-manager"] .upload-progress .progress-controls .controls a{display:block;position:relative;top:7px;right:3px;color:#95a5a6;font-size:16px;cursor:pointer !important}
+div[data-control="media-manager"] .upload-progress .progress-controls .controls a{display:block;position:relative;top:7px;right:3px;color:#95a5a6;font-size:16px;cursor:pointer!important}
 div[data-control="media-manager"] .upload-progress .progress-controls .controls a:hover{text-decoration:none;color:#2da7c7}
 div[data-control="media-manager"] .dz-preview{display:none}
 div[data-control="media-manager"] button[data-command="toggle-sidebar"].sidebar-hidden{-webkit-transform:rotate(180deg) translate(0,0);-ms-transform:rotate(180deg) translate(0,0);transform:rotate(180deg) translate(0,0)}
 [data-control="media-manager-crop-tool"] .image_area{position:absolute;width:100%;height:100%;overflow:auto}
-[data-control="media-manager-crop-tool"] .image_area .jcrop-holder{background-color:transparent !important}
+[data-control="media-manager-crop-tool"] .image_area .jcrop-holder{background-color:transparent!important}
 [data-control="media-manager-crop-tool"] img{cursor:crosshair;display:block}
 [data-control="media-manager-crop-tool"].has-rulers .ruler-container .layout-relative{overflow:hidden}
 [data-control="media-manager-crop-tool"].has-rulers .ruler-container.horizontal .layout-cell{height:20px}
@@ -165,5 +165,5 @@ body:not(.no-select) div[data-control="media-manager"] .media-list.list li:hover
 body:not(.no-select) div[data-control="media-manager"] .media-list li:hover h4 a{display:block}
 @media (max-width:1280px){div[data-control="media-manager"] .media-list.list li{width:230px}}
 @media (max-width:1024px){div[data-control="media-manager"] .media-list.list li{display:block;width:auto}}
-@media (max-width:768px){div[data-control="media-manager"] [data-control="preview-sidebar"],div[data-control="media-manager"] [data-command="toggle-sidebar"]{display:none !important}div[data-control="media-manager"] .media-list.list{padding:0}div[data-control="media-manager"] .media-list.list li{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin:0;border-right:none;border-left:none;border-bottom:none}}
-@media (max-width:480px){div[data-control="media-manager"] [data-control="left-sidebar"]{display:none !important}}
\ No newline at end of file
+@media (max-width:768px){div[data-control="media-manager"] [data-control="preview-sidebar"],div[data-control="media-manager"] [data-command="toggle-sidebar"]{display:none!important}div[data-control="media-manager"] .media-list.list{padding:0}div[data-control="media-manager"] .media-list.list li{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin:0;border-right:none;border-left:none;border-bottom:none}}
+@media (max-width:480px){div[data-control="media-manager"] [data-control="left-sidebar"]{display:none!important}}
\ No newline at end of file
diff --git a/modules/backend/widgets/table/assets/css/table.css b/modules/backend/widgets/table/assets/css/table.css
index c652196c6e..bca48e7238 100644
--- a/modules/backend/widgets/table/assets/css/table.css
+++ b/modules/backend/widgets/table/assets/css/table.css
@@ -51,7 +51,7 @@
 .control-table .pagination ul li a{display:inline-block;text-decoration:none;color:#95a5a6;padding:4px 6px;background:#ecf0f1;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;outline:none;line-height:100%}
 .control-table .pagination ul li a:focus-visible{outline:auto}
 .control-table .pagination ul li.active a{background:#6cc551;color:#fff}
-@media only screen and (-moz-min-device-pixel-ratio:1.5),only screen and (-o-min-device-pixel-ratio:3/2),only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-devicepixel-ratio:1.5),only screen and (min-resolution:1.5dppx){.control-table .toolbar a:before{background-position:0 -9px;background-size:16px auto}.control-table .toolbar a.add-table-row-above:before{background-position:0 -39px}.control-table .toolbar a.delete-table-row:before{background-position:0 -66px}}.control-table td[data-column-type=string] input[type=text],
+@media only screen and (-moz-min-device-pixel-ratio:1.5),only screen and (-o-min-device-pixel-ratio:1.5),only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-devicepixel-ratio:1.5),only screen and (min-resolution:1.5dppx){.control-table .toolbar a:before{background-position:0 -9px;background-size:16px auto}.control-table .toolbar a.add-table-row-above:before{background-position:0 -39px}.control-table .toolbar a.delete-table-row:before{background-position:0 -66px}}.control-table td[data-column-type=string] input[type=text],
 .control-table td[data-column-type=autocomplete] input[type=text]{width:100%;height:100%;display:block;outline:none;border:none;padding:6px 10px 7px}
 html.chrome .control-table td[data-column-type=string] input[type=text],
 html.chrome .control-table td[data-column-type=autocomplete] input[type=text]{padding:6px 10px 7px!important}
diff --git a/modules/cms/assets/css/winter.components.css b/modules/cms/assets/css/winter.components.css
index 620ab4904d..22163f82c7 100644
--- a/modules/cms/assets/css/winter.components.css
+++ b/modules/cms/assets/css/winter.components.css
@@ -6,7 +6,7 @@ div.control-componentlist div.components div.layout-cell{font-size:11px;cursor:p
 div.control-componentlist div.components div.layout-cell:hover{background:#6cc551}
 .draggable-component-item>div,
 .component-list .components div.layout-cell>div,
-div.control-componentlist div.components div.layout-cell>div{white-space:normal;color:#475354;position:relative;border-right:1px solid #ecf0f1}
+div.control-componentlist div.components div.layout-cell>div{white-space:normal;color:#475354;position:relative;border-right:1px solid #ECF0F1}
 .draggable-component-item>div:before,
 .component-list .components div.layout-cell>div:before,
 div.control-componentlist div.components div.layout-cell>div:before{position:absolute;font-size:16px;left:15px;top:7px;opacity:0.7;filter:alpha(opacity=70)}
@@ -73,7 +73,7 @@ div.control-componentlist div.components div.layout-cell.adding>div{-webkit-tran
 .draggable-component-item{opacity:0.6;filter:alpha(opacity=60)}
 .draggable-component-item span.alias{display:none}
 .draggable-component-item a.remove{display:none}
-.component-list .components div.layout div.layout-row div.layout-cell{border-top:1px solid #ecf0f1}
+.component-list .components div.layout div.layout-row div.layout-cell{border-top:1px solid #ECF0F1}
 .component-list .components div.layout div.layout-row div.layout-cell span.alias{display:none}
 .component-list .components div.layout div.layout-row div.layout-cell a.remove{display:none}
 .component-list .components div.layout div.layout-row div.layout-cell:last-child>div{border-right:none}
diff --git a/modules/cms/assets/css/winter.theme-selector.css b/modules/cms/assets/css/winter.theme-selector.css
index 6ee752e38c..6f139595d4 100644
--- a/modules/cms/assets/css/winter.theme-selector.css
+++ b/modules/cms/assets/css/winter.theme-selector.css
@@ -30,4 +30,4 @@
 .theme-selector-layout .find-more-themes{background:#ecf0f1;color:#2b3e50;text-decoration:none;display:block;padding:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}
 .theme-selector-layout .create-new-theme:hover,
 .theme-selector-layout .find-more-themes:hover{background:#2da7c7;color:white}
-@media (max-width:768px){.theme-selector-layout .layout-cell,.theme-selector-layout .layout-row{display:block !important;width:auto !important;height:auto !important}.theme-selector-layout .theme-thumbnail img{width:100%}.theme-selector-layout .layout-row.links .theme-thumbnail{background:transparent;padding:0}}
\ No newline at end of file
+@media (max-width:768px){.theme-selector-layout .layout-cell,.theme-selector-layout .layout-row{display:block!important;width:auto!important;height:auto!important}.theme-selector-layout .theme-thumbnail img{width:100%}.theme-selector-layout .layout-row.links .theme-thumbnail{background:transparent;padding:0}}
\ No newline at end of file
diff --git a/modules/cms/widgets/assetlist/assets/css/assetlist.css b/modules/cms/widgets/assetlist/assets/css/assetlist.css
index 3985272d9a..f9123bedd3 100644
--- a/modules/cms/widgets/assetlist/assets/css/assetlist.css
+++ b/modules/cms/widgets/assetlist/assets/css/assetlist.css
@@ -44,16 +44,16 @@
 .control-assetlist ul li.active a.link:after{position:absolute;height:100%;width:4px;left:0;top:0;background:#2da7c7;display:block;content:' '}
 .control-assetlist ul li div.controls{position:absolute;right:45px;top:10px}
 .control-assetlist ul li div.controls .dropdown{width:14px;height:21px}
-.control-assetlist ul li div.controls .dropdown.open a.control{display:block !important}
+.control-assetlist ul li div.controls .dropdown.open a.control{display:block!important}
 .control-assetlist ul li div.controls .dropdown.open a.control:before{visibility:visible;display:block}
 .control-assetlist ul li div.controls a.control{color:#405261;font-size:14px;visibility:hidden;overflow:hidden;width:14px;height:21px;display:none;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50)}
 .control-assetlist ul li div.controls a.control:before{visibility:visible;display:block;margin-right:0}
 .control-assetlist ul li div.controls a.control:hover{opacity:1;filter:alpha(opacity=100)}
 .control-assetlist ul li:hover{background:#ddd}
 .control-assetlist ul li:hover div.controls,
-.control-assetlist ul li:hover a.control{display:block !important}
+.control-assetlist ul li:hover a.control{display:block!important}
 .control-assetlist ul li:hover div.controls>a.control,
-.control-assetlist ul li:hover a.control>a.control{display:block !important}
+.control-assetlist ul li:hover a.control>a.control{display:block!important}
 .control-assetlist ul li .checkbox{position:absolute;top:-5px;right:-5px}
 .control-assetlist ul li .checkbox label{margin-right:0}
 .control-assetlist ul li .checkbox label:before{border-color:#ccc}

From ddf26dbe9b91cac967332d54c0e2db58c6e59dfc Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Wed, 18 Jun 2025 16:25:18 -0600
Subject: [PATCH 49/49] Improve handling of layouts in the controller
 scaffolding command

---
 modules/backend/console/CreateController.php  | 19 +++-
 .../scaffold/controller/controller.stub       | 29 +++++-
 .../scaffold/controller/fancy/_toolbar.stub   | 95 +++++++++++++++++++
 .../scaffold/controller/fancy/create.stub     | 20 ++++
 .../scaffold/controller/fancy/preview.stub    | 14 +++
 .../scaffold/controller/fancy/update.stub     | 20 ++++
 .../system/console/BaseScaffoldCommand.php    |  7 +-
 7 files changed, 191 insertions(+), 13 deletions(-)
 create mode 100644 modules/backend/console/scaffold/controller/fancy/_toolbar.stub
 create mode 100644 modules/backend/console/scaffold/controller/fancy/create.stub
 create mode 100644 modules/backend/console/scaffold/controller/fancy/preview.stub
 create mode 100644 modules/backend/console/scaffold/controller/fancy/update.stub

diff --git a/modules/backend/console/CreateController.php b/modules/backend/console/CreateController.php
index 5a40960fbd..107e1a3cce 100644
--- a/modules/backend/console/CreateController.php
+++ b/modules/backend/console/CreateController.php
@@ -23,7 +23,7 @@ class CreateController extends BaseScaffoldCommand
         {--stubs : Create view files for local overwrites.}
         {--force : Overwrite existing files with generated files.}
         {--model= : Defines the model name to use. If not provided, the singular name of the controller is used.}
-        {--sidebar : Create stubs for form-with-sidebar layout}
+        {--l|layout=standard : Set the formLayout to use (standard, sidebar, fancy)}
         {--uninspiring : Disable inspirational quotes}
     ';
 
@@ -42,6 +42,11 @@ class CreateController extends BaseScaffoldCommand
      */
     protected $nameFrom = 'controller';
 
+    /**
+     * @var bool Allows the process to continue if an existing file is detected
+     */
+    protected bool $throwOverwriteException = false;
+
     /**
      * @var array A mapping of stub to generated file.
      */
@@ -57,6 +62,7 @@ class CreateController extends BaseScaffoldCommand
     protected function prepareVars(): array
     {
         $vars = parent::prepareVars();
+        $layout = $this->option('layout');
         /*
          * Determine the model name to use,
          * either supplied or singular from the controller name.
@@ -66,17 +72,20 @@ protected function prepareVars(): array
             $model = Str::singular($vars['name']);
         }
         $vars['model'] = $model;
-        $vars['sidebar'] = $this->option('sidebar');
+        $vars['sidebar'] = $layout === 'sidebar';
+        $vars['fancy'] = $layout === 'fancy';
+        $vars['stubs'] = $this->option('stubs');
 
         if ($this->option('stubs')) {
             $this->stubs['scaffold/controller/index.stub'] = 'controllers/{{lower_name}}/index.php';
             $this->stubs['scaffold/controller/_list_toolbar.stub'] = 'controllers/{{lower_name}}/_list_toolbar.php';
-
-            $layout = $this->option('sidebar') ? 'sidebar' : 'standard';
-
             $this->stubs["scaffold/controller/{$layout}/create.stub"] = 'controllers/{{lower_name}}/create.php';
             $this->stubs["scaffold/controller/{$layout}/update.stub"] = 'controllers/{{lower_name}}/update.php';
             $this->stubs["scaffold/controller/{$layout}/preview.stub"] = 'controllers/{{lower_name}}/preview.php';
+
+            if ($layout === 'fancy') {
+                $this->stubs['scaffold/controller/fancy/_toolbar.stub'] = 'controllers/{{lower_name}}/_toolbar.php';
+            }
         }
 
         return $vars;
diff --git a/modules/backend/console/scaffold/controller/controller.stub b/modules/backend/console/scaffold/controller/controller.stub
index e95516bbf4..aacd5dc755 100644
--- a/modules/backend/console/scaffold/controller/controller.stub
+++ b/modules/backend/console/scaffold/controller/controller.stub
@@ -26,10 +26,29 @@ class {{ studly_name }} extends Controller
     ];
 {% if sidebar %}
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->bodyClass = 'compact-container';
-    }
+    /**
+     * @var string The form layout to use. One of standard, sidebar, fancy
+     */
+    protected $formLayout = 'sidebar';
+{% if stubs %}
+
+    /**
+     * @var string Classes to be added to the body element
+     */
+    public $bodyClass = 'compact-container';
+{% endif -%}
+{% elseif fancy %}
+
+    /**
+     * @var string The form layout to use. One of standard, sidebar, fancy
+     */
+    protected $formLayout = 'fancy';
+{% if stubs %}
+
+    /**
+     * @var string Classes to be added to the body element
+     */
+    public $bodyClass = 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy';
+{% endif -%}
 {% endif -%}
 }
diff --git a/modules/backend/console/scaffold/controller/fancy/_toolbar.stub b/modules/backend/console/scaffold/controller/fancy/_toolbar.stub
new file mode 100644
index 0000000000..ffcac9fea0
--- /dev/null
+++ b/modules/backend/console/scaffold/controller/fancy/_toolbar.stub
@@ -0,0 +1,95 @@
+<div class="form-buttons loading-indicator-container">
+    <?php if ($formContext === 'create'): ?>
+        <!-- Create and new -->
+        <button
+            type="submit"
+            data-request="onSave"
+            data-request-data="new:1"
+            data-browser-validate
+            data-hotkey="ctrl+shift+s, cmd+shift+s"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-primary wn-icon-plus">
+            <?= e(trans('backend::lang.form.create_and_new')); ?>
+        </button>
+
+        <!-- Create -->
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-hotkey="ctrl+s, cmd+s"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-primary wn-icon-save">
+            <?= e(trans('backend::lang.form.create')); ?>
+        </button>
+
+        <!-- Create and close -->
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-request-data="close:1"
+            data-hotkey="ctrl+enter, cmd+enter"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-default wn-icon-check">
+            <?= e(trans('backend::lang.form.create_and_close')); ?>
+        </button>
+
+        <a class="btn btn-default wn-icon-ban" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+    <?php elseif ($formContext === 'update'): ?>
+        <!-- Save -->
+        <a
+            href="javascript:;"
+            class="btn btn-primary wn-icon-save save"
+            data-request="onSave"
+            data-browser-validate
+            data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request-data="redirect:0"
+            data-hotkey="ctrl+s, cmd+s"
+        >
+            <?= e(trans('backend::lang.form.save')) ?>
+        </a>
+
+        <!-- Save and Close -->
+        <a
+            href="javascript:;"
+            class="btn btn-primary wn-icon-check save"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request="onSave"
+            data-browser-validate
+            data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+        >
+            <?= e(trans('backend::lang.form.save_and_close')) ?>
+        </a>
+
+        <?php if ($formModel->url): ?>
+            <!-- Preview -->
+            <a
+                href="<?= e($formModel->url) ?>"
+                target="_blank"
+                class="btn btn-primary wn-icon-crosshairs"
+                data-control="preview-button"
+            >
+                <?= e(trans('backend::lang.form.save_and_close')) ?>
+            </a>
+        <?php endif ?>
+
+        <a class="btn btn-default wn-icon-ban" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+
+        <!-- Delete -->
+        <button
+            type="button"
+            class="btn btn-default empty wn-icon-trash-o"
+            data-request="onDelete"
+            title="<?= e(trans('backend::lang.form.delete')); ?>"
+            data-load-indicator="<?= e(trans('backend::lang.form.deleting')); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
+            data-control="delete-button"
+        ></button>
+    <?php endif; ?>
+</div>
diff --git a/modules/backend/console/scaffold/controller/fancy/create.stub b/modules/backend/console/scaffold/controller/fancy/create.stub
new file mode 100644
index 0000000000..2358dfc9d0
--- /dev/null
+++ b/modules/backend/console/scaffold/controller/fancy/create.stub
@@ -0,0 +1,20 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <div class="layout fancy-layout">
+        <?= Form::open([
+            'class' => 'layout',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
+            <div class="layout-row">
+                <?= $this->formRender() ?>
+            </div>
+        <?= Form::close() ?>
+    </div>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/console/scaffold/controller/fancy/preview.stub b/modules/backend/console/scaffold/controller/fancy/preview.stub
new file mode 100644
index 0000000000..e7f9176c01
--- /dev/null
+++ b/modules/backend/console/scaffold/controller/fancy/preview.stub
@@ -0,0 +1,14 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+        <div class="layout-row form-preview">
+            <?= $this->formRenderPreview() ?>
+        </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/backend/console/scaffold/controller/fancy/update.stub b/modules/backend/console/scaffold/controller/fancy/update.stub
new file mode 100644
index 0000000000..2358dfc9d0
--- /dev/null
+++ b/modules/backend/console/scaffold/controller/fancy/update.stub
@@ -0,0 +1,20 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <div class="layout fancy-layout">
+        <?= Form::open([
+            'class' => 'layout',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
+            <div class="layout-row">
+                <?= $this->formRender() ?>
+            </div>
+        <?= Form::close() ?>
+    </div>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>
diff --git a/modules/system/console/BaseScaffoldCommand.php b/modules/system/console/BaseScaffoldCommand.php
index 5f8187d6a8..514862039e 100644
--- a/modules/system/console/BaseScaffoldCommand.php
+++ b/modules/system/console/BaseScaffoldCommand.php
@@ -89,18 +89,19 @@ public function makeStubs(): void
             . DIRECTORY_SEPARATOR
             . 'lang.php'
         );
+
         if (!file_exists($langFilePath)) {
             $this->makeDirectory($langFilePath);
-            $comment = 'File generated: ' . str_replace(base_path(), '', $langFilePath);
+            $comment = '<fg=green>File generated:</> ' . str_replace(base_path(), '', $langFilePath);
         } else {
-            $comment = 'File updated: ' . str_replace(base_path(), '', $langFilePath);
+            $comment = '<fg=yellow>File updated:</> ' . str_replace(base_path(), '', $langFilePath);
         }
 
         // Store the localization messages to the determined file path
         ArrayFile::open($langFilePath)->set($langKeys)->write();
 
         // Inform the user
-        $this->comment($comment);
+        $this->output->writeLn($comment);
     }
 
     /**