Merge branch 'main' into load-on-demand-and-fix-index-query

Author: pxpm

src/app/Library/CrudPanel/Traits/Settings.php

@@ -15,7 +15,7 @@ trait Settings
      * Getter for the settings key-value store.
      *
      * @param  string  $key  Usually operation.name (ex: list.exportButtons)
-     * @return mixed [description]
+     * @return mixed Setting value or null
      */
     public function get(string $key)
     {
@@ -96,7 +96,7 @@ public function operationSetting(string $key, $value = null, $operation = null)
      * Defaults to the current operation.
      *
      * @param  string  $key  Has no operation prepended. (ex: exportButtons)
-     * @return mixed [description]
+     * @return mixed Setting value or null
      */
     public function getOperationSetting(string $key, $operation = null)
     {
@@ -110,7 +110,7 @@ public function getOperationSetting(string $key, $operation = null)
      * Defaults to the current operation.
      *
      * @param  string  $key  Has no operation prepended. (ex: exportButtons)
-     * @return mixed [description]
+     * @return bool
      */
     public function hasOperationSetting(string $key, $operation = null)
     {
@@ -124,7 +124,7 @@ public function hasOperationSetting(string $key, $operation = null)
      * Defaults to the current operation.
      *
      * @param  string  $key  Has no operation prepended. (ex: max_level)
-     * @param  bool  $value  True/false depending on success.
+     * @param  mixed  $value  The value you want to store.
      */
     public function setOperationSetting(string $key, $value, $operation = null)
     {

src/resources/lang/vi/base.php

@@ -41,6 +41,7 @@
     'update_account_info' => 'Cập Nhật Thông Tin Tài Khoản',
     'save' => 'Lưu',
     'cancel' => 'Huỷ bỏ',
+    'error' => 'Lỗi',
     'success' => 'Thành công',
     'warning' => 'Cảnh báo',
     'notice' => 'Thông báo',

src/resources/lang/vi/crud.php

@@ -111,6 +111,11 @@
         'print' => 'In',
         'column_visibility' => 'Ẩn/hiện cột',
     ],
+    'custom_views' => [
+        'title' => 'Chế độ xem tuỳ chỉnh',
+        'title_short' => 'lượt xem',
+        'default' => 'mặc định',
+    ],
 
     // global crud - errors
     'unauthorized_access' => 'Truy cập chưa được cấp phép - bạn cần được cấp quyền để xem trang này.',

src/resources/views/ui/dashboard.blade.php

@@ -10,7 +10,9 @@
         $widgets['before_content'][] = [
             'type'        => 'jumbotron',
             'heading'     => trans('backpack::base.welcome'),
+            'heading_class' => 'display-3 '.(backpack_theme_config('layout') === 'horizontal_overlap' ? ' text-white' : ''),
             'content'     => trans('backpack::base.use_sidebar'),
+            'content_class' => backpack_theme_config('layout') === 'horizontal_overlap' ? 'text-white' : '',
             'button_link' => backpack_url('logout'),
             'button_text' => trans('backpack::base.logout'),
         ];

src/resources/views/ui/widgets/jumbotron.blade.php

@@ -6,14 +6,14 @@
 @endphp
 
 @includeWhen(!empty($widget['wrapper']), backpack_view('widgets.inc.wrapper_start'))
-	<div class="jumbotron mb-2">
+	<div class="jumbotron mb-2 ">
 
 	  @if (isset($widget['heading']))
-	  <h1 class="display-3">{!! $widget['heading'] !!}</h1>
+	  <h1 class="{{ $widget['heading_class'] ?? 'display-3'}}">{!! $widget['heading'] !!}</h1>
 	  @endif
 
 	  @if (isset($widget['content']))
-	  <p>{!! $widget['content'] !!}</p>
+	  <p class="{{ $widget['content_class'] ?? ''}}">{!! $widget['content'] !!}</p>
 	  @endif
 
 	  @if (isset($widget['button_link']))