diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index e048c37a2..5fb1ed1e1 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -228,16 +228,16 @@ function _column_key($modelsName, $c, $tz=null) { } if(!empty($cfg['button']['popover'])) { if($cfg['button']['popover'] == 'fieldVal') { - $buttonAttrs['data-content'] = $entity->$col; + $buttonAttrs['data-bs-content'] = $entity->$col; } else { - $buttonAttrs['data-content'] = $cfg['button']['popover']; + $buttonAttrs['data-bs-content'] = $cfg['button']['popover']; } $label = !empty($cfg['label']) ? $cfg['label'] : _column_key($modelsName, $col, $vv_tz); $buttonAttrs['title'] = $label; - $buttonAttrs['data-toggle'] = 'popover'; - $buttonAttrs['data-container'] = 'body'; - $buttonAttrs['data-placement'] = 'top'; - $buttonAttrs['data-animation'] = 'false'; + $buttonAttrs['data-bs-toggle'] = 'popover'; + $buttonAttrs['data-bs-container'] = 'body'; + $buttonAttrs['data-bs-placement'] = 'top'; + $buttonAttrs['data-bs-animation'] = 'false'; } print $this->Form->button($buttonText, $buttonAttrs); } diff --git a/app/templates/element/dialog.php b/app/templates/element/dialog.php index d2105a858..2cfdfc076 100644 --- a/app/templates/element/dialog.php +++ b/app/templates/element/dialog.php @@ -35,16 +35,14 @@
- +
- +
diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php index fb6c62f95..361b0f8d3 100644 --- a/app/templates/element/javascript.php +++ b/app/templates/element/javascript.php @@ -94,29 +94,11 @@ } }); // END DESKTOP MENU DRAWER BEHAVIOR - - // USER MENU BEHAVIORS - - // Toggle the custom user panel in the user menu - $("#user-panel-toggle").click(function(e) { - e.stopPropagation(); - if ($("#user-panel").is(":visible")) { - $("#user-panel").hide(); - $("#user-panel").attr("aria-expanded","false"); - } else { - $("#user-panel").show(); - $("#user-panel").attr("aria-expanded","true"); - } - }); - + // Click outside behaviors $(document).on('click', function (e) { - // Hide custom user menu items on click outside - if ($(e.target).closest("#user-panel").length === 0) { - $("#user-panel").hide(); - } // Hide popovers on click outside but don't close current popover when interacting with content inside it - $('#content [data-toggle="popover"]').each(function () { + $('#content [data-bs-toggle="popover"]').each(function () { if (!$(this).is(e.target) && $('.popover.show').has(e.target).length === 0) { $(this).popover('hide'); } @@ -171,10 +153,10 @@ $("input:submit").addClass("spin submit-button btn btn-primary"); // Make all select form controls Bootstrappy - $("select").addClass("form-control"); + $("select").addClass("form-select"); // Enable Bootstrap Popovers. Unless needed elsewhere, constrain this to #content - $('#content [data-toggle="popover"]').popover(); + $('#content [data-bs-toggle="popover"]').popover(); // Generic row click handling for div-based rows $('div.linked-row').click(function (e) { @@ -185,8 +167,8 @@ $('td.row-link').each(function (e) { url = $(this).find('a').attr('href'); if(url != undefined && url != '') { - $(this).closest('tr').addClass('linked-row').attr('data-target',url).click(function (e) { - location.href = $(this).attr('data-target'); + $(this).closest('tr').addClass('linked-row').attr('data-cm-target',url).click(function (e) { + location.href = $(this).attr('data-cm-target'); }).find('a').on('click',function(e){ // don't propagate on other links to avoid redirecting dialog boxes e.stopPropagation(); diff --git a/app/templates/element/menuAction.php b/app/templates/element/menuAction.php index 597d60c88..7027556ae 100644 --- a/app/templates/element/menuAction.php +++ b/app/templates/element/menuAction.php @@ -38,7 +38,7 @@ class=""> 'id' => 'action-menu-content_' . $actionsMenuUid, 'class' => 'nospin action-menu-toggle', 'escape' => false, - 'data-toggle' => 'dropdown', + 'data-bs-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false, 'title' => __('match.fd.action') @@ -82,7 +82,7 @@ class=""> . '\']);'; ?> + data-bs-toggle="modal" data-bs-target="#dialog"> diff --git a/app/templates/element/menuTop.php b/app/templates/element/menuTop.php index 99c95d100..56ecb0628 100644 --- a/app/templates/element/menuTop.php +++ b/app/templates/element/menuTop.php @@ -30,7 +30,7 @@