incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject git commit: Revert "AMBARI-2618. host actions UI changes based on new stop/start all and delete func (xiwang)"
Date Thu, 31 Oct 2013 01:14:23 GMT
Updated Branches:
  refs/heads/trunk 621079d13 -> ad0d9f0ea


Revert "AMBARI-2618. host actions UI changes based on new stop/start all and delete func (xiwang)"

This reverts commit e10272390444e56b0e4cacfda0bc36f6985e300d.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/ad0d9f0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ad0d9f0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ad0d9f0e

Branch: refs/heads/trunk
Commit: ad0d9f0eae1784a927f105587e551b4d76f6c2fb
Parents: 621079d
Author: Srimanth Gunturi <sgunturi@hortonworks.com>
Authored: Wed Oct 30 18:14:06 2013 -0700
Committer: Srimanth Gunturi <sgunturi@hortonworks.com>
Committed: Wed Oct 30 18:14:06 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, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ad0d9f0e/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index be9a725..1413888 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -54,6 +54,7 @@ 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',
@@ -928,7 +929,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.serviceActions':'Service Actions...',
+  'services.service.actions.maintenance':'Maintenance',
   '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/ad0d9f0e/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 78e6ddd..51e1200 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 hosts.host.details.hostActions}}
+				        {{t services.service.actions.maintenance}}
 				        <span class="caret"></span>
 				      </a>
 				      <ul class="dropdown-menu">

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ad0d9f0e/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 3c41091..5626f06 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="span8">
+            <div class="span7">
               {{#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="span4">
+            <div class="span5">
               {{#if App.isAdmin}}
               <div class="btn-group">
                 <a {{ bindAttr class="view.disabled :btn :dropdown-toggle"}} data-toggle="dropdown">
-                  {{t hosts.host.summary.action}}
+                  {{t common.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="span8 row">
+            <div class="span7 row">
               {{#if view.clients.length}}
-                <div class="span2" style="margin-left: 21px">{{t common.clients}}&nbsp;/</div>
+                <div class="span3 align-right">{{t common.clients}}&nbsp;/</div>
                   <div class="span8">
                     {{#each component in view.clients}}
                       {{#if component.isLast}}
@@ -144,13 +144,13 @@
                 </div>
               {{/if}}
             </div>
-            <div class="span4 row">
+            <div class="span5 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 hosts.host.summary.addComponent}}
+                        {{t common.addComponent}}
                           <span class="caret pull-right"></span>
                       </button>
                       <ul class="dropdown-menu">

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ad0d9f0e/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 2eb5bcc..1764a9d 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.serviceActions}}
+        {{t services.service.actions.maintenance}}
         <span class="caret"></span>
       </a>
       <ul class="dropdown-menu">


Mime
View raw message