Updated Branches: refs/heads/trunk b6f0bc4e5 -> 020138345
AMBARI-3618. 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/02013834 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/02013834 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/02013834 Branch: refs/heads/trunk Commit: 02013834577673afa8e81efe913241489b8bda4e Parents: b6f0bc4 Author: Xi Wang <[email protected]> Authored: Thu Oct 31 10:23:29 2013 -0700 Committer: Xi Wang <[email protected]> Committed: Thu Oct 31 10:23:29 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 6 ++++-- ambari-web/app/templates/main/host/details.hbs | 2 +- ambari-web/app/templates/main/host/summary.hbs | 16 ++++++++-------- ambari-web/app/templates/main/service/item.hbs | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/02013834/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 282b816..cabc24e 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', @@ -936,7 +935,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', @@ -1276,7 +1275,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':'Action...', + 'hosts.host.summary.addComponent':'Add Component...', + '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.deleteHost':'Delete Host', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/02013834/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..e976fd3 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/02013834/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..8da39de 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,14 +144,14 @@ </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}} - <span class="caret pull-right"></span> + {{t hosts.host.summary.addComponent}} + <span class="caret pull-right"></span> </button> <ul class="dropdown-menu"> {{#each component in view.addableComponents}} http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/02013834/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">
