diff --git a/config/asset_compress.ini b/config/asset_compress.ini index 1fb9575..3646c73 100644 --- a/config/asset_compress.ini +++ b/config/asset_compress.ini @@ -1,13 +1,13 @@ [crudview.css] -files[]=https://cdn.jsdelivr.net/npm/bootstrap@4.5/dist/css/bootstrap.min.css +files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/css/bootstrap.min.css files[]=https://cdn.jsdelivr.net/npm/flatpickr@4.6/dist/flatpickr.min.css files[]=https://cdn.jsdelivr.net/npm/select2@4.0/dist/css/select2.min.css -files[]=https://cdn.jsdelivr.net/npm/@ttskch/select2-bootstrap4-theme@1.2/dist/select2-bootstrap4.css +files[]=https://cdn.jsdelivr.net/npm/select2-bootstrap-5-theme@1.3/dist/select2-bootstrap-5-theme.min.css files[]=plugin:CrudView:css/local.css [crudview_head.js] -files[]=https://cdn.jsdelivr.net/npm/jquery@3.5/dist/jquery.min.js -files[]=https://cdn.jsdelivr.net/npm/bootstrap@4.5/dist/js/bootstrap.min.js +files[]=https://cdn.jsdelivr.net/npm/jquery@3.7/dist/jquery.min.js +files[]=https://cdn.jsdelivr.net/npm/bootstrap@5.3/dist/js/bootstrap.min.js files[]=https://cdn.jsdelivr.net/npm/flatpickr@4.6 files[]=https://cdn.jsdelivr.net/npm/select2@4.0 files[]=https://cdn.jsdelivr.net/npm/jquery.dirtyforms@2.0/jquery.dirtyforms.min.js diff --git a/templates/element/form.php b/templates/element/form.php index db9413f..2f51294 100644 --- a/templates/element/form.php +++ b/templates/element/form.php @@ -33,7 +33,7 @@
-
+
element('form/buttons') ?>
diff --git a/templates/element/form/buttons.php b/templates/element/form/buttons.php index 95c71ba..f346513 100644 --- a/templates/element/form/buttons.php +++ b/templates/element/form/buttons.php @@ -1,5 +1,5 @@ -
+
-
+
Form->button( $formSubmitButtonText, ['class' => 'btn btn-primary', 'name' => '_save', 'value' => '1'] diff --git a/templates/element/index/bulk_actions/form_end.php b/templates/element/index/bulk_actions/form_end.php index ec8ac0c..ba849f3 100644 --- a/templates/element/index/bulk_actions/form_end.php +++ b/templates/element/index/bulk_actions/form_end.php @@ -20,6 +20,6 @@ 'select' => '
' . $submitButton . '
', ], 'type' => 'select', - 'class' => 'no-selectize', + 'class' => 'no-select2', ]); echo $this->Form->end(); diff --git a/templates/element/sidebar.php b/templates/element/sidebar.php index 5458639..53d25d6 100644 --- a/templates/element/sidebar.php +++ b/templates/element/sidebar.php @@ -9,7 +9,7 @@ } ?> -
+