Repository: ambari Updated Branches: refs/heads/trunk c46d4916a -> 4bcf111f1
AMBARI-7363 Recommendations: ui changes for usability. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bcf111f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bcf111f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bcf111f Branch: refs/heads/trunk Commit: 4bcf111f1f8539df666fbe3d9c41609547d4e5b3 Parents: c46d491 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Wed Sep 17 17:33:03 2014 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Wed Sep 17 17:56:20 2014 +0300 ---------------------------------------------------------------------- .../controllers/main/service/info/configs.js | 5 +++ .../app/controllers/wizard/step7_controller.js | 5 +++ ambari-web/app/messages.js | 3 +- ambari-web/app/mixins/common/serverValidator.js | 1 + ambari-web/app/styles/application.less | 5 +++ .../configs/config_recommendation_popup.hbs | 35 ++++++++++++++-- .../wizard/step6/step6_issues_popup.hbs | 44 ++++++++++---------- 7 files changed, 73 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 4411667..32343ff 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -146,6 +146,11 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM attributeName: 'isValid', attributeValue: false, caption: 'common.combobox.dropdown.issues' + }, + { + attributeName: 'warn', + attributeValue: true, + caption: 'common.combobox.dropdown.warnings' } ], http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 8afc87d..55c83ff 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -220,6 +220,11 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { attributeName: 'isValid', attributeValue: false, caption: 'common.combobox.dropdown.issues' + }, + { + attributeName: 'warn', + attributeValue: true, + caption: 'common.combobox.dropdown.warnings' } ], http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 7379220..d1f7afd 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -658,7 +658,7 @@ Em.I18n.translations = { 'installer.step7.popup.validation.request.failed.body': 'Config validaition failed.', 'installer.step7.popup.validation.warning.header': 'Configurations', 'installer.step7.popup.validation.warning.body': 'Some service configurations are not configured properly. We recommend you review and change the highlighted configuration values. Are you sure you want to proceed without correcting configurations?', - + 'installer.step7.popup.validation.warning.errorDescription': ' value is less than the recommended default of ', 'installer.step7.oozie.database.new': 'New Derby Database', 'installer.step7.hive.database.new': 'New MySQL Database', @@ -2263,6 +2263,7 @@ Em.I18n.translations = { 'common.combobox.dropdown.final': 'Final properties', 'common.combobox.dropdown.changed': 'Changed properties', 'common.combobox.dropdown.issues': 'Show property issues', + 'common.combobox.dropdown.warnings': 'Show property warnings', 'quick.links.error.label': 'Hostname is undefined', 'quick.links.publicHostName': '{0} ({1})', http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/ambari-web/app/mixins/common/serverValidator.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/serverValidator.js b/ambari-web/app/mixins/common/serverValidator.js index bea7bd7..8d551f8 100644 --- a/ambari-web/app/mixins/common/serverValidator.js +++ b/ambari-web/app/mixins/common/serverValidator.js @@ -274,6 +274,7 @@ App.ServerValidatorMixin = Em.Mixin.create({ // Motivation: for server-side validation warnings and EVEN errors allow user to continue wizard return App.ModalPopup.show({ header: Em. I18n.t('installer.step7.popup.validation.warning.header'), + classNames: ['sixty-percent-width-modal'], primary: Em.I18n.t('common.proceedAnyway'), onPrimary: function () { this.hide(); http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 7a4138c..8385916 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -2203,6 +2203,11 @@ width:100%; overflow-y: auto; } +.limited-height-2 { + max-height: 250px; + overflow-y: auto; +} + .task-detail-info { .task-detail-log-info { max-height: 340px; http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs b/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs index 1f47d6e..4efc312 100644 --- a/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs +++ b/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs @@ -17,12 +17,41 @@ }} <p>{{t installer.step7.popup.validation.warning.body}}</p> -<div class="alert alert-warning"> +<div id="config-validation-warnings" class="limited-height-2"> + <table class="table no-borders"> + <thead> + <tr> + <th> + {{t common.service}} + </th> + <th> + {{t common.property}} + </th> + <th> + {{t common.description}} + </th> + </tr> + </thead> + <tbody> {{#each service in stepConfigs}} {{#each property in service.configs}} {{#if property.warn}} - <strong>{{property.displayName}}</strong>: {{property.warnMessage}}<br /> + <tr> + <td> + {{property.serviceName}} + </td> + <td> + {{property.displayName}} + </td> + <td> + <strong>{{property.description}}:</strong><br/> + <strong>{{property.value}}</strong>{{t installer.step7.popup.validation.warning.errorDescription}} + <strong>{{property.defaultValue}}</strong> + </td> + </tr> {{/if}} {{/each}} {{/each}} -</div> + </tbody> + </table> +</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/4bcf111f/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 index 12adf0c..447ff50 100644 --- a/ambari-web/app/templates/wizard/step6/step6_issues_popup.hbs +++ b/ambari-web/app/templates/wizard/step6/step6_issues_popup.hbs @@ -17,25 +17,27 @@ }} <p>{{t installer.step6.validationSlavesAndClients.popup.body}}</p> -{{#if anyGeneralErrors}} - <div class="alert alert-error"> - <ul> - {{#if errorMessage}} - <li>{{errorMessage}}</li> - {{/if}} - {{#each msg in controller.generalErrorMessages}} - <li>{{msg}}</li> - {{/each}} - </ul> - </div> -{{/if}} +<div class="limited-height-2"> + {{#if anyGeneralErrors}} + <div class="alert alert-error"> + <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 anyGeneralWarnings}} + <div class="alert alert-warning"> + <ul> + {{#each msg in controller.generalWarningMessages}} + <li>{{msg}}</li> + {{/each}} + </ul> + </div> + {{/if}} +</div>
