JENKINS-34137 - better handling of the close button: not allowed while

plugins installing or in certain other places, close now directs to setup complete panel, with message about skipping admin user creation
jenkinsci · Apr 13, 2016 · d0f5c2b · d0f5c2b
1 parent b17e04c
commit d0f5c2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/war/src/main/js/pluginSetupWizardGui.js b/war/src/main/js/pluginSetupWizardGui.js
@@ -207,7 +207,7 @@ var createPluginSetupWizard = function(appendTarget) {
 				decorate($container);
 
 				var $modalHeader = $container.find('.modal-header');
-				if($modalHeader.length > 0) {
+				if($modalHeader.length > 0 && $modalHeader.is('.closeable')) {
 					$modalHeader.prepend(
 						'<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
 				}
@@ -815,7 +815,7 @@ var createPluginSetupWizard = function(appendTarget) {
 		'.plugin-select-recommended': function() { selectedPluginNames = pluginManager.recommendedPluginNames(); refreshPluginSelectionPanel(); },
 		'.plugin-show-selected': toggleSelectedSearch,
 		'.select-category': selectCategory,
-		'.close': closeInstaller,
+		'.close': skipFirstUser,
 		'.resume-installation': resumeInstallation,
 		'.install-done-restart': restartJenkins,
 		'.save-first-user:not([disabled])': saveFirstUser,

diff --git a/war/src/main/js/templates/pluginSelectionPanel.hbs b/war/src/main/js/templates/pluginSelectionPanel.hbs
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<div class="modal-header closeable">
 	<h4 class="modal-title">{{translations.installWizard_installCustom_title}}</h4>
 </div>
 <div class="modal-body plugin-selector">

diff --git a/war/src/main/js/templates/welcomePanel.hbs b/war/src/main/js/templates/welcomePanel.hbs
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<div class="modal-header closeable">
 	<h4 class="modal-title">{{translations.installWizard_welcomePanel_title}}</h4>
 </div>
 <div class="modal-body">