ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-5015 Host Details: Put the "Delete" action last in the Actions pulldowns for Host and Host Components.(ababiichuk)
Date Tue, 11 Mar 2014 12:31:11 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 6a8ae7f1b -> e1035d145


AMBARI-5015 Host Details: Put the "Delete" action last in the Actions pulldowns for Host and
Host Components.(ababiichuk)


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

Branch: refs/heads/trunk
Commit: e1035d145fdaee42ccaadd8ea5475b83da72bead
Parents: 6a8ae7f
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Tue Mar 11 14:28:39 2014 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Tue Mar 11 14:28:39 2014 +0200

----------------------------------------------------------------------
 .../templates/main/host/details/host_component.hbs    | 14 +++++++-------
 ambari-web/app/views/main/host/details.js             |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1035d14/ambari-web/app/templates/main/host/details/host_component.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details/host_component.hbs b/ambari-web/app/templates/main/host/details/host_component.hbs
index 86bfdba..560aa13 100644
--- a/ambari-web/app/templates/main/host/details/host_component.hbs
+++ b/ambari-web/app/templates/main/host/details/host_component.hbs
@@ -60,13 +60,6 @@
             </a>
           </li>
         {{/if}}
-        {{#if view.isDeletableComponent}}
-          <li {{bindAttr class="view.isDeleteComponentDisabled:disabled"}}>
-            <a href="javascript:void(null)" data-toggle="modal" {{action "deleteComponent"
view.content target="controller"}}>
-              {{t common.delete}}
-            </a>
-          </li>
-        {{/if}}
         {{#if view.isRestartableComponent}}
           <li {{bindAttr class="view.isRestartComponentDisabled:hidden"}}>
             <a href="javascript:void(null)" data-toggle="modal" {{action "restartComponent"
view.content target="controller"}}>
@@ -124,6 +117,13 @@
             </li>
           {{/if}}
         {{/unless}}
+        {{#if view.isDeletableComponent}}
+            <li {{bindAttr class="view.isDeleteComponentDisabled:disabled"}}>
+                <a href="javascript:void(null)" data-toggle="modal" {{action "deleteComponent"
view.content target="controller"}}>
+                  {{t common.delete}}
+                </a>
+            </li>
+        {{/if}}
       </ul>
     </div>
   {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/e1035d14/ambari-web/app/views/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/details.js b/ambari-web/app/views/main/host/details.js
index d92300b..a278630 100644
--- a/ambari-web/app/views/main/host/details.js
+++ b/ambari-web/app/views/main/host/details.js
@@ -36,8 +36,8 @@ App.MainHostDetailsView = Em.View.extend({
       {action: 'startAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'),
cssClass: 'icon-play', 'label': this.t('hosts.host.details.startAllComponents')},
       {action: 'stopAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'),
cssClass: 'icon-stop', 'label': this.t('hosts.host.details.stopAllComponents')},
       {action: 'restartAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'),
cssClass: 'icon-repeat', 'label': this.t('hosts.host.details.restartAllComponents')},
-      {action: 'deleteHost', liClass:'', cssClass: 'icon-remove', 'label': this.t('hosts.host.details.deleteHost')},
-      {action: 'onOffPassiveModeForHost', liClass:'', cssClass: 'icon-medkit', active:this.get('isActive'),
'label': this.t('passiveState.turn' + onOff)}];
+      {action: 'onOffPassiveModeForHost', liClass:'', cssClass: 'icon-medkit', active:this.get('isActive'),
'label': this.t('passiveState.turn' + onOff)},
+      {action: 'deleteHost', liClass:'', cssClass: 'icon-remove', 'label': this.t('hosts.host.details.deleteHost')}];
   }.property('controller.content','isActive', 'controller.content.isNotHeartBeating'),
   didInsertElement: function() {
     App.tooltip($("[rel='HealthTooltip']"));


Mime
View raw message