You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/05 23:04:01 UTC
[05/50] [abbrv] ambari git commit: revert "AMBARI-22712. Update
install Wizard layout" (akovalenko)
revert "AMBARI-22712. Update install Wizard layout" (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1c602b01
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1c602b01
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1c602b01
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 1c602b011b6230efc5240fac904f1f3eb54a296f
Parents: 69bc10d
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Jan 2 15:15:37 2018 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Jan 2 15:15:37 2018 +0200
----------------------------------------------------------------------
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 1 -
.../HIVE/2.1.0.3.0/configuration/hive-env.xml | 1 -
.../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 1 -
.../OOZIE/4.2.0.3.0/configuration/oozie-env.xml | 1 -
.../services/HIVE/configuration/hive-env.xml | 1 -
.../services/OOZIE/configuration/oozie-env.xml | 1 -
ambari-web/app/controllers/installer.js | 2 +-
.../hawq/addStandby/step3_controller.js | 3 +-
.../main/admin/kerberos/wizard_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller.js | 2 +-
ambari-web/app/controllers/main/host/details.js | 2 +-
ambari-web/app/controllers/main/service/item.js | 4 +-
.../app/controllers/wizard/step3_controller.js | 2 +-
.../app/controllers/wizard/step6_controller.js | 12 ++++++
ambari-web/app/messages.js | 5 ++-
.../configs/component_actions_by_configs.js | 4 +-
ambari-web/app/styles/application.less | 2 +
ambari-web/app/styles/hosts.less | 5 ---
.../app/styles/theme/bootstrap-ambari.css | 7 ++--
ambari-web/app/styles/wizard.less | 20 ---------
.../common/assign_master_components.hbs | 24 ++++++-----
ambari-web/app/templates/wizard/step3.hbs | 12 +++---
ambari-web/app/templates/wizard/step6.hbs | 30 +++-----------
.../wizard/step6/step6_issues_popup.hbs | 43 ++++++++++++++++++++
.../common/assign_master_components_view.js | 4 +-
.../configs/widgets/combo_config_widget_view.js | 8 ----
ambari-web/app/views/common/controls_view.js | 2 +-
.../common/form/manage_credentials_form_view.js | 3 +-
.../common/modal_popups/confirmation_popup.js | 11 ++---
.../kerberos/kerberos_wizard_controler_test.js | 8 ++--
30 files changed, 112 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 75b0196..730b0e8 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -93,7 +93,6 @@
<overridable>false</overridable>
<type>value-list</type>
<entries>
- <entries_editable>false</entries_editable>
<entry>
<value>New MySQL Database</value>
<label>New MySQL</label>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
index 4703b6b..759a7bb 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-env.xml
@@ -321,7 +321,6 @@
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
- <entries_editable>false</entries_editable>
<entries>
<entry>
<value>New MySQL Database</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index f0c1e57..4eafe1c 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -56,7 +56,6 @@
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
- <entries_editable>false</entries_editable>
<entries>
<entry>
<value>New Derby Database</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/configuration/oozie-env.xml
index d05bdb4..225764e 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/configuration/oozie-env.xml
@@ -237,7 +237,6 @@ export HADOOP_OPTS="-Dhdp.version=${HDP_VERSION} ${HADOOP_OPTS}"
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
- <entries_editable>false</entries_editable>
<entries>
<entry>
<value>New Derby Database</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
index 9391d0f..01fd6ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
@@ -90,7 +90,6 @@ export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_dir}}"
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
- <entries_editable>false</entries_editable>
<entries>
<entry>
<value>New MySQL Database</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
index e742234..c4bc4c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
@@ -115,7 +115,6 @@ export HADOOP_OPTS="-Dhdp.version=${HDP_VERSION} ${HADOOP_OPTS}"
<value-attributes>
<overridable>false</overridable>
<type>value-list</type>
- <entries_editable>false</entries_editable>
<entries>
<entry>
<value>New Derby Database</value>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 4aa57c3..4ecdc9b 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -1120,7 +1120,7 @@ App.InstallerController = App.WizardController.extend(App.Persist, {
}
var versionsString = stringUtils.getFormattedStringFromArray(versionsList, t('or'));
var popupBody = t('popup.jdkValidation.body').format(selectedStack.get('stackName') + ' ' + selectedStack.get('stackVersion'), versionsString, currentJDKVersion);
- App.showConfirmationPopup(sCallback, popupBody, fCallback, t('popup.jdkValidation.header'), t('common.proceedAnyway'), 'danger');
+ App.showConfirmationPopup(sCallback, popupBody, fCallback, t('popup.jdkValidation.header'), t('common.proceedAnyway'), true);
return;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
index bc454c2..81ece37 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
@@ -150,7 +150,8 @@ App.AddHawqStandbyWizardStep3Controller = Em.Controller.extend({
Em.I18n.t('admin.addHawqStandby.wizard.step3.confirm.dataDir.body').format(dataDir, hawqStandby),
null,
Em.I18n.t('admin.addHawqStandby.wizard.step3.confirm.dataDir.title'),
- "Confirm"
+ "Confirm",
+ false
);
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 41a8006..64b2065 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -345,7 +345,7 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent,
var primaryText = Em.I18n.t('common.exitAnyway');
var msg = isCritical ? Em.I18n.t('admin.kerberos.wizard.exit.critical.msg')
: Em.I18n.t('admin.kerberos.wizard.exit.warning.msg');
- return App.showConfirmationPopup(primary, msg, null, null, primaryText, isCritical ? 'danger' : 'success');
+ return App.showConfirmationPopup(primary, msg, null, null, primaryText, isCritical);
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 051af05..35041bf 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1488,7 +1488,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
},
Em.I18n.t('admin.stackUpgrade.upgrade.retry.confirm.body').format(version.get('displayName')),
null,
- this.getUpgradeDowngradeHeader(version.get('upgradeTypeDislayName'), version.get('displayName'))
+ this.getUpgradeDowngradeHeader(version.get('upgradeTypeDislayName'), version.get('displayName'), false)
);
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index 20a72bf..25a27b1 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -407,7 +407,7 @@ App.MainHostDetailsController = Em.Controller.extend(App.SupportClientConfigsDow
// not available
return App.showConfirmationPopup(
callback, Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointNA'), null,
- Em.I18n.t('common.warning'), Em.I18n.t('common.proceedAnyway'), 'danger'
+ Em.I18n.t('common.warning'), Em.I18n.t('common.proceedAnyway'), true
);
} else {
// still young
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index f8a6e62..4f53391 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -342,7 +342,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
// not available
return App.showConfirmationPopup(
callback, Em.I18n.t('services.service.stop.HDFS.warningMsg.checkPointNA'), null,
- Em.I18n.t('common.warning'), Em.I18n.t('common.proceedAnyway'), 'danger'
+ Em.I18n.t('common.warning'), Em.I18n.t('common.proceedAnyway'), true
);
} else {
// still young
@@ -1249,7 +1249,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
null,
popupHeader,
Em.I18n.t('common.delete'),
- 'danger'
+ true
);
} else {
this.showLastWarning(serviceName, interDependentServices, dependentServicesToDeleteFmt);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index 55f4323..29393e3 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -843,7 +843,7 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, App.Check
function () {
self._submitProceed();
},
- Em.I18n.t('installer.step3.hostWarningsPopup.hostHasWarnings'), null, null, null, 'warning');
+ Em.I18n.t('installer.step3.hostWarningsPopup.hostHasWarnings'));
}
this._submitProceed();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index 5e7358d..68ec3ed 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -161,6 +161,18 @@ App.WizardStep6Controller = Em.Controller.extend(App.HostComponentValidationMixi
*/
anyWarnings: Em.computed.or('anyGeneralWarnings', 'anyHostWarnings'),
+ openSlavesAndClientsIssues: function () {
+ App.ModalPopup.show({
+ 'data-qa': 'slave-clients-issues-modal',
+ header: Em.I18n.t('installer.step6.validationSlavesAndClients.popup.header'),
+ bodyClass: Em.View.extend({
+ controller: this,
+ templateName: require('templates/wizard/step6/step6_issues_popup')
+ }),
+ secondary: null
+ });
+ },
+
/**
* Verify condition that at least one checkbox of each component was checked
* @method clearError
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6da0368..f570608 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -844,7 +844,7 @@ Em.I18n.translations = {
'installer.step3.hostWarningsPopup.moreHosts':'{0} more hosts...<br>Click on link to view all hosts.',
'installer.step3.hostWarningsPopup.allHosts':'List of hosts',
'installer.step3.hostWarningsPopup.rerunChecks':'Rerun Checks',
- 'installer.step3.hostWarningsPopup.hostHasWarnings':'Host checks failed on some of your hosts. It is highly recommended that you fix these problems first before proceeding to prevent potentially major problems with cluster installation. Are you sure you want to ignore these warnings and proceed?',
+ 'installer.step3.hostWarningsPopup.hostHasWarnings':'Warning: Host checks failed on some of your hosts. It is highly recommended that you fix these problems first before proceeding to prevent potentially major problems with cluster installation. Are you sure you want to ignore these warnings and proceed?',
'installer.step3.warningsWindow.allHosts':'Warnings across all hosts',
'installer.step3.warningsWindow.warningsOn':'Warnings on ',
'installer.step3.warningsWindow.directoriesAndFiles':'DIRECTORIES AND FILES',
@@ -920,7 +920,10 @@ Em.I18n.translations = {
'installer.step6.wizardStep6Host.title':'master components hosted on {0}',
'installer.step6.addHostWizard.body':'Assign HBase master and ZooKeeper server.',
'installer.step6.error.mustSelectOneForSlaveHost': 'You must assign at least one slave/client component to each host with no master component',
+ 'installer.step6.validationSlavesAndClients.hasIssues': 'Your slave and client assignment has issues. ',
'installer.step6.validationSlavesAndClients.click': 'Click',
+ 'installer.step6.validationSlavesAndClients.forDetails': ' for details.',
+ 'installer.step6.validationSlavesAndClients.popup.header': 'Assign Slaves and Clients Issues',
'installer.step6.validationSlavesAndClients.popup.body': 'Assignment of slave and client components has the following issues',
'installer.step6.validationIssuesAttention.header': 'Validation Issues',
'installer.step6.validationIssuesAttention': 'Slave and Client component assignments have issues that need attention.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 4656c2e..b687752 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -86,7 +86,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
}
App.showConfirmationPopup(function () {
self.popupPrimaryButtonCallback(config_action);
- }, body, null, Em.I18n.t('popup.confirmation.commonHeader'), config_action.get('popupProperties').primaryButton.label, 'success', 'refresh_yarn_queues')
+ }, body, null, Em.I18n.t('popup.confirmation.commonHeader'), config_action.get('popupProperties').primaryButton.label, false, 'refresh_yarn_queues')
}
}
}
@@ -99,7 +99,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
var self = this;
App.showConfirmationPopup(function () {
self.hsiRestartPopupPrimaryButtonCallback(components);
- }, Em.I18n.t('popup.confirmation.hsiRestart.body'), null, Em.I18n.t('popup.confirmation.commonHeader'), Em.I18n.t('popup.confirmation.hsiRestart.buttonText'), 'success', 'restart_hsi')
+ }, Em.I18n.t('popup.confirmation.hsiRestart.body'), null, Em.I18n.t('popup.confirmation.commonHeader'), Em.I18n.t('popup.confirmation.hsiRestart.buttonText'), false, 'restart_hsi')
},
hsiRestartPopupPrimaryButtonCallback: function (components) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 8bbd4cc..670ae7d 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2474,6 +2474,8 @@ a.abort-icon:hover {
.step-marker {
.step-index {
display: block;
+ margin-top: -1px;
+ margin-left: 0.3px;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/styles/hosts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/hosts.less b/ambari-web/app/styles/hosts.less
index e3677f8..9f0da8b 100644
--- a/ambari-web/app/styles/hosts.less
+++ b/ambari-web/app/styles/hosts.less
@@ -298,11 +298,6 @@
}
}
margin-top: 10px;
- .panel-heading {
- i {
- line-height: 19px;
- }
- }
}
}
.glyphicon-warning-sign {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/styles/theme/bootstrap-ambari.css
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 2bd3292..e85bb32 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -599,8 +599,8 @@ h2.table-title {
top: 9px;
line-height: 16px;
text-align: center;
- width: 23px;
- height: 23px;
+ width: 20px;
+ height: 20px;
border: 2px solid #1EB475;
border-radius: 50%;
font-size: 12px;
@@ -617,7 +617,6 @@ h2.table-title {
font-size: 14px;
color: #999;
margin-left: 30px;
- margin-bottom: 5px;
}
.wizard .wizard-body .wizard-nav .nav li .step-index {
line-height: 18px;
@@ -655,7 +654,7 @@ h2.table-title {
background-color: #1EB475;
content: "";
top: 25px;
- left: 31px;
+ left: 29px;
}
.wizard .wizard-body .wizard-nav .nav li.completed:last-child:after {
content: none;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 4e680ca..7d425d9 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -60,9 +60,6 @@
#get-started {
.cluster-name-input {
padding: 4px 0px;
- input[placeholder] {
- text-transform: uppercase;
- }
}
}
@@ -442,14 +439,9 @@
height: 100px;
color: #ccc;
}
- .hosts-dropdown {
- padding-left: 10px;
- }
.dropdown {
button {
width: 100%;
- text-align: left;
- padding: 10px;
.selected-item {
width: 95%;
margin-right: 5px;
@@ -459,18 +451,6 @@
}
}
}
- .assign-masters-controls {
- padding-left: 30px;
- div {
- display: inline-block;
- width: 22px;
- div {
- display: inline-block;
- width: 100%;
- }
- }
-
- }
}
label.host-name {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/templates/common/assign_master_components.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/assign_master_components.hbs b/ambari-web/app/templates/common/assign_master_components.hbs
index 7095742..d5dec3a 100644
--- a/ambari-web/app/templates/common/assign_master_components.hbs
+++ b/ambari-web/app/templates/common/assign_master_components.hbs
@@ -74,7 +74,7 @@
</label>
</div>
</div>
- <div class="col-md-6 hosts-dropdown">
+ <div class="col-md-6">
{{#if isServiceCoHost}}
<div class="hostName" {{QAAttr "service-co-host"}}>
{{selectedHost}}<i class="glyphicon glyphicon-asterisks">✵</i>
@@ -106,14 +106,16 @@
</div>
{{/if}}
</div>
- <div class="col-md-2 pts assign-masters-controls">
+ <div class="col-md-1 pts">
{{#if showAddControl}}
- <div>
+ <div class="pull-right">
{{view App.AddControlView componentNameBinding="component_name"}}
</div>
{{/if}}
+ </div>
+ <div class="col-md-1 pts">
{{#if showRemoveControl}}
- <div>
+ <div class="pull-left">
{{view App.RemoveControlView componentNameBinding="component_name" serviceComponentIdBinding="serviceComponentId"}}
</div>
{{/if}}
@@ -127,12 +129,14 @@
<div class="host-assignments col-md-4">
{{#each masterHostMapping}}
- <div class="well">
- <div>
- <div class="hostString"><span>{{hostInfo}}</span></div>
- {{#each masterServicesToDisplay}}
- <span {{QAAttr "component-on-host"}} {{bindAttr class="isInstalled:assigned-service:new-service :service-component :label"}}>{{display_name}}</span>
- {{/each}}
+ <div class="well side-menu-well">
+ <div class="row">
+ <div class="col-md-10 col-md-offset-1">
+ <div class="hostString"><span>{{hostInfo}}</span></div>
+ {{#each masterServicesToDisplay}}
+ <span {{QAAttr "component-on-host"}} {{bindAttr class="isInstalled:assigned-service:new-service :service-component :label"}}>{{display_name}}</span>
+ {{/each}}
+ </div>
</div>
</div>
{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/templates/wizard/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3.hbs b/ambari-web/app/templates/wizard/step3.hbs
index ff436a8..e00012c 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -62,9 +62,6 @@
<table id="confirm-hosts-table" class="table table-hover" {{QAAttr "confirm-hosts-table"}}>
<thead>
<tr>
- <th {{QAAttr "confirm-hosts-table-heading-cell"}}>
- {{view App.CheckboxView checkedBinding="view.pageChecked"}}
- </th>
<th class="col-md-5" {{QAAttr "confirm-hosts-table-heading-cell"}}>{{t common.host}}</th>
<!-- retrieved from local storage initially -->
<th class="col-md-2" {{QAAttr "confirm-hosts-table-heading-cell"}}>{{t common.progress}}</th>
@@ -73,15 +70,15 @@
<th class="col-md-2" {{QAAttr "confirm-hosts-table-heading-cell"}}>{{t common.action}}</th>
<!-- trash icon -->
<!-- retry icon -->
+ <th {{QAAttr "confirm-hosts-table-heading-cell"}}>
+ {{view App.CheckboxView checkedBinding="view.pageChecked"}}
+ </th>
</tr>
</thead>
<tbody {{QAAttr "confirm-hosts-table-body"}}>
{{#if view.pageContent}}
{{#each host in view.pageContent}}
{{#view App.WizardHostView categoryBinding="controller.category" hostInfoBinding="host" data-qa="confirm-hosts-table-body-row"}}
- <td class="step3-table-checkbox" {{QAAttr "confirm-hosts-table-body-cell"}}>
- {{view App.CheckboxView checkedBinding="host.isChecked" labelIdentifier="select-host-checkbox"}}
- </td>
<td class="host" {{QAAttr "confirm-hosts-table-body-cell"}}>
<span title="{{unbound host.name}}" class="trim_hostname" {{QAAttr "confirm-hosts-table-host-name"}}>{{host.name}}</span>
</td>
@@ -103,6 +100,9 @@
<i class="glyphicon glyphicon-trash" {{translateAttr title="common.remove"}}></i>
</a>
</td>
+ <td class="step3-table-checkbox" {{QAAttr "confirm-hosts-table-body-cell"}}>
+ {{view App.CheckboxView checkedBinding="host.isChecked" labelIdentifier="select-host-checkbox"}}
+ </td>
{{/view}}
{{/each}}
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/templates/wizard/step6.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step6.hbs b/ambari-web/app/templates/wizard/step6.hbs
index ac538b6..6128b88 100644
--- a/ambari-web/app/templates/wizard/step6.hbs
+++ b/ambari-web/app/templates/wizard/step6.hbs
@@ -22,31 +22,11 @@
<div class="panel panel-default">
<div class="panel-body">
- {{#if anyErrors}}
- <p>{{t installer.step6.validationSlavesAndClients.popup.body}}</p>
- <div class="limited-height-2">
- {{#if anyGeneralErrors}}
- <div class="alert alert-danger">
- <ul>
- {{#if errorMessage}}
- <li>{{errorMessage}}</li>
- {{/if}}
- {{#each msg in controller.generalErrorMessages}}
- <li>{{msg}}</li>
- {{/each}}
- </ul>
- </div>
- {{/if}}
-
- {{#if anyGeneralWarnings}}
- <div class="alert alert-warning">
- <ul>
- {{#each msg in controller.generalWarningMessages}}
- <li>{{msg}}</li>
- {{/each}}
- </ul>
- </div>
- {{/if}}
+ {{#if anyGeneralIssues}}
+ <div class="alert alert-danger" {{QAAttr "error-message"}}>
+ {{t installer.step6.validationSlavesAndClients.hasIssues}}
+ <a href="javascript:void(null);" {{action openSlavesAndClientsIssues target="controller"}}>{{t installer.step6.validationSlavesAndClients.click}}</a>
+ {{t installer.step6.validationSlavesAndClients.forDetails}}
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/templates/wizard/step6/step6_issues_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step6/step6_issues_popup.hbs b/ambari-web/app/templates/wizard/step6/step6_issues_popup.hbs
new file mode 100644
index 0000000..c2201d3
--- /dev/null
+++ b/ambari-web/app/templates/wizard/step6/step6_issues_popup.hbs
@@ -0,0 +1,43 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
+
+<p>{{t installer.step6.validationSlavesAndClients.popup.body}}</p>
+<div class="limited-height-2">
+ {{#if anyGeneralErrors}}
+ <div class="alert alert-danger">
+ <ul>
+ {{#if errorMessage}}
+ <li>{{errorMessage}}</li>
+ {{/if}}
+ {{#each msg in controller.generalErrorMessages}}
+ <li>{{msg}}</li>
+ {{/each}}
+ </ul>
+ </div>
+ {{/if}}
+
+ {{#if anyGeneralWarnings}}
+ <div class="alert alert-warning">
+ <ul>
+ {{#each msg in controller.generalWarningMessages}}
+ <li>{{msg}}</li>
+ {{/each}}
+ </ul>
+ </div>
+ {{/if}}
+</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/views/common/assign_master_components_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/assign_master_components_view.js b/ambari-web/app/views/common/assign_master_components_view.js
index 0217aae..001667a 100644
--- a/ambari-web/app/views/common/assign_master_components_view.js
+++ b/ambari-web/app/views/common/assign_master_components_view.js
@@ -172,7 +172,7 @@ App.AddControlView = Em.View.extend({
*/
componentName: null,
- tagName: "div",
+ tagName: "span",
classNames: ["label", 'extra-component'],
@@ -213,7 +213,7 @@ App.RemoveControlView = Em.View.extend({
*/
componentName: null,
- tagName: "div",
+ tagName: "span",
'data-qa': 'remove-master',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
index b8f957e..5efc4f7 100644
--- a/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/combo_config_widget_view.js
@@ -43,19 +43,11 @@ App.ComboConfigWidgetView = App.ConfigWidgetView.extend({
this._super();
this.toggleWidgetState();
this.initPopover();
- this.disableSwitchToTextBox();
this.addObserver('config.stackConfigProperty.valueAttributes.entries.[]', this, this.updateValuesList);
this.addObserver('controller.forceUpdateBoundaries', this, this.updateValuesList);
this.addObserver('config.value', this, this.isValueCompatibleWithWidget);
},
- disableSwitchToTextBox: function () {
- var valueAttributes = this.get('config.valueAttributes');
- if (valueAttributes && valueAttributes.hasOwnProperty('entriesEditable') && !valueAttributes.entriesEditable) {
- this.set('supportSwitchToTextBox', false);
- }
- },
-
/**
* Update options list by recommendations
* @method updateValuesList
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index 4d3089a..747d96c 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -41,7 +41,7 @@ App.ServiceConfigPopoverSupport = Ember.Mixin.create({
serviceConfig: null,
attributeBindings:['readOnly'],
isPopoverEnabled: true,
- popoverPlacement: 'auto right',
+ popoverPlacement: 'right',
didInsertElement: function () {
App.tooltip(this.$('[data-toggle=tooltip]'), {placement: 'top'});
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/views/common/form/manage_credentials_form_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/form/manage_credentials_form_view.js b/ambari-web/app/views/common/form/manage_credentials_form_view.js
index b869446..7e46431 100644
--- a/ambari-web/app/views/common/form/manage_credentials_form_view.js
+++ b/ambari-web/app/views/common/form/manage_credentials_form_view.js
@@ -219,7 +219,8 @@ App.ManageCredentialsFormView = Em.View.extend({
}, t('admin.kerberos.credentials.remove.confirmation.body'),
function () {},
null,
- t('yes'));
+ t('yes'),
+ false);
popup.set('secondary', t('no'));
return {
deferred: dfd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/app/views/common/modal_popups/confirmation_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/modal_popups/confirmation_popup.js b/ambari-web/app/views/common/modal_popups/confirmation_popup.js
index 8592300..c7d95f4 100644
--- a/ambari-web/app/views/common/modal_popups/confirmation_popup.js
+++ b/ambari-web/app/views/common/modal_popups/confirmation_popup.js
@@ -26,15 +26,10 @@ var App = require('app');
* @param {Function} secondary
* @param {String} header
* @param {String} primaryText
- * @param {String} primaryStyle
+ * @param {Boolean} isCritical
* @return {*}
*/
-App.showConfirmationPopup = function (primary, body, secondary, header, primaryText, primaryStyle = 'success', staticId) {
- var primaryClass = {
- 'success': 'btn-success',
- 'warning': 'btn-warning',
- 'danger': 'btn-danger'
- }[primaryStyle];
+App.showConfirmationPopup = function (primary, body, secondary, header, primaryText, isCritical, staticId) {
if (!primary) {
return false;
}
@@ -44,7 +39,7 @@ App.showConfirmationPopup = function (primary, body, secondary, header, primaryT
primary: primaryText || Em.I18n.t('ok'),
header: header || Em.I18n.t('popup.confirmation.commonHeader'),
body: body || Em.I18n.t('question.sure'),
- primaryClass: primaryClass,
+ primaryClass: isCritical ? 'btn-danger' : 'btn-success',
primaryId: staticId ? staticId + '_primary' : '',
secondaryId: staticId ? staticId + '_secondary' : '',
thirdId: staticId ? staticId + '_third' : '',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c602b01/ambari-web/test/controllers/main/admin/kerberos/kerberos_wizard_controler_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/kerberos_wizard_controler_test.js b/ambari-web/test/controllers/main/admin/kerberos/kerberos_wizard_controler_test.js
index c158a89..f6754d5 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/kerberos_wizard_controler_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/kerberos_wizard_controler_test.js
@@ -36,13 +36,13 @@ describe('App.KerberosWizardController', function() {
it('should open warning confirmation popup', function () {
var f = Em.K;
controller.warnBeforeExitPopup(f, false);
- expect(App.showConfirmationPopup.calledWith(f, Em.I18n.t('admin.kerberos.wizard.exit.warning.msg'), null, null, Em.I18n.t('common.exitAnyway'), 'success')).to.be.true;
+ expect(App.showConfirmationPopup.calledWith(f, Em.I18n.t('admin.kerberos.wizard.exit.warning.msg'), null, null, Em.I18n.t('common.exitAnyway'), false)).to.be.true;
});
it('should open critical confirmation popup', function () {
var f = Em.K;
controller.warnBeforeExitPopup(f, true);
- expect(App.showConfirmationPopup.calledWith(f, Em.I18n.t('admin.kerberos.wizard.exit.critical.msg'), null, null, Em.I18n.t('common.exitAnyway'), 'danger')).to.be.true;
+ expect(App.showConfirmationPopup.calledWith(f, Em.I18n.t('admin.kerberos.wizard.exit.critical.msg'), null, null, Em.I18n.t('common.exitAnyway'), true)).to.be.true;
});
});
@@ -467,12 +467,12 @@ describe('App.KerberosWizardController', function() {
it("isCritical is true", function() {
controller.warnBeforeExitPopup(Em.K, true);
- expect(App.showConfirmationPopup.calledWith(Em.K, Em.I18n.t('admin.kerberos.wizard.exit.critical.msg'), null, null, Em.I18n.t('common.exitAnyway'), 'danger')).to.be.true;
+ expect(App.showConfirmationPopup.calledWith(Em.K, Em.I18n.t('admin.kerberos.wizard.exit.critical.msg'), null, null, Em.I18n.t('common.exitAnyway'), true)).to.be.true;
});
it("isCritical is false", function() {
controller.warnBeforeExitPopup(Em.K, false);
- expect(App.showConfirmationPopup.calledWith(Em.K, Em.I18n.t('admin.kerberos.wizard.exit.warning.msg'), null, null, Em.I18n.t('common.exitAnyway'), 'success')).to.be.true;
+ expect(App.showConfirmationPopup.calledWith(Em.K, Em.I18n.t('admin.kerberos.wizard.exit.warning.msg'), null, null, Em.I18n.t('common.exitAnyway'), false)).to.be.true;
});
});