You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/20 16:54:22 UTC
[04/14] git commit: AMBARI-7416. Slider View: Do not show Flex action
when app is stopped (alexantonenko)
AMBARI-7416. Slider View: Do not show Flex action when app is stopped (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d018aa6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d018aa6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d018aa6a
Branch: refs/heads/branch-alerts-dev
Commit: d018aa6a1b720149fe4417801122cd72c322e4ab
Parents: fbe97db
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Sep 19 21:11:25 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Sep 19 21:22:46 2014 +0300
----------------------------------------------------------------------
.../main/resources/ui/app/controllers/slider_app_controller.js | 2 +-
.../slider/src/main/resources/ui/app/styles/application.less | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d018aa6a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
index f042e38..94ae7e7 100644
--- a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
+++ b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
@@ -56,7 +56,7 @@ App.SliderAppController = Ember.ObjectController.extend(App.AjaxErrorHandler, {
confirm: true
});
}
- if ('FINISHED' !== status) {
+ if ('RUNNING' == status) {
actions.push({
title: 'Flex',
action: 'flex',
http://git-wip-us.apache.org/repos/asf/ambari/blob/d018aa6a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/application.less b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
index f0d0bab..98f52d4 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
@@ -595,6 +595,9 @@ select {
border-width: 0;
}
}
+ td:nth-child(2) span{
+ word-break: break-all;
+ }
}
.panel-heading {
font-weight: 700;
@@ -604,9 +607,6 @@ select {
td:first-child {
text-align: right;
}
- span{
- word-break: break-all;
- }
}
.panel-components {
.status {