JENKINS-33535 - show Jenkins version on setup wizard

f6822a25 · kzantow · 265c2d96 · f6822a25 · f6822a25 · f6822a25
5 changed file
--- a/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
+++ b/core/src/main/resources/jenkins/install/pluginSetupWizard.properties
@@ -5,6 +5,7 @@ installWizard_welcomePanel_recommendedActionTitle=Install suggested plugins
 installWizard_welcomePanel_recommendedActionDetails=Install plugins the Jenkins community finds most useful.
 installWizard_welcomePanel_customizeActionTitle=Select plugins to install
 installWizard_welcomePanel_customizeActionDetails=Select and install plugins most suitable for your needs.
+installWizard_jenkinsVersionTitle=Jenkins 
 installWizard_offline_title=Offline
 installWizard_offline_message=This Jenkins instance appears to be offline. \
 <p style="font-size:18px; margin-top: 6%"> \

--- a/core/src/main/resources/lib/layout/html.jelly
+++ b/core/src/main/resources/lib/layout/html.jelly
@@ -166,7 +166,7 @@ ${h.initPageVariables(context)}
    </j:if>

  </head>
-  <body id="jenkins" class="yui-skin-sam jenkins-${h.version}" data-version="jenkins-${h.version}" data-model-type="${it.class.name}">
+  <body id="jenkins" class="yui-skin-sam jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
      <div id="main-panel" style="margin-left: 0;">
         <j:set var="mode" value="main-panel" />
         <d:invokeBody />

--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -165,7 +165,7 @@ ${h.initPageVariables(context)}
    <script src="${resURL}/jsbundles/page-init.js" type="text/javascript"/>

  </head>
-  <body id="jenkins" class="yui-skin-sam jenkins-${h.version} ${attrs.cssclass}" data-version="jenkins-${h.version}" data-model-type="${it.class.name}">
+  <body id="jenkins" class="yui-skin-sam jenkins-${h.version} ${attrs.cssclass}" data-version="${h.version}" data-model-type="${it.class.name}">
    <!-- for accessibility, skip the entire navigation bar and etc and go straight to the head of the content -->
    <a href="#skip2content" class="skiplink">Skip to content</a>


--- a/war/src/main/js/pluginSetupWizardGui.js
+++ b/war/src/main/js/pluginSetupWizardGui.js
@@ -212,6 +212,15 @@ var createPluginSetupWizard = function(appendTarget) {
 						'<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
 				}

+				// add Jenkins version
+				if(translations.installWizard_jenkinsVersionTitle) { // wait until translations available
+					var $modalFooter = $container.find('.modal-footer');
+					if($modalFooter.length == 0) {
+						$modalFooter = $('<div class="modal-footer"></div>').appendTo($container);
+					}
+					$modalFooter.prepend('<div class="jenkins-version">'+translations.installWizard_jenkinsVersionTitle+' '+$('body').attr('data-version')+'</div>');
+				}
+				
 				if(oncomplete) {
 					oncomplete();
 				}

--- a/war/src/main/less/pluginSetupWizard.less
+++ b/war/src/main/less/pluginSetupWizard.less
@@ -75,6 +75,12 @@
        box-sizing: border-box;
        padding: 4.2em 0 4.8em 0;
    }
+    
+    .jenkins-version {
+        float: left;
+        margin: .7em .5em;
+        opacity: 0.7; // matches the info text
+    }

    .container.error-container {
        padding: 4em 3em;