From e3b51728da34e57f69abb2da309bf40986998ce1 Mon Sep 17 00:00:00 2001 From: Richa Date: Mon, 27 Jan 2025 12:58:23 +0100 Subject: [PATCH] Removed icons from submit buttons, fixed disabled state for tertiary button --- .../strings/java/StringResource_en_US.xml | 2 +- .../strings/jsp/StringResource_en_US.xml | 4 ++-- .../taglibs/test/ToolbarTagDeletionTest.java | 10 +++++----- .../features/secondary/min_timezone.feature | 4 ++-- ...docker_advanced_content_management.feature | 4 ++-- .../features/secondary/srv_users.feature | 20 +++++++++---------- .../css/base/components/buttons.suma.scss | 18 +++++++++-------- .../manager/admin/create-payg/create-payg.tsx | 1 - .../create-project/top-panel-buttons.tsx | 1 - .../src/manager/images/image-profile-edit.tsx | 3 --- .../src/manager/images/image-store-edit.tsx | 3 --- .../systems/bootstrap/bootstrap-minions.tsx | 6 ++---- 12 files changed, 34 insertions(+), 42 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index fd5838edc8cd..a96ff6e8f266 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -2524,7 +2524,7 @@ and try again. - Delete + Delete User User details pages diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index c2dfe869d9f4..173adce6901d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -1874,13 +1874,13 @@ button below, and <b>will be unable to log back in</b>. - Deactivate + Deactivate User /rhn/users/UserDetails - Reactivate + Reactivate User /rhn/users/UserDetails diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java index 05dfd334233d..5ccfbb48b0dc 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagDeletionTest.java @@ -44,8 +44,8 @@ public void testDeletionNoAcl() { // setup mock objects String output = "
" + "
" + - "" + - "Delete

"; + "" + + "Delete User

"; setupDeletionTag("h1", "deletion-url", "", "user"); @@ -77,7 +77,7 @@ public void testCreateAclMultipleMixinsMultipleAcls() { try { String output = "
" + "
" + - "Delete" + + "Delete User" + "

"; setupDeletionTag("h1", "deletion-url", @@ -99,7 +99,7 @@ public void testCreateAclMultipleAclsSingleMixin() { try { String output = "
" + "
" + - "Delete" + + "Delete User" + "

"; setupDeletionTag("h1", "deletion-url", @@ -144,7 +144,7 @@ public void testDeletionAcl() { // setup mock objects String output = "
" + "
" + - "Delete" + + "Delete User" + "

"; setupDeletionTag("h1", "deletion-url", "true_test()", "user"); diff --git a/testsuite/features/secondary/min_timezone.feature b/testsuite/features/secondary/min_timezone.feature index f7460cbdface..ccfadf353dff 100644 --- a/testsuite/features/secondary/min_timezone.feature +++ b/testsuite/features/secondary/min_timezone.feature @@ -99,9 +99,9 @@ Feature: Correct timezone display Scenario: Cleanup: Delete user When I follow the left menu "Users > User List > Active" And I follow "MalaysianUser" - And I follow "Delete" + And I follow "Delete User" Then I should see a "Confirm User Deletion" text And I should see a "This will delete this user permanently." text - When I click on "Delete" + When I click on "Delete User" Then I should see a "Active Users" text And I should not see a "MalaysianUser" link diff --git a/testsuite/features/secondary/srv_docker_advanced_content_management.feature b/testsuite/features/secondary/srv_docker_advanced_content_management.feature index b9352e64627b..1160b0cabd36 100644 --- a/testsuite/features/secondary/srv_docker_advanced_content_management.feature +++ b/testsuite/features/secondary/srv_docker_advanced_content_management.feature @@ -63,9 +63,9 @@ Feature: Advanced content management Given I am authorized for the "Admin" section When I follow the left menu "Users > User List > Active" And I follow "norole" - And I follow "Delete" + And I follow "Delete User" Then I should see a "Confirm User Deletion" text And I should see a "This will delete this user permanently." text - When I click on "Delete" + When I click on "Delete User" Then I should see a "Active Users" text And I should not see a "norole" link diff --git a/testsuite/features/secondary/srv_users.feature b/testsuite/features/secondary/srv_users.feature index c70db29c180d..65fba3b9b2c3 100644 --- a/testsuite/features/secondary/srv_users.feature +++ b/testsuite/features/secondary/srv_users.feature @@ -125,9 +125,9 @@ Feature: Manage users Scenario: Fail to deactivate organization administrator When I follow the left menu "Users > User List > Active" And I follow "user1" - When I follow "Deactivate" + When I follow "Deactivate User" Then I should see a "This action will deactivate this user. This user will no longer be able to log in or perform actions unless it is reactivated." text - When I click on "Deactivate" + When I click on "Deactivate User" Then I should see a "You cannot deactivate another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to deactivate their account." text When I follow "Deactivated" Then I should see a "No deactivated users." text @@ -147,9 +147,9 @@ Feature: Manage users When I follow the left menu "Users > User List > Active" And I follow "user1" Then I should see "role_org_admin" as unchecked - When I follow "Deactivate" + When I follow "Deactivate User" Then I should see a "This action will deactivate this user. This user will no longer be able to log in or perform actions unless it is reactivated." text - When I click on "Deactivate" + When I click on "Deactivate User" Then I should see a "Active Users" text And I should not see a "user1" link When I follow "Deactivated" @@ -163,8 +163,8 @@ Feature: Manage users When I follow the left menu "Users > User List > Active" And I follow "Deactivated" And I follow "user1" - Then I should see a "Reactivate" link - When I follow "Reactivate" + Then I should see a "Reactivate User" link + When I follow "Reactivate User" Then I should see a "This action will allow this user to access SUSE Manager. This user will retain all permissions, roles, and data that he or she had before being deactivated." text When I click on "Reactivate User" Then I should see a "Active Users" text @@ -177,8 +177,8 @@ Feature: Manage users When I follow the left menu "Users > User List > Active" And I follow "Deactivated" And I follow "user1" - Then I should see a "Reactivate" link - When I follow "Reactivate" + Then I should see a "Reactivate User" link + When I follow "Reactivate User" Then I should see a "This action will allow this user to access Uyuni. This user will retain all permissions, roles, and data that he or she had before being deactivated." text When I click on "Reactivate User" Then I should see a "Active Users" text @@ -189,10 +189,10 @@ Feature: Manage users Scenario: Delete user When I follow the left menu "Users > User List > Active" And I follow "user1" - When I follow "Delete" + When I follow "Delete User" Then I should see a "Confirm User Deletion" text And I should see a "This will delete this user permanently." text - When I click on "Delete" + When I click on "Delete User" Then I should see a "Active Users" text And I should not see a "user1" link diff --git a/web/html/src/branding/css/base/components/buttons.suma.scss b/web/html/src/branding/css/base/components/buttons.suma.scss index 6c44b125f709..dc5afdee97ee 100644 --- a/web/html/src/branding/css/base/components/buttons.suma.scss +++ b/web/html/src/branding/css/base/components/buttons.suma.scss @@ -74,11 +74,7 @@ font-weight: bold; text-decoration: underline; text-underline-offset: .3rem; - - i { - margin-right: 0; - text-decoration: none; - } + gap: 0.3em; &:active, &:focus, @@ -91,9 +87,14 @@ &.disabled, &:disabled { - opacity: 0.6; - pointer-events: auto; - cursor: not-allowed; + &, + &:active { + pointer-events: auto; + cursor: not-allowed; + border-color: transparent; + text-decoration: underline; + text-underline-offset: .3rem; + } } } @@ -203,6 +204,7 @@ } .panel-heading, +.panel-heading a:not(.btn-tertiary), th > a, th .orderBy { border: none; diff --git a/web/html/src/manager/admin/create-payg/create-payg.tsx b/web/html/src/manager/admin/create-payg/create-payg.tsx index 10be1b09d290..1ae90b9bd57c 100644 --- a/web/html/src/manager/admin/create-payg/create-payg.tsx +++ b/web/html/src/manager/admin/create-payg/create-payg.tsx @@ -61,7 +61,6 @@ const CreateProject = () => { className="btn-primary" title={t("Add PAYG ssh data")} text={t("Create")} - icon="fa-plus" action={() => onAction(payg.properties, "create") .then((data) => { diff --git a/web/html/src/manager/content-management/create-project/top-panel-buttons.tsx b/web/html/src/manager/content-management/create-project/top-panel-buttons.tsx index 171d9e529f38..17c7fb44727d 100644 --- a/web/html/src/manager/content-management/create-project/top-panel-buttons.tsx +++ b/web/html/src/manager/content-management/create-project/top-panel-buttons.tsx @@ -14,7 +14,6 @@ const TopPanelButtons = (props: TopPanelButtonsProps) => { className="btn-primary" title={t("Create project")} text={t("Create")} - icon="fa-plus" action={props.onCreate} /> diff --git a/web/html/src/manager/images/image-profile-edit.tsx b/web/html/src/manager/images/image-profile-edit.tsx index fa9d29287b86..bffad6401e95 100644 --- a/web/html/src/manager/images/image-profile-edit.tsx +++ b/web/html/src/manager/images/image-profile-edit.tsx @@ -477,7 +477,6 @@ class CreateImageProfile extends React.Component { key="clear-btn" id="clear-btn" className="btn-default" - icon="fa-eraser" text={t("Clear fields")} handler={this.clearFields} />, @@ -488,7 +487,6 @@ class CreateImageProfile extends React.Component { key="update-btn" id="update-btn" className="btn-primary me-4" - icon="fa-edit" text={t("Update")} disabled={this.state.isInvalid} /> @@ -499,7 +497,6 @@ class CreateImageProfile extends React.Component { key="create-btn" id="create-btn" className="btn-primary me-4" - icon="fa-plus" text={t("Create")} disabled={this.state.isInvalid} /> diff --git a/web/html/src/manager/images/image-store-edit.tsx b/web/html/src/manager/images/image-store-edit.tsx index 41f956a1b552..9893298e30ef 100644 --- a/web/html/src/manager/images/image-store-edit.tsx +++ b/web/html/src/manager/images/image-store-edit.tsx @@ -198,7 +198,6 @@ class CreateImageStore extends React.Component { key="clear-btn" id="clear-btn" className="btn-default" - icon="fa-eraser" text={t("Clear fields")} handler={this.clearFields} />, @@ -210,7 +209,6 @@ class CreateImageStore extends React.Component { key="update-btn" id="update-btn" className="btn-primary me-4" - icon="fa-edit" text={t("Update")} disabled={this.state.isInvalid} /> @@ -221,7 +219,6 @@ class CreateImageStore extends React.Component { key="create-btn" id="create-btn" className="btn-primary me-4" - icon="fa-plus" text={t("Create")} disabled={this.state.isInvalid} /> diff --git a/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx b/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx index c97a4cd4206d..aa2e7810a976 100644 --- a/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx +++ b/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx @@ -325,8 +325,8 @@ class BootstrapMinions extends React.Component { var errMessage = xhr.status === 0 ? t( - "Request interrupted or invalid response received from the server. Please check if your minion was bootstrapped correctly." - ) + "Request interrupted or invalid response received from the server. Please check if your minion was bootstrapped correctly." + ) : Network.errorMessageByStatus(xhr.status); this.setState({ success: false, @@ -394,7 +394,6 @@ class BootstrapMinions extends React.Component { { ,