Behaviour default views

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());
     }
 
     /**

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());
     }
 
     /**

modules/backend/behaviors/formcontroller/create.php

@@ -0,0 +1,47 @@
+<?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 ?>

modules/backend/behaviors/formcontroller/preview.php

@@ -0,0 +1,20 @@
+<?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 ?>

modules/backend/behaviors/formcontroller/update.php

@@ -0,0 +1,55 @@
+<?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 ?>

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>

modules/backend/behaviors/listcontroller/index.php

@@ -0,0 +1 @@
+<?= $this->listRender() ?>

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;
     }

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.
      */