[JENKINS-43786] Overhaul of Manage Jenkins page

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

@@ -24,12 +24,12 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="error">
-    ${%PluginCycles}
-    <ul>
-	    <j:forEach var="p" items="${it.pluginsWithCycle}">
-	        <li><j:out value="${p.longName} v${p.version}"/></li>
-	    </j:forEach>
-    </ul>
+  <div class="alert alert-danger">
+    <dl>
+        <dt>${%PluginCycles}</dt>
+        <j:forEach var="p" items="${it.pluginsWithCycle}">
+          <dd><j:out value="${p.longName} v${p.version}"/></dd>
+        </j:forEach>
+    </dl>
   </div>
 </j:jelly>

core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.properties

@@ -21,4 +21,4 @@
 # THE SOFTWARE.
 
 
-PluginCycles=The following plugins are deactivated because of cyclic dependencies, most likely you can resolve the issue by updating these to a newer version.
+PluginCycles=The following plugins are deactivated because of cyclic dependencies, most likely you can resolve the issue by updating these to a newer version

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

@@ -24,12 +24,12 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="error">
-    ${%RequiredPluginUpdates}
-    <ul>
-	    <j:forEach var="p" items="${it.pluginsToBeUpdated}">
-	        <li><j:out value="${p.pluginName}"/> — <j:out value="${p.message}"/></li>
-	    </j:forEach>
-    </ul>
+  <div class="alert alert-danger">
+    <dl>
+        <dt>${%RequiredPluginUpdates}</dt>
+        <j:forEach var="p" items="${it.pluginsToBeUpdated}">
+        <dd><j:out value="${p.pluginName}"/> — <j:out value="${p.message}"/></dd>
+      </j:forEach>
+    </dl>
   </div>
 </j:jelly>

core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.properties

@@ -21,4 +21,4 @@
 # THE SOFTWARE.
 
 
-RequiredPluginUpdates=The following plugins require an update.
+RequiredPluginUpdates=The following plugins require an update

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

@@ -1,22 +1,17 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <div class="error">
-        <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-            <div style="float:right">
-                <f:submit name="correct" value="${%Correct}"/>
-            </div>
-        </form>
-        ${%Dependency errors}:
-        <ul>
-            <j:forEach items="${it.plugins}" var="plugin">
-                <li>${plugin.longName} v${plugin.version}
-                    <ul>
-                        <j:forEach items="${plugin.dependencyErrors}" var="d">
-                            <li>${d}</li>
-                        </j:forEach>
-                    </ul>
-                </li>
-            </j:forEach>
-        </ul>
-    </div>
+  <div class="alert alert-danger" role="alert">
+    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
+      <f:submit name="correct" value="${%Correct}"/>
+    </form>
+    ${%Dependency errors}
+    <j:forEach items="${it.plugins}" var="plugin">
+    <dl>
+      <dt>${plugin.longName} v${plugin.version}</dt>
+      <j:forEach items="${plugin.dependencyErrors}" var="d">
+        <dd>${d}</dd>
+      </j:forEach>
+    </dl>
+    </j:forEach>
+  </div>
 </j:jelly>

core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.properties

@@ -19,4 +19,4 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-Dependency\ errors=There are dependency errors loading some plugins
+Dependency\ errors=There are dependency errors loading some plugins.

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

@@ -24,13 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
-    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <div style="float:right">
-        <f:submit name="yes" value="${%Tell me more}"/>
-        <f:submit name="no" value="${%Dismiss}"/>
-      </div>
-      ${%blurb(app.rootDir)}
-    </form>
-  </div>
-</j:jelly>
+<div class="alert alert-warning">
+  <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
+    <f:submit name="yes" value="${%Tell me more}"/>
+    <f:submit name="no" value="${%Dismiss}"/>
+  </form>
+  ${%blurb(app.rootDir)}
+</div>
+</j:jelly>

core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.properties

@@ -1 +1 @@
-blurb=Your Jenkins data directory "{0}" (AKA <tt>JENKINS_HOME</tt>) is almost full. You should act on it before it gets completely full.
+blurb=Your Jenkins data directory <code>{0}</code> (AKA <code>JENKINS_HOME</code>) is almost full. You should act on it before it gets completely full.

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

@@ -24,14 +24,12 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="error">
-    ${%blurb}
-    <ul>
-      <j:forEach var="d" items="${it.problems}">
-        <li>
-          ${%problem(d, d.displayName, app.pluginManager.whichPlugin(d.getClass()))}
-        </li>
-      </j:forEach>
-    </ul>
-  </div>
+<div class="alert alert-danger">
+  <dl>
+    <dt>${%blurb}</dt>
+    <j:forEach var="d" items="${it.problems}">
+      <dd>${%problem(d, d.displayName, app.pluginManager.whichPlugin(d.getClass()))}</dd>
+    </j:forEach>
+  </dl>
+</div>
 </j:jelly>

core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.properties

@@ -1,3 +1,3 @@
 blurb=The following extensions have no ID value and therefore likely cause a problem. Please upgrade these plugins if they are not the latest, \
-  and if they are the latest, please file a bug so that we can fix them.
+  and if they are the latest, please file a bug so that we can fix them
 problem=Descriptor {0} from plugin {2} with display name {1}

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

@@ -24,13 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
+  <div class="alert alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      ${%You have data stored in an older format and/or unreadable data.}
-      <st:nbsp/>
-      <st:nbsp/>
       <f:submit name="yes" value="${%Manage}"/>
       <f:submit name="no" value="${%Dismiss}"/>
     </form>
+    ${%You have data stored in an older format and/or unreadable data.}
   </div>
 </j:jelly>

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

@@ -38,11 +38,11 @@ THE SOFTWARE.
       }
     );
   </script>
-  <div class="error" id="redirect-error" style="display:none">
+  <div id="redirect-error" class="alert alert-danger" style="display:none">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      ${%blurb}
       <f:submit name="yes" value="${%More Info}"/>
       <f:submit name="no" value="${%Dismiss}"/>
     </form>
+    ${%blurb}
   </div>
 </j:jelly>

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

@@ -24,13 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
+  <div class="alert alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <div style="float:right">
-        <f:submit name="yes" value="${%Create a view now}"/>
-        <f:submit name="no" value="${%Dismiss}"/>
-      </div>
-      ${%blurb}
+      <f:submit name="yes" value="${%Create a view now}"/>
+      <f:submit name="no" value="${%Dismiss}"/>
     </form>
+    ${%blurb}
   </div>
 </j:jelly>

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

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
+  <div class="alert alert-info">
     <j:set var="ucData" value="${it.data}" />
     <j:set var="upJob" value="${app.updateCenter.hudsonJob}" />
     <j:choose>
@@ -40,23 +40,23 @@ THE SOFTWARE.
         </j:choose>
       </j:when>
       <j:when test="${upJob!=null and upJob.error != null}">
+        ${%UpgradeFailed(ucData.core.version,upJob.errorMessage,rootURL+'/updateCenter/')}
+        <j:if test="${ucData.canUpgrade()}">
         <form method="post" action="${rootURL}/updateCenter/upgrade">
-          ${%UpgradeFailed(ucData.core.version,upJob.errorMessage,rootURL+'/updateCenter/')}
-          <j:if test="${ucData.canUpgrade()}">
-            <f:submit value="${%Retry}"/>
-          </j:if>
+          <f:submit value="${%Retry}"/>
         </form>
+        </j:if>
       </j:when>
       <j:when test="${upJob!=null}">
         ${%UpgradeProgress(ucData.core.version,rootURL+'/updateCenter/')}
       </j:when>
       <j:otherwise>
-        <form method="post" action="${rootURL}/updateCenter/upgrade">
         ${%NewVersionAvailable(ucData.core.version,ucData.core.url)}
-          <j:if test="${ucData.canUpgrade()}">
-            <f:submit value="${%Or Upgrade Automatically}"/>
-          </j:if>
+        <j:if test="${ucData.canUpgrade()}">
+        <form method="post" action="${rootURL}/updateCenter/upgrade">
+          <f:submit value="${%Or Upgrade Automatically}"/>
         </form>
+        </j:if>
       </j:otherwise>
     </j:choose>
   </div>

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

@@ -24,10 +24,10 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
+  <div class="alert alert-warning">
     <form method="post" action="${rootURL}/${it.url}/disable">
-      ${%blurb(rootURL)}
       <f:submit value="${%Dismiss}"/>
     </form>
+    ${%blurb(rootURL)}
   </div>
-</j:jelly>
+</j:jelly>

core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly

@@ -24,10 +24,10 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="info">
+  <div class="alert alert-info">
     <form method="post" action="${rootURL}/${it.url}/disable">
-      ${%Data was successfully migrated to ZFS.}
       <f:submit value="${%OK}"/>
     </form>
+    ${%Data was successfully migrated to ZFS.}
   </div>
 </j:jelly>

core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="error">
+  <div class="alert alert-danger">
     ${%ZFS migration failed.}
     <a href="${rootURL}/${it.url}/">${%See the log for more details}</a>.
   </div>

core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly

@@ -24,13 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
+  <div class="alert alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act">
-      <p>${%blurb}</p>
-      <div style="margin-left:2em">
-        <f:submit name="y" value="${%Yes, please}"/>
-        <f:submit name="n" value="${%No, thank you}"/>
-      </div>
+      <f:submit name="y" value="${%Yes, please}"/>
+      <f:submit name="n" value="${%No, thank you}"/>
     </form>
+    ${%blurb}
   </div>
 </j:jelly>

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

@@ -23,6 +23,8 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<div class='warning'>
-  ${%blurb(rootURL)}
-</div>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:t="/lib/hudson">
+  <div class="alert alert-warning">
+    ${%blurb(rootURL)}
+  </div>
+</j:jelly>

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

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="error">
+  <div class="alert alert-danger">
     <j:out value="${it.message}"/>
     <a href="${rootURL}/${it.url}/">${%See the log for more details}</a>.
   </div>

core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message.jelly

@@ -25,13 +25,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-    <div class="warning">
-        <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-            <div style="float:right">
-                <f:submit name="yes" value="${%Disable CLI over Remoting}"/>
-                <f:submit name="no" value="${%Dismiss}"/>
-            </div>
-            ${%blurb}
-        </form>
-    </div>
+  <div class="alert alert-warning">
+    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
+      <f:submit name="yes" value="${%Disable CLI over Remoting}"/>
+      <f:submit name="no" value="${%Dismiss}"/>
+    </form>
+    ${%blurb}
+  </div>
 </j:jelly>

core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message.properties

@@ -23,4 +23,4 @@
 blurb=\
     Allowing Jenkins CLI to work in <code>-remoting</code> mode is considered dangerous and usually unnecessary. \
     You are advised to disable this mode. \
-    Please refer to the <a href="https://jenkins.io/doc/book/managing/cli/">CLI documentation</a> for details.
+    Please refer to the <a href="https://jenkins.io/doc/book/managing/cli/" target="_blank">CLI documentation</a> for details.

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

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="error">
+  <div class="alert alert-danger">
     ${%blurb(rootURL+'/'+it.url)}
   </div>
 </j:jelly>

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

@@ -1,11 +1,10 @@
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
-      <b>${%Warning!}</b>
+  <div class="alert alert-warning">
       ${%blurb(app.initLevel)}
       ${%Example: usage of} <code>@Initializer(after = InitMilestone.COMPLETED)</code> ${%in a plugin}
-      (<a href="https://jenkins.io/redirect/troubleshooting/initialization-not-completed">${%See documentation}</a>).
-      ${%Please} <a href="https://jenkins.io/redirect/report-an-issue">${%report a bug}</a> ${%in the Jenkins bugtracker}.
+      (<a href="https://jenkins.io/redirect/troubleshooting/initialization-not-completed" target="_blank">${%See documentation}</a>).
+      ${%Please} <a href="https://jenkins.io/redirect/report-an-issue" target="_blank">${%report a bug}</a> ${%in the Jenkins bugtracker}.
       <!--TODO: Nice2have: cause diagnostics-->
       <!-- FIXME TODO XXX i18n does not take into account different sentence structure, rewrite with arguments -->
   </div>

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

@@ -24,13 +24,11 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <div class="warning">
+  <div class="alert alert-warning">
     <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
-      <div style="float:right">
-        <f:submit name="yes" value="${%Setup Security}"/>
-        <f:submit name="no" value="${%Dismiss}"/>
-      </div>
-      ${%blurb}
+      <f:submit name="yes" value="${%Setup Security}"/>
+      <f:submit name="no" value="${%Dismiss}"/>
     </form>
+    ${%blurb}
   </div>
 </j:jelly>