You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2013/10/31 00:33:51 UTC
git commit: AMBARI-2618. host actions UI changes based on new
stop/start all and delete func (xiwang)
Updated Branches:
refs/heads/trunk 4fc8133b9 -> e10272390
AMBARI-2618. host actions UI changes based on new stop/start all and delete func (xiwang)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/e1027239
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/e1027239
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/e1027239
Branch: refs/heads/trunk
Commit: e10272390444e56b0e4cacfda0bc36f6985e300d
Parents: 4fc8133
Author: Xi Wang <xi...@apache.org>
Authored: Wed Oct 30 16:33:42 2013 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Wed Oct 30 16:33:42 2013 -0700
----------------------------------------------------------------------
ambari-web/app/messages.js | 3 +--
ambari-web/app/templates/main/host/details.hbs | 2 +-
ambari-web/app/templates/main/host/summary.hbs | 14 +++++++-------
ambari-web/app/templates/main/service/item.hbs | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e1027239/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1413888..be9a725 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -54,7 +54,6 @@ Em.I18n.translations = {
'common.progress':'Progress',
'common.status':'Status',
'common.action':'Action',
- 'common.addComponent':'Add Component',
'common.remove':'Remove',
'common.retry':'Retry',
'common.skip':'Skip',
@@ -929,7 +928,7 @@ Em.I18n.translations = {
'services.service.actions.run.smoke':'Run Smoke Test',
'services.service.actions.reassign.master':'Reassign {0}',
'services.service.actions.reassign.master.hive':'Reassign HiveServer2, WebHCat Server, MySQL Server',
- 'services.service.actions.maintenance':'Maintenance',
+ 'services.service.actions.serviceActions':'Service Actions...',
'services.service.summary.unknown':'unknown',
'services.service.summary.notRunning':'Not Running',
'services.service.summary.notAvailable':'n/a',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e1027239/ambari-web/app/templates/main/host/details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details.hbs b/ambari-web/app/templates/main/host/details.hbs
index 51e1200..78e6ddd 100644
--- a/ambari-web/app/templates/main/host/details.hbs
+++ b/ambari-web/app/templates/main/host/details.hbs
@@ -31,7 +31,7 @@
<div class="service-button">
<div class="btn-group display-inline-block">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- {{t services.service.actions.maintenance}}
+ {{t hosts.host.details.hostActions}}
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e1027239/ambari-web/app/templates/main/host/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs
index 5626f06..3c41091 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -39,7 +39,7 @@
{{#each component in view.sortedComponents}}
<div class="row-fluid">
{{#view view.ComponentView contentBinding="component" decommissionDataNodeHostNamesBinding="view.decommissionDataNodeHostNames"}}
- <div class="span7">
+ <div class="span8">
{{#if view.isUpgradeFailed}}
{{#if App.isAdmin}}
<a href="#" {{action "upgradeComponent" view.content target="controller"}} >
@@ -61,11 +61,11 @@
<i class="text-warning icon-refresh"></i>
{{/if}}
</div>
- <div class="span5">
+ <div class="span4">
{{#if App.isAdmin}}
<div class="btn-group">
<a {{ bindAttr class="view.disabled :btn :dropdown-toggle"}} data-toggle="dropdown">
- {{t common.action}}
+ {{t hosts.host.summary.action}}
<span class="caret pull-right"></span>
</a>
<ul class="dropdown-menu">
@@ -130,9 +130,9 @@
{{/if}}
{{!clients and add component button}}
<div class="clients row-fluid">
- <div class="span7 row">
+ <div class="span8 row">
{{#if view.clients.length}}
- <div class="span3 align-right">{{t common.clients}} /</div>
+ <div class="span2" style="margin-left: 21px">{{t common.clients}} /</div>
<div class="span8">
{{#each component in view.clients}}
{{#if component.isLast}}
@@ -144,13 +144,13 @@
</div>
{{/if}}
</div>
- <div class="span5 row">
+ <div class="span4 row">
{{#if App.isAdmin}}
{{#if view.isAddComponent}}
{{#if view.addableComponents.length}}
<div class="btn-group">
<button id="add_component" class="btn btn-info dropdown-toggle" data-toggle="dropdown">
- {{t common.addComponent}}
+ {{t hosts.host.summary.addComponent}}
<span class="caret pull-right"></span>
</button>
<ul class="dropdown-menu">
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e1027239/ambari-web/app/templates/main/service/item.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/item.hbs b/ambari-web/app/templates/main/service/item.hbs
index 1764a9d..2eb5bcc 100644
--- a/ambari-web/app/templates/main/service/item.hbs
+++ b/ambari-web/app/templates/main/service/item.hbs
@@ -43,7 +43,7 @@
{{#if view.isMaintenanceActive}}
<div class="btn-group display-inline-block">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- {{t services.service.actions.maintenance}}
+ {{t services.service.actions.serviceActions}}
<span class="caret"></span>
</a>
<ul class="dropdown-menu">