Skip to content
Permalink
Browse files

JENKINS-33535 - show Jenkins version on setup wizard

  • Loading branch information...
kzantow committed Apr 8, 2016
1 parent 265c2d9 commit f6822a2583a8399e0d5b512cb91de3518998492e
@@ -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%"> \
@@ -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 />
@@ -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>

@@ -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();
}
@@ -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;

0 comments on commit f6822a2

Please sign in to comment.
You can’t perform that action at this time.