[35/50] [abbrv] ambari git commit: AMBARI-22148 Style changes for service summary. (atkach)
AMBARI-22148 Style changes for service summary. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f002525 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f002525 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f002525 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 3f00252534e2dd4b08bd5d308757070fe849cba2 Parents: 0f32765 Author: Andrii TkachAuthored: Thu Oct 5 17:56:44 2017 +0300 Committer: Andrii Tkach Committed: Fri Oct 6 12:50:49 2017 +0300 -- ambari-web/app/messages.js | 6 ++-- ambari-web/app/styles/application.less | 2 +- .../app/templates/main/service/info/summary.hbs | 16 - .../templates/main/service/services/hdfs.hbs| 38 .../app/views/main/service/info/summary.js | 8 + .../app/views/main/service/services/hdfs.js | 2 -- 6 files changed, 51 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/messages.js -- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index d0c7e39..7cde3d1 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -357,6 +357,7 @@ Em.I18n.translations = { 'common.repositoryType': 'Repository Type', 'common.rolling.downgrade': 'Rolling Downgrade', 'common.express.downgrade': 'Express Downgrade', + 'common.views': 'Views', 'models.alert_instance.tiggered.verbose': "Occurred on {0} Checked on {1}", 'models.alert_definition.triggered.verbose': "Occurred on {0}", @@ -2961,8 +2962,9 @@ Em.I18n.translations = { 'dashboard.services.hdfs.nodes.heapUsed':'{0} / {1}', 'dashboard.services.hdfs.chart.label':'Capacity (Used/Total)', - 'dashboard.services.hdfs.blockErrors':'{0} / {1} / {2}', - 'dashboard.services.hdfs.blockErrorsDesc':'corrupt replica / missing / under replicated', + 'dashboard.services.hdfs.blockErrors.corrupt': 'corrupt replica', + 'dashboard.services.hdfs.blockErrors.replicated': 'under replicated', + 'dashboard.services.hdfs.blockErrors.missing': 'missing', 'dashboard.services.hdfs.datanode.status.tooltip.live': 'This is the number of DataNodes that are live as reported from ' + 'the NameNode. Even if a DataNode process is up, NameNode might see the status as dead ' + 'if the DataNode is not communicating with the NameNode as expected. This can be due situations ' + http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/styles/application.less -- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 8181996..7c9cc8e 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -1083,7 +1083,7 @@ a:focus { .col-md-3 { min-height: 100px; margin-left: 2px; -min-width: 150px; +min-width: 180px; } .summary-label { font-size: 12px; http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/templates/main/service/info/summary.hbs -- diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs index b1b0a42..075cae0 100644 --- a/ambari-web/app/templates/main/service/info/summary.hbs +++ b/ambari-web/app/templates/main/service/info/summary.hbs @@ -57,8 +57,8 @@ {{#if view.hasAlertDefinitions}} - {{#if view.alertsCount}} + {{view.alertsCount}} @@ -118,6 +118,20 @@ {{/if}} {{/view}} + + + {{t common.views}} + + + + {{#if view.views.length}} + {{#each item in view.views}} + {{item.label}} + {{/each}} + {{else}} + {{t menu.item.views.noViews}} + {{/if}} + {{! widgets in the metrics panel are loaded seperately from summary page text information http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/templates/main/service/services/hdfs.hbs -- diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs b/ambari-web/app/templates/main/service/services/hdfs.hbs index 967239d..fec5bac 100644 --- a/ambari-web/app/templates/main/service/services/hdfs.hbs +++ b/ambari-web/app/templates/main/service/services/hdfs.hbs @@ -64,17 +64,18 @@ {{else}}
ambari git commit: AMBARI-22148 Style changes for service summary. (atkach)
Repository: ambari Updated Branches: refs/heads/trunk 0f32765dc -> 3f0025253 AMBARI-22148 Style changes for service summary. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f002525 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f002525 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f002525 Branch: refs/heads/trunk Commit: 3f00252534e2dd4b08bd5d308757070fe849cba2 Parents: 0f32765 Author: Andrii TkachAuthored: Thu Oct 5 17:56:44 2017 +0300 Committer: Andrii Tkach Committed: Fri Oct 6 12:50:49 2017 +0300 -- ambari-web/app/messages.js | 6 ++-- ambari-web/app/styles/application.less | 2 +- .../app/templates/main/service/info/summary.hbs | 16 - .../templates/main/service/services/hdfs.hbs| 38 .../app/views/main/service/info/summary.js | 8 + .../app/views/main/service/services/hdfs.js | 2 -- 6 files changed, 51 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/messages.js -- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index d0c7e39..7cde3d1 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -357,6 +357,7 @@ Em.I18n.translations = { 'common.repositoryType': 'Repository Type', 'common.rolling.downgrade': 'Rolling Downgrade', 'common.express.downgrade': 'Express Downgrade', + 'common.views': 'Views', 'models.alert_instance.tiggered.verbose': "Occurred on {0} Checked on {1}", 'models.alert_definition.triggered.verbose': "Occurred on {0}", @@ -2961,8 +2962,9 @@ Em.I18n.translations = { 'dashboard.services.hdfs.nodes.heapUsed':'{0} / {1}', 'dashboard.services.hdfs.chart.label':'Capacity (Used/Total)', - 'dashboard.services.hdfs.blockErrors':'{0} / {1} / {2}', - 'dashboard.services.hdfs.blockErrorsDesc':'corrupt replica / missing / under replicated', + 'dashboard.services.hdfs.blockErrors.corrupt': 'corrupt replica', + 'dashboard.services.hdfs.blockErrors.replicated': 'under replicated', + 'dashboard.services.hdfs.blockErrors.missing': 'missing', 'dashboard.services.hdfs.datanode.status.tooltip.live': 'This is the number of DataNodes that are live as reported from ' + 'the NameNode. Even if a DataNode process is up, NameNode might see the status as dead ' + 'if the DataNode is not communicating with the NameNode as expected. This can be due situations ' + http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/styles/application.less -- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 8181996..7c9cc8e 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -1083,7 +1083,7 @@ a:focus { .col-md-3 { min-height: 100px; margin-left: 2px; -min-width: 150px; +min-width: 180px; } .summary-label { font-size: 12px; http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/templates/main/service/info/summary.hbs -- diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs index b1b0a42..075cae0 100644 --- a/ambari-web/app/templates/main/service/info/summary.hbs +++ b/ambari-web/app/templates/main/service/info/summary.hbs @@ -57,8 +57,8 @@ {{#if view.hasAlertDefinitions}} - {{#if view.alertsCount}} + {{view.alertsCount}} @@ -118,6 +118,20 @@ {{/if}} {{/view}} + + + {{t common.views}} + + + + {{#if view.views.length}} + {{#each item in view.views}} + {{item.label}} + {{/each}} + {{else}} + {{t menu.item.views.noViews}} + {{/if}} + {{! widgets in the metrics panel are loaded seperately from summary page text information http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/templates/main/service/services/hdfs.hbs -- diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs b/ambari-web/app/templates/main/service/services/hdfs.hbs index 967239d..fec5bac 100644 --- a/ambari-web/app/templates/main/service/services/hdfs.hbs +++ b/ambari-web/app/templates/main/service/services/hdfs.hbs @@