From 99a5a92a3fb1da67bddd41ed6dad70b52b38d460 Mon Sep 17 00:00:00 2001 From: Raphael Gauthier Date: Wed, 20 Dec 2023 09:31:35 +0100 Subject: [PATCH] Fixes #23943: The API accounts creation and editing popup no longer appears --- .../main/elm/sources/Accounts/ViewModals.elm | 2 +- .../main/style/rudder/rudder-accounts.scss | 101 ++++++++++++++++++ .../secure/administration/apiManagement.html | 64 +---------- 3 files changed, 104 insertions(+), 63 deletions(-) create mode 100644 webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-accounts.scss 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 5d2385f59a..54b0155943 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 @@ -119,7 +119,7 @@ displayModals model = , account.authorisationType == "acl" ) in - div [class ("modal fade " ++ modalClass)] + div [class ("modal modal-account fade " ++ modalClass)] [ div [class "modal-backdrop fade show", onClick (ToggleEditPopup NoModal)][] , div [class "modal-dialog"] [ div [class "modal-content"] diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-accounts.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-accounts.scss new file mode 100644 index 0000000000..3d78de95da --- /dev/null +++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-accounts.scss @@ -0,0 +1,101 @@ +/* +************************************************************************************* +* Copyright 2023 Normation SAS +************************************************************************************* +* +* This file is part of Rudder. +* +* Rudder is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* In accordance with the terms of section 7 (7. Additional Terms.) of +* the GNU General Public License version 3, the copyright holders add +* the following Additional permissions: +* Notwithstanding to the terms of section 5 (5. Conveying Modified Source +* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General +* Public License version 3, when you create a Related Module, this +* Related Module is not considered as a part of the work and may be +* distributed under the license agreement of your choice. +* A "Related Module" means a set of sources files including their +* documentation that, without modification of the Source Code, enables +* supplementary functions or services in addition to those offered by +* the Software. +* +* Rudder is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with Rudder. If not, see . + +* +************************************************************************************* +*/ + +.reload-token { + margin-right: 10px; +} + +.rudder-template{ + & >.one-col { + flex: 1; + } + .template-main { + flex-basis: initial !important; + flex: auto !important; + } + .token-txt { + font-family: var(--font-mono); + font-size: .9em; + } + + .btn-goto { + padding: 3px 9px; + font-size: 1.4em; + position: relative; + top: 3px; + + &.always { + opacity: 1; + } + } + + .modal.modal-account.show{ + display: block; + } +} + + +.btn.delete-button { + margin-left: 10px; +} + +#newAccount-expiration { + margin-top: 6px; + margin-bottom: 12px; + width: 100% +} + +.dataTable thead>tr>th:last-child, +.dataTable tbody>tr>td:last-child { + width: 300px; +} + +form.newAccount.datepicker-open { + padding-bottom: 220px; +} + +.fa.hide-text { + font-size: .6em; + opacity: .8; + position: relative; + top: -1px; + + &:before { + content: "\f069\f069\f069\f069\f069\f069\f069\f069\f069\f069\f069\f069"; + } +} + diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html index 1f18211e29..abdcbe8872 100644 --- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html +++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html @@ -13,68 +13,8 @@ href="/style/rudder/datepicker.css" media="screen"> - +