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 @@
-
+ makeLayoutPartial('breadcrumb') ?>
fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/sidebar/update.stub b/modules/backend/console/scaffold/controller/sidebar/update.stub
index bd5677411b..5d1ef6f7bd 100644
--- a/modules/backend/console/scaffold/controller/sidebar/update.stub
+++ b/modules/backend/console/scaffold/controller/sidebar/update.stub
@@ -1,53 +1,17 @@
-
@@ -60,7 +24,6 @@
makeLayout('form-with-sidebar') ?>
-
diff --git a/modules/backend/console/scaffold/controller/standard/create.stub b/modules/backend/console/scaffold/controller/standard/create.stub
index 8836705591..2a936e607a 100644
--- a/modules/backend/console/scaffold/controller/standard/create.stub
+++ b/modules/backend/console/scaffold/controller/standard/create.stub
@@ -1,48 +1,18 @@
-
+ makeLayoutPartial('breadcrumb') ?>
fatalError): ?>
-
'layout']) ?>
-
formRender() ?>
-
-
-
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 @@
-
+ makeLayoutPartial('breadcrumb') ?>
fatalError): ?>
diff --git a/modules/backend/console/scaffold/controller/standard/update.stub b/modules/backend/console/scaffold/controller/standard/update.stub
index 61e9a0d1c5..b4da197e06 100644
--- a/modules/backend/console/scaffold/controller/standard/update.stub
+++ b/modules/backend/console/scaffold/controller/standard/update.stub
@@ -1,56 +1,17 @@
-
+ makeLayoutPartial('breadcrumb') ?>
fatalError): ?>
-
'layout']) ?>
-
formRender() ?>
-
-
-
-
fatalError) ?>
-
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 @@
-bindEvent('page.beforeDisplay', function () {
if (!$this->user->isSuperUser()) {
- return Response::make(View::make('backend::access_denied'), 403);
+ abort(403);
}
});
}
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 @@
-
-
-
-
-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 @@
-
-
-
-
-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 @@
-
-
-
-
-fatalError): ?>
-
-
-
-
-
- formRenderOutsideFields() ?>
- formRenderPrimaryTabs() ?>
-
-
-
-
-
-
-
-
-
formRenderSecondaryTabs() ?>
-
-
-
- 'layout stretch']) ?>
- makeLayout('form-with-sidebar') ?>
-
-
-
-
-
-
-
-
-
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/lang/en/lang.php b/modules/backend/lang/en/lang.php
index 5c1a96f55b..ee4e5bd019 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',
@@ -264,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...',
@@ -358,6 +360,7 @@
],
'reorder' => [
'default_title' => 'Reorder records',
+ 'reorder_title' => 'Reorder :name',
'no_records' => 'There are no records available to sort.',
],
'model' => [
@@ -518,6 +521,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',
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...',
diff --git a/modules/backend/layouts/_breadcrumb.php b/modules/backend/layouts/_breadcrumb.php
new file mode 100644
index 0000000000..cc56ddfda8
--- /dev/null
+++ b/modules/backend/layouts/_breadcrumb.php
@@ -0,0 +1,22 @@
+sideMenu[$context->sideMenuCode ?? null] ?? null;
+$settingsManager = \System\Classes\SettingsManager::instance();
+$settingsContext = $settingsManager->getContext();
+$settingsItem = null;
+if ($settingsContext) {
+ $settingsItem = $settingsManager->findSettingItem($settingsContext->owner, $settingsContext->itemCode);
+}
+?>
+
+
+
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index a2a3273095..2b3aa59b80 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/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/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) {
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}
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 = '
File generated: ' . str_replace(base_path(), '', $langFilePath);
} else {
- $comment = 'File updated: ' . str_replace(base_path(), '', $langFilePath);
+ $comment = '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);
}
/**
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 @@
-
-
-
-
-fatalError): ?>
-
- 'layout']) ?>
-
-
- formRender() ?>
-
-
-
-
-
-
-
-
- fatalError)) ?>
-
-
-
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 @@
-
-
-
-
-fatalError): ?>
-
- 'layout']) ?>
-
-
- formRender() ?>
-
-
-
-
-
-
-
-
- fatalError)) ?>
-
-
-
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 @@
-
-
-
-
-fatalError): ?>
-
- 'layout']) ?>
-
-
- formRender() ?>
-
-
-
-
-
-
-
-
- fatalError)) ?>
-
-
-
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),
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.
*/