From b87adb7e812098695386a640d665ef1e8cee6b72 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Sat, 18 May 2024 16:40:17 +0200 Subject: [PATCH] [JENKINS-73114] avoid conflicts with css classes from bootstrap (#9254) * [JENKINS-73114] avoid conflict of css classes with bootstrap jenkins and bootstrap both have definitions for alert and alert-warning, alert-info, alert-danger. Bootstrap css definitions are included when e.g. the warning-ng plugin is installed and a job is configured to scan for warnings. The css classes from bootstrap are then chosen instead of the ones for Jenkins for things like the admin monitors. To make things umambiguous, add additional classes prefixed with `jenkins-` and make use of them in code. Keep the old definitions for backward compatibility with plugins. Followup changes are needed in plugins (Mostly those that define admin monitors) and the design-library * fix test (cherry picked from commit 90a6ac5c38f33b6674ba78bdfee0a5fe2b757166) --- .../message.jelly | 2 +- .../PluginDeprecationMonitor/message.jelly | 2 +- .../PluginUpdateMonitor/message.jelly | 2 +- .../hudson/PluginManager/advanced.jelly | 2 +- .../hudson/PluginManager/installed.jelly | 10 +- .../hudson/PluginManager/updates.jelly | 16 +-- .../message.jelly | 2 +- .../HudsonHomeDiskUsageMonitor/message.jelly | 2 +- .../NullIdDescriptorMonitor/message.jelly | 2 +- .../diagnosis/OldDataMonitor/message.jelly | 2 +- .../ReverseProxySetupMonitor/message.jelly | 2 +- .../TooManyJobsButNoView/message.jelly | 2 +- .../logging/LogRecorder/configure.jelly | 2 +- .../logging/LogRecorderManager/all.jelly | 2 +- .../CoreUpdateMonitor/message.jelly | 2 +- .../MonitorMarkedNodeOffline/message.jelly | 2 +- .../AdministrativeMonitorImpl/message.jelly | 2 +- .../SlowTriggerAdminMonitor/message.groovy | 2 +- .../util/AdministrativeError/message.jelly | 2 +- .../util/DoubleLaunchChecker/message.jelly | 2 +- .../diagnosis/HsErrPidList/message.jelly | 2 +- .../message.jelly | 2 +- .../ControllerExecutorsAgents/message.jelly | 2 +- .../ControllerExecutorsNoAgents/message.jelly | 2 +- .../RootUrlNotSetMonitor/message.jelly | 2 +- .../SecurityIsOffMonitor/message.jelly | 2 +- .../authenticate-security-token.jelly | 2 +- .../install/pluginSetupWizard.properties | 6 +- .../install/pluginSetupWizard_fr.properties | 4 +- .../install/pluginSetupWizard_it.properties | 6 +- .../install/pluginSetupWizard_lt.properties | 2 +- .../install/pluginSetupWizard_pl.properties | 4 +- .../pluginSetupWizard_pt_BR.properties | 6 +- .../install/pluginSetupWizard_sr.properties | 4 +- .../pluginSetupWizard_sv_SE.properties | 111 ++++++++++++++++++ .../pluginSetupWizard_zh_CN.properties | 6 +- .../pluginSetupWizard_zh_TW.properties | 6 +- .../resources.css | 17 +-- .../model/BuiltInNodeMigration/message.jelly | 2 +- .../message.jelly | 2 +- .../jenkins/model/Jenkins/downgrade.jelly | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../RekeySecretAdminMonitor/message.groovy | 8 +- .../message.groovy | 2 +- .../UpdateSiteWarningsMonitor/message.groovy | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../CSRFAdministrativeMonitor/message.jelly | 2 +- .../test/java/hudson/PluginManagerTest.java | 2 +- .../js/templates/plugin-manager/available.hbs | 8 +- war/src/main/scss/components/_alert.scss | 55 +++++++++ war/src/main/scss/pages/_manage-jenkins.scss | 39 +++--- war/src/main/scss/simple-page.scss | 3 +- 55 files changed, 276 insertions(+), 109 deletions(-) create mode 100644 core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties create mode 100644 war/src/main/scss/components/_alert.scss diff --git a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly index 5ccac430ecd2..cb20ebf8dfe7 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%PluginCycles}
diff --git a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly index 45c4cead0a44..1f5ec400bd3c 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%DeprecatedPlugins}
diff --git a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly index 73182ec483e4..b1f9ba193d49 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%RequiredPluginUpdates}
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 8d0e6abcd22e..81948afa6e80 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -37,7 +37,7 @@ THE SOFTWARE. -
+
${%proxyMovedBlurb(rootURL+"/manage/configure")}
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 8013742cf738..57679d61ffe3 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -54,7 +54,7 @@ THE SOFTWARE. data-is-restart-required="${app.updateCenter.isRestartRequiredForCompletion()}" /> -
${%Warning}: ${%requires.restart}
+
${%Warning}: ${%requires.restart}