AMBARI-3343. Enable security wizard closing after hitting cancel on confirmation popup. (yusaku)

ambari-web/app/messages.js

@@ -826,8 +826,9 @@ Em.I18n.translations = {
   'admin.addSecurity.enable.onClose': 'You are in the process of enabling security on your cluster. ' +
     'Are you sure you want to quit? If you quit, ' +
     'you may have to re-run the security wizard from the beginning to enable security.',
-  'admin.addSecurity.enable.after.stage2.onClose': 'Services are being started with the Kerberos settings you specified.'+
-    'It is recommended that you wait until all the services are started to ensure that they are set up properly.',
+  'admin.addSecurity.enable.after.stage2.onClose': 'Services are being started with the Kerberos settings you specified. '+
+    'It is recommended that you wait until all the services are started to ensure that they are set up properly. ' +
+    'Are you sure you want to quit?',
   'admin.addSecurity.disable.onClose': 'You are in the process of disabling security on your cluster. ' +
     'Are you sure you want to quit?',
   'admin.removeSecurity.header': 'Disable Security',

ambari-web/app/routes/add_security.js

@@ -59,11 +59,11 @@ module.exports = Em.Route.extend({
                       }, Em.I18n.t('admin.addSecurity.enable.onClose'));
                     }
                   } else {
-                    App.showConfirmationPopup(function () {},
-                      Em.I18n.t('admin.addSecurity.enable.after.stage2.onClose'),
-                      function () {
+                    App.showConfirmationPopup(function () {
                         self.proceedOnClose();
-                      });
+                      },
+                      Em.I18n.t('admin.addSecurity.enable.after.stage2.onClose')
+                    );
                   }
                   return;
                 }