Skip to content

Commit b87adb7

Browse files
mawinter69krisstern
mawinter69
authored and
krisstern
committed
[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 90a6ac5)
1 parent c0f2012 commit b87adb7

File tree

55 files changed

+276
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+276
-109
lines changed

‎core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-danger">
27+
<div class="jenkins-alert jenkins-alert-danger">
2828
<dl>
2929
<dt>${%PluginCycles}</dt>
3030
<j:forEach var="p" items="${it.pluginsWithCycle}">

‎core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<dl>
2929
<dt>${%DeprecatedPlugins}</dt>
3030
<j:forEach var="e" items="${it.getDeprecatedPlugins()}">

‎core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-danger">
27+
<div class="jenkins-alert jenkins-alert-danger">
2828
<dl>
2929
<dt>${%RequiredPluginUpdates}</dt>
3030
<j:forEach var="p" items="${it.pluginsToBeUpdated}">

‎core/src/main/resources/hudson/PluginManager/advanced.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ THE SOFTWARE.
3737
<l:main-panel>
3838
<l:app-bar title="${%Advanced settings}"/>
3939

40-
<div class="alert alert-info">
40+
<div class="jenkins-alert jenkins-alert-info">
4141
<strong>${%proxyMovedBlurb(rootURL+"/manage/configure")}</strong>
4242
</div>
4343

‎core/src/main/resources/hudson/PluginManager/installed.jelly

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ THE SOFTWARE.
5454
data-is-restart-required="${app.updateCenter.isRestartRequiredForCompletion()}" />
5555

5656
<j:if test="${app.updateCenter.isRestartRequiredForCompletion()}">
57-
<div class="alert alert-warning"><strong>${%Warning}</strong>: ${%requires.restart}</div>
57+
<div class="jenkins-alert jenkins-alert-warning"><strong>${%Warning}</strong>: ${%requires.restart}</div>
5858
</j:if>
5959

6060
<template id="i18n"
@@ -130,7 +130,7 @@ THE SOFTWARE.
130130
</div>
131131
</j:if>
132132
<j:if test="${!p.getActiveWarnings().isEmpty()}">
133-
<div class="alert alert-danger">${%securityWarning}
133+
<div class="jenkins-alert jenkins-alert-danger">${%securityWarning}
134134
<ul>
135135
<j:forEach var="warning" items="${p.getActiveWarnings()}">
136136
<li>
@@ -143,13 +143,13 @@ THE SOFTWARE.
143143
</div>
144144
</j:if>
145145
<j:if test="${p.isDeprecated()}">
146-
<div class="alert alert-warning">
146+
<div class="jenkins-alert jenkins-alert-warning">
147147
<!-- figure out a way how to present deprecations by multiple update sites instead of just the first one -->
148148
${%deprecationWarning(p.getDeprecations().get(0).url)}
149149
</div>
150150
</j:if>
151151
<j:if test="${it.hasAdoptThisPluginLabel(p)}">
152-
<div class="alert alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
152+
<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
153153
${%adoptThisPlugin}
154154
</div>
155155
</j:if>
@@ -250,7 +250,7 @@ THE SOFTWARE.
250250
${p.name}
251251
</div>
252252
</j:if>
253-
<div class="alert alert-danger jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
253+
<div class="jenkins-alert jenkins-alert-danger jenkins-!-margin-top-1 jenkins-!-margin-bottom-0">
254254
<pre>${p.cause.message}</pre>
255255
</div>
256256
</td>

‎core/src/main/resources/hudson/PluginManager/updates.jelly

+8-8
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ THE SOFTWARE.
136136
</div>
137137
</j:if>
138138
<j:if test="${!p.isCompatibleWithInstalledVersion()}">
139-
<div class="alert alert-danger">${%compatWarning}
139+
<div class="jenkins-alert jenkins-alert-danger">${%compatWarning}
140140
<j:if test="${p.hasIncompatibleParentPlugins()}">
141141
<br/>${%parentCompatWarning}
142142
<ul>
@@ -153,15 +153,15 @@ THE SOFTWARE.
153153
</div>
154154
</j:if>
155155
<j:if test="${p.isForNewerHudson()}">
156-
<div class="alert alert-danger">${%coreWarning(p.requiredCore)}</div>
156+
<div class="jenkins-alert jenkins-alert-danger">${%coreWarning(p.requiredCore)}</div>
157157
</j:if>
158158
<j:if test="${p.fixesSecurityVulnerabilities()}">
159-
<div class="alert alert-warning">
159+
<div class="jenkins-alert jenkins-alert-warning">
160160
${%Applying this update will address security vulnerabilities in the currently installed version.}
161161
</div>
162162
</j:if>
163163
<j:if test="${!p.isNeededDependenciesCompatibleWithInstalledVersion(cache)}">
164-
<div class="alert alert-danger">${%depCompatWarning}
164+
<div class="jenkins-alert jenkins-alert-danger">${%depCompatWarning}
165165
<br/>${%parentDepCompatWarning}
166166
<ul>
167167
<j:forEach var="d"
@@ -177,12 +177,12 @@ THE SOFTWARE.
177177
</div>
178178
</j:if>
179179
<j:if test="${p.isNeededDependenciesForNewerJenkins(cache)}">
180-
<div class="alert alert-danger">
180+
<div class="jenkins-alert jenkins-alert-danger">
181181
${%depCoreWarning(p.getNeededDependenciesRequiredCore().toString())}
182182
</div>
183183
</j:if>
184184
<j:if test="${p.hasWarnings()}">
185-
<div class="alert alert-danger">${%securityWarning}
185+
<div class="jenkins-alert jenkins-alert-danger">${%securityWarning}
186186
<ul>
187187
<j:forEach var="warning" items="${p.getWarnings()}">
188188
<li>
@@ -195,12 +195,12 @@ THE SOFTWARE.
195195
</div>
196196
</j:if>
197197
<j:if test="${p.isDeprecated()}">
198-
<div class="alert alert-warning">
198+
<div class="jenkins-alert jenkins-alert-warning">
199199
${%deprecationWarning(p.getDeprecation().url)}
200200
</div>
201201
</j:if>
202202
<j:if test="${it.hasAdoptThisPluginLabel(p)}">
203-
<div class="alert alert-warning">
203+
<div class="jenkins-alert jenkins-alert-warning">
204204
${%adoptThisPlugin}
205205
</div>
206206
</j:if>

‎core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
3-
<div class="alert alert-danger" role="alert">
3+
<div class="jenkins-alert jenkins-alert-danger" role="alert">
44
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
55
<f:submit name="correct" value="${%Correct}"/>
66
</form>

‎core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
2929
<f:submit name="yes" value="${%Tell me more}"/>
3030
<f:submit name="no" value="${%Dismiss}"/>

‎core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-danger">
27+
<div class="jenkins-alert jenkins-alert-danger">
2828
<dl>
2929
<dt>${%blurb}</dt>
3030
<j:forEach var="d" items="${it.problems}">

‎core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
2929
<f:submit name="yes" value="${%Manage}"/>
3030
<f:submit name="no" value="${%Dismiss}"/>

‎core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ THE SOFTWARE.
2323
-->
2424
<?jelly escape-by-default='true'?>
2525
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:l="/lib/layout">
26-
<div id="redirect-error" class="alert alert-danger reverse-proxy__hidden"
26+
<div id="redirect-error" class="jenkins-alert jenkins-alert-danger reverse-proxy__hidden"
2727
data-url="${rootURL}/${it.url}/test" data-context="${rootURL}">
2828
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
2929
<f:submit name="yes" value="${%More Info}"/>

‎core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div id="tooManyJobsButNoView" class="alert alert-warning">
27+
<div id="tooManyJobsButNoView" class="jenkins-alert jenkins-alert-warning">
2828
<l:isAdmin>
2929
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
3030
<f:submit name="yes" value="${%Create a view now}"/>

‎core/src/main/resources/hudson/logging/LogRecorder/configure.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ THE SOFTWARE.
3636
</l:app-bar>
3737

3838
<f:form method="post" name="config" action="configSubmit">
39-
<div class="alert alert-info jenkins-form-item">
39+
<div class="jenkins-alert jenkins-alert-info jenkins-form-item">
4040
${%fine_warning}
4141
</div>
4242
<j:set var="instance" value="${it}" />

‎core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ THE SOFTWARE.
3636
</l:overflowButton>
3737
</l:app-bar>
3838

39-
<div class="alert alert-info">
39+
<div class="jenkins-alert jenkins-alert-info">
4040
Log messages at a level more verbose than INFO (i.e., CONFIG, FINE, FINER, FINEST) are never recorded in the Jenkins log. Use <a href=".">log recorders</a> to record these log messages.
4141
</div>
4242
<t:logRecords logRecords="${h.logRecords}"/>

‎core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-info">
27+
<div class="jenkins-alert jenkins-alert-info">
2828
<j:set var="ucData" value="${it.data}" />
2929
<j:set var="upJob" value="${app.updateCenter.hudsonJob}" />
3030
<j:choose>

‎core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<form method="post" action="${rootURL}/${it.url}/disable">
2929
<f:submit value="${%Dismiss}"/>
3030
</form>

‎core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:t="/lib/hudson">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
${%blurb(rootURL)}
2929
</div>
3030
</j:jelly>

‎core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.apache.commons.jelly.tags.fmt.FmtTagLibrary
88
SlowTriggerAdminMonitor tam = my
99

1010
dl {
11-
div(class: "alert alert-warning") {
11+
div(class: "jenkins-alert jenkins-alert-warning") {
1212
form(method: "post", name: "clear", action: rootURL + "/" + tam.url + "/clear") {
1313
input(name: "clear", type: "submit", value: _("Dismiss"), class: "submit-button primary")
1414
}

‎core/src/main/resources/hudson/util/AdministrativeError/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-danger">
27+
<div class="jenkins-alert jenkins-alert-danger">
2828
<j:out value="${it.message}"/>
2929
<a href="${rootURL}/${it.url}/">${%See the log for more details}</a>.
3030
</div>

‎core/src/main/resources/hudson/util/DoubleLaunchChecker/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<p>
2929
${%message(it.home)}
3030
</p>

‎core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-danger">
27+
<div class="jenkins-alert jenkins-alert-danger">
2828
${%blurb(rootURL+'/'+it.url)}
2929
</div>
3030
</j:jelly>

‎core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?jelly escape-by-default='true'?>
22
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
3-
<div class="alert alert-warning">
3+
<div class="jenkins-alert jenkins-alert-warning">
44
${%blurb(app.initLevel)}
55
${%Example: usage of} <code>@Initializer(after = InitMilestone.COMPLETED)</code> ${%in a plugin}
66
(<a href="https://www.jenkins.io/redirect/troubleshooting/initialization-not-completed" rel="noopener noreferrer" target="_blank">${%See documentation}</a>).

‎core/src/main/resources/jenkins/diagnostics/ControllerExecutorsAgents/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
2929
<f:submit name="yes" value="${%Manage}"/>
3030
<f:submit name="no" value="${%Dismiss}"/>

‎core/src/main/resources/jenkins/diagnostics/ControllerExecutorsNoAgents/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
2929
<f:submit name="agent" value="${%Set up agent}"/>
3030
<f:submit name="cloud" value="${%Set up cloud}"/>

‎core/src/main/resources/jenkins/diagnostics/RootUrlNotSetMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ THE SOFTWARE.
2323
-->
2424
<?jelly escape-by-default='true'?>
2525
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
26-
<div class="alert alert-warning">
26+
<div class="jenkins-alert jenkins-alert-warning">
2727
<l:isAdmin>
2828
<form method="post" action="${rootURL}/${it.url}/disable">
2929
<f:submit value="${%Dismiss}"/>

‎core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<div class="alert alert-warning">
27+
<div class="jenkins-alert jenkins-alert-warning">
2828
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
2929
<f:submit name="yes" value="${%Setup Security}"/>
3030
<f:submit name="no" value="${%Dismiss}"/>

‎core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<p>${%jenkins.install.findSecurityTokenMessage(it.initialAdminPasswordFile)}</p>
2020
<p>${%authenticate-security-token.copy.password}</p>
2121
<j:if test="${error}">
22-
<div class="alert alert-danger">
22+
<div class="jenkins-alert jenkins-alert-danger">
2323
<strong>${%authenticate-security-token.error}</strong> ${%authenticate-security-token.password.incorrect}
2424
</div>
2525
</j:if>

‎core/src/main/resources/jenkins/install/pluginSetupWizard.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins was restarted during installatio
6666
installWizard_installIncomplete_resumeInstallationButtonLabel=Resume
6767
installWizard_saveFirstUser=Save and Continue
6868
installWizard_skipFirstUser=Skip and continue as admin
69-
installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
69+
installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
7070
You have skipped the <strong>setup of an admin user</strong>. <br /><br />\
7171
To log in, use the username: "admin" and the administrator password you used to access the setup wizard.\
7272
</div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Getting Started
7676
installWizard_configureInstance_title=Instance Configuration
7777
installWizard_saveConfigureInstance=Save and Finish
7878
installWizard_skipConfigureInstance=Not now
79-
installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
79+
installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
8080
You have skipped the configuration of the Jenkins URL. <br/><br/>\
8181
To configure the Jenkins URL, go to "Manage Jenkins" page.\
8282
</div>
@@ -103,7 +103,7 @@ installWizard_pluginsInstalled_banner=Welcome to Jenkins {0}!
103103
installWizard_upgradeComplete_message=Congratulations! You have upgraded to Jenkins {0}.</p><p>To learn more about its great new features, visit <a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">the Jenkins website</a>!
104104
installWizard_upgradeSkipped_title=Upgrade
105105
installWizard_upgradeSkipped_banner=Features Not Installed
106-
installWizard_upgradeSkipped_message=<div class="alert alert-warning fade in">Suggested plugins will not be installed.</div> \
106+
installWizard_upgradeSkipped_message=<div class="jenkins-alert jenkins-alert-warning fade in">Suggested plugins will not be installed.</div> \
107107
<p style="padding: 0 4px">You can also install new features from the Plugin Manager, if you change your mind.</p> \
108108
<p style="padding: 0 4px">Learn how these new features can improve your Jenkins experience by \
109109
<a rel="noopener noreferrer" target="_blank" href="https://www.jenkins.io/2.0/">visiting the homepage</a>.</p>

‎core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ certains plugins n\'ont pas l\'air d\'avoir été installés.
4141
installWizard_installIncomplete_resumeInstallationButtonLabel=Reprendre
4242
installWizard_saveFirstUser=Sauver et continuer
4343
installWizard_skipFirstUser=Continuer en tant qu\'Administrateur
44-
installWizard_firstUserSkippedMessage=<div class="alert alert-warning fade in">\
44+
installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
4545
Vous avez passé la <strong>création d\'un utilisateur administrateur</strong>. <br /><br />\
4646
Pour vous connecter, utilisez le login : "admin" et le mot de passe administrateur que vous avez utilisé pour accéder au \
4747
wizard d\'installation.</div>
4848
installWizard_addFirstUser_title=Démarrage
4949

5050
# instance configuration page
5151
installWizard_configureInstance_title=Démarrage
52-
installWizard_configureInstanceSkippedMessage=<div class="alert alert-warning fade in">\
52+
installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
5353
Vous avez passé la <strong>configuration de l\'instance</strong>. <br /><br /> \
5454
Vous pouvez toujours vous rendre sur les pages de configuration pour remplir les informations qui pourraient manquer.\
5555
</div>

0 commit comments

Comments
 (0)