From b63e4ed7e052578587461866fb3742fb2e742776 Mon Sep 17 00:00:00 2001 From: Raphael Gauthier Date: Mon, 6 May 2024 10:17:44 +0200 Subject: [PATCH] Work in progress --- .../main/elm/sources/Accounts/ViewModals.elm | 19 ++++++++++++------- .../elm/sources/GroupRelatedRules/View.elm | 2 +- .../elm/sources/NodeProperties/ViewUtils.elm | 2 +- .../src/main/elm/sources/Rules/View.elm | 10 +++++----- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm index 93a486663c0..e2d22ef1502 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm @@ -57,6 +57,13 @@ displayModals model = Confirm Regenerate a call -> ( "Regenerate token of API account '" ++ a ++ "'", "Confirm", "primary" ) + btnAttributes = + case model.ui.modalState of + NewAccount -> + [] + + _ -> + [attribute "data-bs-dismiss" "modal", attribute "aria-label" "Close"] modalUI = case model.ui.modalState of NoModal -> @@ -223,8 +230,7 @@ displayModals model = case model.ui.copyState of NoCopy -> div [ id accountsModalId, class ("modal modal-account fade " ++ modalClass), attribute "aria-modal" "true", attribute "role" "dialog" ] - [ div [ class "modal-backdrop fade show", onClick (ToggleEditPopup NoModal) ] [] - , div [ class "modal-dialog" ] + [ div [ class "modal-dialog" ] [ div [ class "modal-content" ] [ div [ class "modal-header" ] [ h5 [ class "modal-title" ] [ text modalTitle ] @@ -272,8 +278,8 @@ displayModals model = ] ] , div [ class "modal-footer" ] - [ button [ type_ "button", class "btn btn-default", onClick (ToggleEditPopup NoModal) ] [ text "Close" ] - , button [ type_ "button", class ("btn btn-" ++ btnClass), onClick modalUI.saveAction, disabled (checkEmptyBtn || checkAlreadyUsedName) ] [ text btnTxt ] + [ button [ type_ "button", class "btn btn-default", onClick (ToggleEditPopup NoModal), attribute "data-bs-dismiss" "modal", attribute "aria-label" "Close" ] [ text "Close" ] + , button (List.append [ type_ "button", class ("btn btn-" ++ btnClass), onClick modalUI.saveAction, disabled (checkEmptyBtn || checkAlreadyUsedName) ] btnAttributes) [ text btnTxt ] ] ] ] @@ -282,8 +288,7 @@ displayModals model = Token txt -> -- Almost a modal as it is a notification that requires user interaction (copy) div [ class "modal fade show", style "display" "block" ] - [ div [ class "modal-backdrop fade show", onClick CloseCopyPopup ] [] - , div [ class "modal-dialog" ] + [ div [ class "modal-dialog" ] [ div [ class "modal-content" ] [ div [ class "modal-header" ] [ h5 [ class "modal-title" ] [ text "Copy the token" ] @@ -304,7 +309,7 @@ displayModals model = ] ] , div [ class "modal-footer" ] - [ button [ type_ "button", class "btn btn-success", onClick CloseCopyPopup ] [ text "Close" ] + [ button [ type_ "button", class "btn btn-success", onClick CloseCopyPopup, attribute "data-bs-dismiss" "modal", attribute "aria-label" "Close" ] [ text "Close" ] ] ] ] diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/GroupRelatedRules/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/GroupRelatedRules/View.elm index fc052760e99..c20725c9080 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/GroupRelatedRules/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/GroupRelatedRules/View.elm @@ -138,7 +138,7 @@ view model = else div [class "tags-container"] ( List.map (\t -> - div [class "btn-group btn-group-xs ng-scope"] + div [class "btn-group btn-group-xs"] [ button [class "btn btn-default tags-label", onClick (UpdateRuleFilters {treeFilters | newTag = {newTag | key = t.key, value = t.value}})] [ i [class "fa fa-tag"][] , span [class "tag-key"] diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm index 738e78020a5..2e12fd4953b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/NodeProperties/ViewUtils.elm @@ -313,7 +313,7 @@ modalDelete model = [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][] , div [ class "modal-dialog" ] [ div [ class "modal-content" ] - [ div [ class "modal-header ng-scope" ] + [ div [ class "modal-header" ] [ h5 [ class "modal-title" ] [ text "Delete property"] , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][] ] diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm index bc9f002e4dc..dc294e8ce6c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/View.elm @@ -171,7 +171,7 @@ view model = [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][] , div [ class "modal-dialog" ] [ div [ class "modal-content" ] [ - div [ class "modal-header ng-scope" ] [ + div [ class "modal-header" ] [ h5 [ class "modal-title" ] [ text "Delete Rule"] , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][] ] @@ -208,7 +208,7 @@ view model = [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][] , div [ class "modal-dialog" ] [ div [ class "modal-content" ] [ - div [ class "modal-header ng-scope" ] [ + div [ class "modal-header" ] [ h5[ class "modal-title" ] [ text (txtDisable ++" Rule")] , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][] ] @@ -233,7 +233,7 @@ view model = [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][] , div [ class "modal-dialog" ] [ div [ class "modal-content" ] [ - div [ class "modal-header ng-scope" ] [ + div [ class "modal-header" ] [ h5 [ class "modal-title" ] [ text "Delete category"] , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][] ] @@ -259,7 +259,7 @@ view model = [ div [class "modal-backdrop fade show", onClick (ClosePopup Ignore)][] , div [ class "modal-dialog" ] [ div [ class "modal-content" ] - [ div [ class "modal-header ng-scope" ] + [ div [ class "modal-header" ] [ h5 [ class "modal-title" ] [ text (action ++" Rule")] , button [type_ "button", class "btn-close", onClick (ClosePopup Ignore), attribute "aria-label" "Close"][] ] @@ -345,7 +345,7 @@ view model = else div [class "tags-container"] ( List.map (\t -> - div [class "btn-group btn-group-xs ng-scope"] + div [class "btn-group btn-group-xs"] [ button [class "btn btn-default tags-label", onClick (UpdateRuleFilters {ruleFilters | treeFilters = {treeFilters | newTag = {newTag | key = t.key, value = t.value}}})] [ i [class "fa fa-tag"][] , span [class "tag-key"]