You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/11/16 21:56:22 UTC
git commit: AMBARI-3785. Service Summary UI section updates for
usability. (Jeff Sposetti via yusaku)
Updated Branches:
refs/heads/trunk 88e95a058 -> 6e556012c
AMBARI-3785. Service Summary UI section updates for usability. (Jeff Sposetti via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6e556012
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6e556012
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6e556012
Branch: refs/heads/trunk
Commit: 6e556012c3a112faf5981dfbfc32236122c6999b
Parents: 88e95a0
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Sat Nov 16 12:56:23 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Sat Nov 16 12:56:23 2013 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 8 ++++----
.../app/templates/main/dashboard/service/hbase.hbs | 5 +----
.../app/templates/main/dashboard/service/hdfs.hbs | 12 +++---------
.../templates/main/dashboard/service/mapreduce.hbs | 5 +----
.../app/templates/main/dashboard/service/yarn.hbs | 16 ++--------------
.../templates/main/service/info/summary/ganglia.hbs | 5 +----
.../templates/main/service/info/summary/hive.hbs | 5 +----
.../main/service/info/summary/mapreduce2.hbs | 5 +----
.../main/service/info/summary/master_components.hbs | 5 ++---
.../templates/main/service/info/summary/oozie.hbs | 5 +----
.../main/service/info/summary/zookeeper.hbs | 5 +----
11 files changed, 18 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 033a97c..eb7da3d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -956,7 +956,7 @@ Em.I18n.translations = {
'services.service.actions.reassign.master':'Reassign {0}',
'services.service.actions.reassign.master.hive':'Reassign HiveServer2, WebHCat Server, MySQL Server',
'services.service.actions.manage_configuration_groups':'Manage Configuration Groups...',
- 'services.service.actions.serviceActions':'Service Actions...',
+ 'services.service.actions.serviceActions':'Service Actions',
'services.service.summary.unknown':'unknown',
'services.service.summary.notRunning':'Not Running',
'services.service.summary.notAvailable':'n/a',
@@ -1300,10 +1300,10 @@ Em.I18n.translations = {
'hosts.host.summary.hostname':'Hostname',
'hosts.host.summary.agentHeartbeat':'Agent <br/> Heartbeat',
'hosts.host.summary.hostMetrics':'Host Metrics',
- 'hosts.host.summary.action':'Actions...',
- 'hosts.host.summary.addComponent':'Add Component...',
+ 'hosts.host.summary.action':'Actions',
+ 'hosts.host.summary.addComponent':'Add Component',
- 'hosts.host.details.hostActions':'Host Actions...',
+ 'hosts.host.details.hostActions':'Host Actions',
'hosts.host.details.needToRestart':'Host needs {0} components restarted',
'hosts.host.details.needToRestart.button':'Restart components',
'hosts.host.details.needToRestart.stopButton':'Stop components',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/dashboard/service/hbase.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/service/hbase.hbs b/ambari-web/app/templates/main/dashboard/service/hbase.hbs
index 7579c64..372ae1b 100644
--- a/ambari-web/app/templates/main/dashboard/service/hbase.hbs
+++ b/ambari-web/app/templates/main/dashboard/service/hbase.hbs
@@ -47,16 +47,13 @@
<!-- RegionServers -->
<tr>
- <td>{{t dashboard.services.hbase.regionServers}}</td>
+ <td><a href="#" {{action filterHosts view.regionServerComponent}}>{{t dashboard.services.hbase.regionServers}}</a></td>
<td>
<span>
{{#view view.regionServersLiveTextView}}
{{view.liveComponents}}/{{view.totalComponents}}
{{/view}}
</span> {{t services.service.summary.RegionServersLIVE}}
- <div class="summary-view-host">
- <a href="#" {{action filterHosts view.regionServerComponent}}>{{view.regionServesText}}</a>
- </div>
</td>
</tr>
<!-- Regions in Transition -->
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/service/hdfs.hbs b/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
index 0a52cf5..6a0ae2e 100644
--- a/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
+++ b/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
@@ -45,32 +45,26 @@
{{view view.dashboardMasterComponentView}}
<!-- Data Nodes -->
<tr>
- <td>{{t dashboard.services.hdfs.datanodes}}</td>
+ <td><a href="#" {{action filterHosts view.dataNodeComponent}}>{{t dashboard.services.hdfs.datanodes}}</a></td>
<td>
<span>
{{#view view.dataNodesLiveTextView}}
{{view.liveComponents}}/{{view.totalComponents}}
{{/view}}
</span> {{t services.service.summary.DataNodesLive}}
- <div class="summary-view-host">
- <a href="#" {{action filterHosts view.dataNodeComponent}}>{{view.dataNodeHostText}}</a>
- </div>
</td>
</tr>
<!-- JournalNodes -->
{{#if view.showJournalNodes}}
<tr>
- <td>{{t dashboard.services.hdfs.journalnodes}}</td>
+ <td><a href="#" {{action filterHosts view.journalNodeComponent}}>{{t dashboard.services.hdfs.journalnodes}}</a></td>
<td>
<span>
{{#view view.journalNodesLiveTextView}}
{{view.liveComponents}}/{{view.totalComponents}}
{{/view}}
</span> {{t services.service.summary.JournalNodesLive}}
- <div class="summary-view-host">
- <a href="#" {{action filterHosts view.journalNodeComponent}}>{{view.journalNodeHostText}}</a>
- </div>
- </td>
+ </td>
</tr>
{{/if}}
<!-- NameNode Uptime -->
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs b/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
index f49645e..d6c0b49 100644
--- a/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
+++ b/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
@@ -46,16 +46,13 @@
<!-- TaskTrackers -->
<tr>
- <td>{{t dashboard.services.mapreduce.taskTrackers}}</td>
+ <td><a href="#" {{action filterHosts view.taskTrackerComponent}}>{{t dashboard.services.mapreduce.taskTrackers}}</a></td>
<td>
<span>
{{#view view.trackersLiveTextView}}
{{view.liveComponents}}/{{view.totalComponents}}
{{/view}}
</span> {{t services.service.summary.TrackersLive}}
- <div class="summary-view-host">
- <a href="#" {{action filterHosts view.taskTrackerComponent}}>{{view.trackersText}}</a>
- </div>
</td>
</tr>
<!-- Job Tracker Uptime -->
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/dashboard/service/yarn.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/service/yarn.hbs b/ambari-web/app/templates/main/dashboard/service/yarn.hbs
index 3bc1618..3959ccf 100644
--- a/ambari-web/app/templates/main/dashboard/service/yarn.hbs
+++ b/ambari-web/app/templates/main/dashboard/service/yarn.hbs
@@ -46,33 +46,21 @@
<!-- NodeManagers -->
<tr>
- <td>{{t dashboard.services.yarn.nodeManagers}}</td>
+ <td><a href="#" {{action filterHosts view.nodeManagerComponent}}>{{t dashboard.services.yarn.nodeManagers}}</a></td>
<td>
<span>
{{#view view.nodeManagersLiveTextView}}
{{view.liveComponents}}/{{view.totalComponents}}
{{/view}}
</span>{{t services.service.summary.nodeManagersLive}}
- <div class="summary-view-host">
- <a href="#" {{action filterHosts view.nodeManagerComponent}}>{{view.nodeManagerText}}</a>
- </div>
</td>
</tr>
<!-- YARN Clients -->
<tr>
- <td class="summary-label">{{t dashboard.services.yarn.clients}}</td>
+ <td class="summary-label"><a {{action filterHosts view.yarnClientComponent}} href="javascript:void(null)">{{t dashboard.services.yarn.clients}}</a></td>
<td>
<span class="green-live">{{view.service.yarnClientNodes.length}} </span>
{{t dashboard.services.yarn.client}}{{#if view.hasManyYarnClients}}s{{/if}} {{t common.installed}}
- <div class="summary-view-host">
- <a {{action filterHosts view.yarnClientComponent}} href="javascript:void(null)">
- {{#if view.hasManyYarnClients}}
- {{t services.service.summary.viewHosts}}
- {{else}}
- {{t services.service.summary.viewHost}}
- {{/if}}
- </a>
- </div>
</td>
</tr>
<!-- ResourceManager Uptime -->
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/ganglia.hbs b/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
index a558793..3e09b96 100644
--- a/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
@@ -21,15 +21,12 @@
{{view view.sumMasterComponentView}}
<tr>
- <td class="summary-label">{{t services.ganglia.monitors}}</td>
+ <td class="summary-label"><a {{action filterHosts view.monitorsObj}} href="javascript:void(null)" >{{t services.ganglia.monitors}}</a></td>
<td>
<span>
{{#view view.monitorsLiveTextView}}
{{view.monitors}}
{{/view}}
</span> {{t services.service.summary.GangliaMonitorsLIVE}}
- <div class="summary-view-host">
- <a {{action filterHosts view.monitorsObj}} href="javascript:void(null)" >{{view.hasManyMonitors}}</a>
- </div>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/service/info/summary/hive.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/hive.hbs b/ambari-web/app/templates/main/service/info/summary/hive.hbs
index 0c8d168..aa36742 100644
--- a/ambari-web/app/templates/main/service/info/summary/hive.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/hive.hbs
@@ -19,11 +19,8 @@
{{view view.sumMasterComponentView}}
<tr>
- <td class="summary-label">{{t services.hive.clients}}</td>
+ <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.hive.clients}}</a></td>
<td>
<span class="green-live">{{view.clients.length}} </span>{{t services.hive.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}}
- <div class="summary-view-host">
- <a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{view.clientsHostText}}</a>
- </div>
</td>
</tr>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs b/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
index 89264e6..0802073 100644
--- a/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/mapreduce2.hbs
@@ -18,11 +18,8 @@
{{view view.sumMasterComponentView}}
<tr>
- <td class="summary-label">{{t services.service.summary.mapreduce2.clients}}</td>
+ <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.service.summary.mapreduce2.clients}}</a></td>
<td>
<span class="green-live">{{view.clients.length}} </span>{{t services.service.summary.mapreduce2.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}}
- <div class="summary-view-host">
- <a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{view.clientsHostText}}</a>
- </div>
</td>
</tr>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/service/info/summary/master_components.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/master_components.hbs b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
index c30eb6e..977fbcc 100644
--- a/ambari-web/app/templates/main/service/info/summary/master_components.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/master_components.hbs
@@ -19,18 +19,17 @@
{{#each masterComp in view.mastersComp}}
<tr>
<td>
+ <a href="#" {{action showDetails masterComp.host}} title="{{unbound masterComp.host.publicHostNameFormatted}}" rel="UsageTooltip">
{{#if masterComp.displayNameAdvanced}}
{{masterComp.displayNameAdvanced}}
{{else}}
{{masterComp.displayName}}
{{/if}}
+ </a>
</td>
<td>
<span {{bindAttr class="masterComp.workStatus"}}></span>
{{masterComp.componentTextStatus}}
- <div class="summary-view-host">
- <a href="#" {{action showDetails masterComp.host}}>{{t services.service.summary.viewHost}}</a>
- </div>
</td>
</tr>
{{/each}}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/service/info/summary/oozie.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/oozie.hbs b/ambari-web/app/templates/main/service/info/summary/oozie.hbs
index 3433ca7..ccd710c 100644
--- a/ambari-web/app/templates/main/service/info/summary/oozie.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/oozie.hbs
@@ -20,12 +20,9 @@
{{view view.sumMasterComponentView}}
<tr>
- <td class="summary-label">{{t services.oozie.clients}}</td>
+ <td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.oozie.clients}}</a></td>
<td>
<span class="green-live">{{view.clients.length}} </span>{{t services.oozie.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}}
- <div class="summary-view-host">
- <a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{view.clientsHostText}}</a>
- </div>
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e556012/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs b/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs
index e1df787..a65a69c 100644
--- a/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs
@@ -19,11 +19,8 @@
{{view view.sumMasterComponentView}}
-<td class="summary-label">{{t services.zookeeper.client}}</td>
+<td class="summary-label"><a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{t services.zookeeper.client}}</a></td>
<td>
<span class="green-live">{{view.clients.length}} </span>{{t services.zookeeper.client}}{{#if view.hasManyClients}}s{{/if}} {{t common.installed}}
- <div class="summary-view-host">
- <a {{action filterHosts view.clientObj}} href="javascript:void(null)" >{{view.clientsHostText}}</a>
- </div>
</td>
</tr>