提交 d0f5c2b0 编写于 作者: K kzantow

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
上级 b17e04c9
......@@ -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,
......
<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">
......
<div class="modal-header">
<div class="modal-header closeable">
<h4 class="modal-title">{{translations.installWizard_welcomePanel_title}}</h4>
</div>
<div class="modal-body">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册