More fixes for button text, style

uyuni-project · Jan 15, 2025 · 4921d24 · 4921d24
1 parent d62b39d
commit 4921d24
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 55 deletions.
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
@@ -4265,7 +4265,7 @@ organization. You may grant or remove the organization administrator role in the
         <source>Patches</source>
       </trans-unit>
       <trans-unit id="erratalist.jsp.deleteerrata" xml:space="preserve">
-        <source>Delete Patches</source>
+        <source>Delete</source>
       </trans-unit>
       <trans-unit id="erratalist.jsp.cloneerrata" xml:space="preserve">
         <source>Clone Patches</source>
@@ -8943,7 +8943,7 @@ Please note that some manual configuration of these scripts may still be require
         <source>Repository Information</source>
       </trans-unit>
       <trans-unit id="repos.jsp.update.channel" xml:space="preserve">
-        <source>Save Repositories</source>
+        <source>Save</source>
       </trans-unit>
       <trans-unit id="repos.jsp.channel.header" xml:space="preserve">
         <source>Repository</source>
@@ -23963,7 +23963,7 @@ given channel.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.software.channel" xml:space="preserve">
-        <source>Delete software channel</source>
+        <source>Delete Channel</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/channels/manage/Edit.do</context>
         </context-group>
@@ -23987,7 +23987,7 @@ given channel.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.channel" xml:space="preserve">
-        <source>Delete software channel</source>
+        <source>Delete Channel</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/channels/manage/errata//Add.do</context>
         </context-group>
@@ -24035,7 +24035,7 @@ given channel.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="channel.jsp.errata.remove" xml:space="preserve">
-        <source>Remove Patches</source>
+        <source>Remove</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/channels/manage/errata/ErrataList.do</context>
         </context-group>

diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java
@@ -460,7 +460,7 @@ private void renderSetButtons(Writer out) throws IOException {
         StringBuilder buf = new StringBuilder();
         if (set != null) {
             if (showSetButtons) {
-                buf.append("<span class=\"spacewalk-list-selection-btns test\">");
+                buf.append("<span class=\"spacewalk-list-selection-btns\">");
                 buf.append(addButtonTo(buf, RequestContext.DISPATCH, UPDATE_LIST_KEY,
                                                     "update_list_key_id").render());
                 buf.append(" ");

diff --git a/java/code/src/com/suse/manager/webui/templates/org/custom.jade b/java/code/src/com/suse/manager/webui/templates/org/custom.jade
@@ -1,6 +1,6 @@
 .spacewalk-toolbar-h1
   .spacewalk-toolbar
-    a(href="/rhn/admin/multiorg/DeleteOrg.do?oid=#{orgId}")
+    a(href="/rhn/admin/multiorg/DeleteOrg.do?oid=#{orgId}" class="btn btn-danger")
         i.fa.fa-trash-o(title='Delete System')
         | #{l.t("Delete Organization")}
   h1

diff --git a/java/code/src/com/suse/manager/webui/templates/org/recurring-actions.jade b/java/code/src/com/suse/manager/webui/templates/org/recurring-actions.jade
@@ -1,6 +1,6 @@
 .spacewalk-toolbar-h1
   .spacewalk-toolbar
-    a(href="/rhn/admin/multiorg/DeleteOrg.do?oid=#{orgId}")
+    a(href="/rhn/admin/multiorg/DeleteOrg.do?oid=#{orgId}" class="btn btn-danger")
         i.fa.fa-trash-o(title='Delete System')
         | #{l.t("Delete Organization")}
   h1

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrataremove.jsp
@@ -20,7 +20,7 @@
     <rhn:csrf />
     <div class="spacewalk-section-toolbar">
         <div class="action-button-wrapper">
-            <input class="btn btn-danger" type="submit"
+            <input class="btn btn-default" type="submit"
                 name="dispatch"  value="<bean:message key='channel.jsp.errata.confirmremove'/>">
         </div>
     </div>

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
@@ -20,7 +20,7 @@
         <rhn:hidden name="cid" value="${cid}"/>
         <div class="spacewalk-section-toolbar">
             <div class="action-button-wrapper">
-                <input class="btn btn-danger" type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.remove'/>" ${empty pageList ? 'disabled' : ''}/>
+                <input class="btn btn-default" type="submit" name="dispatch" value="<bean:message key='channel.jsp.errata.remove'/>" ${empty pageList ? 'disabled' : ''}/>
             </div>
         </div>
         <rhn:submitted/>

diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/listremovepackages.jsp
@@ -22,7 +22,7 @@
         <div class="spacewalk-section-toolbar">
             <div class="action-button-wrapper">
                 <rl:csv dataset="pageList" name="packageList" exportColumns="id, nvrea, provider"/>
-                <input type="submit" name="confirm" class="btn btn-danger"
+                <input type="submit" name="confirm" class="btn btn-default"
                        value="<bean:message key='channel.jsp.package.removebutton'/>"/>
             </div>
         </div>

diff --git a/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp b/java/code/webapp/WEB-INF/pages/channel/packagelist.jsp
@@ -15,9 +15,13 @@
     <rl:listset name="packageSet">
     <rhn:csrf />
     <rhn:submitted />
-    <rl:csv dataset="pageList"
-      name="packageList"
-      exportColumns="id, nvrea, provider" />
+    <div class="spacewalk-section-toolbar">
+      <div class="action-button-wrapper">
+        <rl:csv dataset="pageList"
+          name="packageList"
+          exportColumns="id, nvrea, provider" />
+      </div>
+    </div>
 
     <rhn:hidden name="cid" value="${cid}" />
 

diff --git a/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp b/java/code/webapp/WEB-INF/pages/channel/subscribedsystems.jsp
@@ -20,9 +20,13 @@
 <rhn:csrf />
 
 <rhn:hidden name="cid" value="${cid}" />
+<div class="spacewalk-section-toolbar">
+      <div class="action-button-wrapper">
         <rl:csv dataset="pageList"
             name="systemList"
             exportColumns="id, name,entitlementLevel" />
+      </div>
+</div>
         <rl:list dataset="pageList"
                         name="systemList"
                         decorator="SelectableDecorator"

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/properties.jspf
@@ -8,15 +8,15 @@
                 <c:choose>
                 <c:when test="${channelOverviewForm.map.editing != 'true'}">
                   <a 
-                    role="button" class="btn-tertiary pull-right"
+                    role="button" class="btn btn-tertiary pull-right"
                     title="<bean:message key='channelOverview.jsp.choose-edit' />"
                     href="/rhn/configuration/ChannelOverview.do?ccid=${ccid}&amp;editing=true">
                     <rhn:icon type="item-edit" />
                   </a>
                 </c:when>
                 <c:otherwise>
                   <a 
-                    role="button" class="btn-tertiary pull-right"
+                    role="button" class="btn btn-tertiary pull-right"
                     title="Cancel"
                     href="/rhn/configuration/ChannelOverview.do?ccid=${ccid}&amp">
                     <rhn:icon type="item-close" />

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -7,7 +7,7 @@
                 name="errataList"
                 exportColumns="advisoryType,advisoryName,synopsis,updateDate"/>
             <button type="submit" name="dispatch" class="btn btn-default">
-                <rhn:icon type="item-del" /> <bean:message key="erratalist.jsp.deleteerrata"/>
+                <bean:message key="erratalist.jsp.deleteerrata"/>
             </button>
         </div>
     </div>

diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/edit_user_table_rows.jspf
@@ -98,7 +98,7 @@
         <c:choose>
             <c:when test="${!empty mailableAddress}">
                 ${mailableAddress}
-                <a role="button" class="btn-tertiary" title="Edit Email" href="<c:out value="${email_link}"/>">
+                <a role="button" class="btn btn-tertiary" title="Edit Email" href="<c:out value="${email_link}"/>">
                     <rhn:icon type="setup-wizard-creds-edit" />
                     <%--
                     <bean:message key="${email_display}"/>

diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
@@ -106,7 +106,7 @@
     <a href="/rhn/groups/EditGroup.do?sgid=${id}"
       title="<bean:message key='systemgroup.details.editproperties' />"
       role="button"
-      class="js-spa btn-tertiary pull-right">
+      class="js-spa btn btn-tertiary pull-right">
         <rhn:icon type="item-edit" />
     </a>
   </rhn:require>

diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactions.jsp
@@ -24,7 +24,7 @@
         <rhn:submitted/>
         <div class="spacewalk-section-toolbar">
             <div class="action-button-wrapper">
-                <input type="submit" name="dispatch" class="btn btn-danger"
+                <input type="submit" name="dispatch" class="btn btn-default"
                        value='<bean:message key="actions.jsp.cancelactions"/>'/>
             </div>
         </div>

diff --git a/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp b/java/code/webapp/WEB-INF/pages/schedule/pendingactionsconfirm.jsp
@@ -24,7 +24,7 @@
         <div class="action-button-wrapper">
              <input type="submit"
                name="dispatch"
-               class="btn btn-danger"
+               class="btn btn-primary"
                value='<bean:message key="actions.jsp.confirmcancelactions"/>'/>
          </div>
      </div>

diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -267,7 +267,7 @@
             <a href="/rhn/systems/details/SystemChannels.do?sid=${system.id}"
               title="<bean:message key='sdc.details.overview.subscribedchannels.edit' />"
               role="button"
-              class="js-spa btn-tertiary pull-right">
+              class="js-spa btn btn-tertiary pull-right">
                 <rhn:icon type="item-edit" />
             </a>
           </h4>
@@ -381,7 +381,7 @@
             <a href="/rhn/systems/details/Edit.do?sid=${system.id}"
               title="<bean:message key='sdc.details.overview.sysproperties.edit' />"
               role="button"
-              class="js-spa btn-tertiary pull-right">
+              class="js-spa btn btn-tertiary pull-right">
                 <rhn:icon type="item-edit" />
             </a>
           </h4>

diff --git a/...eatures/build_validation/add_MU_repositories/add_maintenance_update_repositories.template b/...eatures/build_validation/add_MU_repositories/add_maintenance_update_repositories.template
@@ -27,7 +27,7 @@ Feature: Add a Maintenance Update custom channel and the custom repositories for
     And I follow "Custom Channel for <client>"
     And I follow "Repositories" in the content area
     And I select the MU repositories for "<client>" from the list
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "repository information was successfully updated" text
 
   Scenario: Synchronize the repositories in the custom channel for <client>

diff --git a/...idation/add_MU_repositories/monitoring_server_add_maintenance_update_repositories.feature b/...idation/add_MU_repositories/monitoring_server_add_maintenance_update_repositories.feature
@@ -27,7 +27,7 @@ Feature: Add a Maintenance Update custom channel and the custom repositories for
     And I follow "Custom Channel for monitoring_server"
     And I follow "Repositories" in the content area
     And I select the MU repositories for "sle15sp4_minion" from the list
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "repository information was successfully updated" text
 
   Scenario: Synchronize the repositories in the custom channel for monitoring_server

diff --git a/testsuite/features/build_validation/add_non_MU_repositories/centos7_minion_add_iso.feature b/testsuite/features/build_validation/add_non_MU_repositories/centos7_minion_add_iso.feature
@@ -34,7 +34,7 @@ Feature: Add the CentOS 7 distribution custom repositories
     And I follow "Custom Channel for CentOS 7 DVD"
     And I follow "Repositories" in the content area
     And I select the "centos-7-iso" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "repository information was successfully updated" text
 
   Scenario: Synchronize the repository in the custom channel for CentOS 7 DVD

diff --git a/testsuite/features/build_validation/add_non_MU_repositories/rocky8_minion_add_iso.feature b/testsuite/features/build_validation/add_non_MU_repositories/rocky8_minion_add_iso.feature
@@ -59,7 +59,7 @@ Feature: Add the Rocky 8 distribution custom repositories
     And I follow "Repositories" in the content area
     And I select the "rocky-8-iso-appstream" repo
     And I select the "rocky-8-iso-baseos" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "repository information was successfully updated" text
 
   Scenario: Synchronize the repositories in the custom channel for Rocky 8 DVD

diff --git a/testsuite/features/reposync/srv_create_fake_repositories.feature b/testsuite/features/reposync/srv_create_fake_repositories.feature
@@ -58,7 +58,7 @@ Feature: Create fake repositories for each fake child channel
     Then I should see a "Channel Fake-RPM-SUSE-Channel updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-RPM-SUSE-Channel repository information was successfully updated" text
 
   Scenario: Add the fake RPM repository to the Test child channel
@@ -69,7 +69,7 @@ Feature: Create fake repositories for each fake child channel
     Then I should see a "Channel Test-Child-Channel-x86_64 updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Test-Child-Channel-x86_64 repository information was successfully updated" text
 
 @rhlike_minion
@@ -81,7 +81,7 @@ Feature: Create fake repositories for each fake child channel
     Then I should see a "Channel Fake-Base-Channel-RH-like updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-Base-Channel-RH-like repository information was successfully updated" text
 
 @rhlike_minion
@@ -93,7 +93,7 @@ Feature: Create fake repositories for each fake child channel
     Then I should see a "Channel Fake-Base-Channel-AppStream updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-appstream-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-Base-Channel-AppStream repository information was successfully updated" text
 
   Scenario: Create a fake repository for i586
@@ -113,7 +113,7 @@ Feature: Create fake repositories for each fake child channel
     Then I should see a "Channel Fake-Child-Channel-i586 updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-i586-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-Child-Channel-i586 repository information was successfully updated" text
 
 @sle_minion
@@ -122,7 +122,7 @@ Feature: Create fake repositories for each fake child channel
     And I follow "Fake-Child-Channel-SUSE-like"
     And I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-Child-Channel-SUSE-like repository information was successfully updated" text
 
 @deblike_minion
@@ -141,7 +141,7 @@ Feature: Create fake repositories for each fake child channel
     And I follow "Fake-Base-Channel-Debian-like"
     And I follow "Repositories" in the content area
     And I select the "fake-debian-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-Base-Channel-Debian-like repository information was successfully updated" text
 
 @pxeboot_minion
@@ -155,5 +155,5 @@ Feature: Create fake repositories for each fake child channel
     Then I should see a "Channel Fake-RPM-Terminal-Channel updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-RPM-Terminal-Channel repository information was successfully updated" text
diff --git a/testsuite/features/reposync/srv_create_repository.feature b/testsuite/features/reposync/srv_create_repository.feature
@@ -46,7 +46,7 @@ Feature: Add a repository to a channel
     Then I should see a "Channel Test-Channel-x86_64 updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Test-Channel-x86_64 repository information was successfully updated" text
 
   Scenario: Synchronize the repository in the x86_64 channel
@@ -76,7 +76,7 @@ Feature: Add a repository to a channel
     Then I should see a "Channel Fake-i586-Channel updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-i586-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-i586-Channel repository information was successfully updated" text
 
   Scenario: Synchronize the repository in the i586 channel
@@ -104,7 +104,7 @@ Feature: Add a repository to a channel
     And I follow "Fake-Deb-AMD64-Channel"
     And I follow "Repositories" in the content area
     And I select the "fake-debian-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-Deb-AMD64-Channel repository information was successfully updated" text
 
 @deblike_minion
@@ -126,7 +126,7 @@ Feature: Add a repository to a channel
     Then I should see a "Channel Fake-RH-Like-Channel updated" text
     When I follow "Repositories" in the content area
     And I select the "fake-rpm-repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "Fake-RH-Like-Channel repository information was successfully updated" text
 
 @rhlike_minion

diff --git a/testsuite/features/reposync/srv_strict_mode_repo_sync.feature b/testsuite/features/reposync/srv_strict_mode_repo_sync.feature
@@ -33,15 +33,15 @@ Scenario: Testing strict mode
     And I follow "Test-Strict-Channel"
     And I follow "Repositories" in the "content area"
     And I check "fake-rpm-repo" in the list
-    And I click on "Save Repositories"
+    And I click on "Save"
     And I follow "Sync" in the "content area"
     And I click on "Sync Now"	
     And I wait at most 60 seconds until I do not see "Repository sync is running." text, refreshing the page
     And I store the amount of packages in channel "test-strict-channel"
     And I follow "Add / Remove"
     And I uncheck "fake-rpm-repo" in the list
     And I check "fake-rpm-repo-modified" in the list
-    And I click on "Save Repositories"
+    And I click on "Save"
     And I follow "Sync" in the "content area"
     And I check "no-strict"
     And I click on "Sync Now"	

diff --git a/testsuite/features/secondary/min_project_lotus.feature b/testsuite/features/secondary/min_project_lotus.feature
@@ -37,7 +37,7 @@ Feature: Project Lotus
     And I follow "Custom Channel for SLES15SP4 PTFs"
     And I follow "Repositories" in the content area
     And I select the "sles15sp4_ptf_repo" repo
-    And I click on "Save Repositories"
+    And I click on "Save"
     Then I should see a "repository information was successfully updated" text
 
   Scenario: Pre-requisite: Sync PTF repository
@@ -116,7 +116,7 @@ Feature: Project Lotus
   Scenario: Cleanup: Delete custom channel for PTFs
     When I follow the left menu "Software > Manage > Channels"
     And I follow "Custom Channel for SLES15SP4 PTFs"
-    And I follow "Delete software channel"
+    And I follow "Delete Channel"
     And I check "unsubscribeSystems"
     And I click on "Delete Channel"
     Then I should see a "Channel Custom Channel for SLES15SP4 PTFs has been deleted" text