AMBARI-7363 Recommendations: ui changes for usability 2. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f932cfe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f932cfe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f932cfe Branch: refs/heads/branch-alerts-dev Commit: 3f932cfeefb780530a05d3c328418635836a9b0b Parents: 0058924 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Thu Sep 18 12:39:59 2014 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Thu Sep 18 12:39:59 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 - ambari-web/app/styles/application.less | 15 +++++++++++++++ .../common/configs/config_recommendation_popup.hbs | 13 +++++++++---- 3 files changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3f932cfe/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 5c330b4..1052d9b 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -658,7 +658,6 @@ 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', http://git-wip-us.apache.org/repos/asf/ambari/blob/3f932cfe/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 8385916..235dbc1 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -7005,3 +7005,18 @@ i.icon-asterisks { .table td.no-borders { border-top: none; } .table td.error { background-color: #f2dede; } .table td.warning { background-color: #fcf8e3; } + +#config-validation-warnings { + table { + tbody{ + tr { + background:#fcf8e3; + border:1px solid #c09853; + border-right:none; + td { + min-width: 150px; + } + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3f932cfe/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 4efc312..0a3e231 100644 --- a/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs +++ b/ambari-web/app/templates/common/configs/config_recommendation_popup.hbs @@ -28,6 +28,9 @@ {{t common.property}} </th> <th> + {{t common.value}} + </th> + <th> {{t common.description}} </th> </tr> @@ -41,12 +44,14 @@ {{property.serviceName}} </td> <td> - {{property.displayName}} + {{property.name}} + </td> + <td> + {{property.value}} </td> <td> - <strong>{{property.description}}:</strong><br/> - <strong>{{property.value}}</strong>{{t installer.step7.popup.validation.warning.errorDescription}} - <strong>{{property.defaultValue}}</strong> + {{property.description}}<br/> + <strong>{{property.warnMessage}}</strong> </td> </tr> {{/if}}