You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/02/26 14:12:04 UTC
git commit: AMBARI-4839 Make Background Ops badge more intuitive.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk e6ba88fb0 -> 884b1e8ce
AMBARI-4839 Make Background Ops badge more intuitive. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/884b1e8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/884b1e8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/884b1e8c
Branch: refs/heads/trunk
Commit: 884b1e8cec444b2fca293037f33334088d940b96
Parents: e6ba88f
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Feb 26 15:06:01 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Feb 26 15:07:41 2014 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 +
ambari-web/app/styles/application.less | 28 ++++++++++++++++++++
ambari-web/app/templates/application.hbs | 4 +--
ambari-web/test/views/common/table_view_test.js | 1 +
.../decommissionable_test.js | 1 +
5 files changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/884b1e8c/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 975b621..45d533c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -49,6 +49,7 @@ Em.I18n.translations = {
'yes':'Yes',
'no':'No',
'add': 'Add',
+ 'ops': 'ops',
'common.access':'Access',
http://git-wip-us.apache.org/repos/asf/ambari/blob/884b1e8c/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index b0418a0..33244c9 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -20,6 +20,25 @@
@space-m: 10px;
@space-l: 20px;
+@-webkit-keyframes greenPulse {
+ from { background-color: #118fff; }
+ 50% { background-color: #006DCC; }
+ to { background-color: #118fff; }
+}
+
+@-moz-keyframes greenPulse {
+ from { background-color: #118fff; }
+ 50% { background-color: #006DCC; }
+ to { background-color: #118fff; }
+}
+
+@keyframes greenPulse
+{
+ 0% { background-color: #118fff; }
+ 50% { background-color: #006DCC; }
+ 100% { background-color: #118fff; }
+}
+
.gradient(@color: #FAFAFA, @start: #FFFFFF, @stop: #F2F2F2) {
background: @color;
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, @start), color-stop(1, @stop));
@@ -92,6 +111,15 @@ footer {
.operations-count {
background-color: #006DCC;
+ -webkit-animation-name: greenPulse;
+ -webkit-animation-duration: 1s;
+ -webkit-animation-iteration-count: infinite;
+ -moz-animation-name: greenPulse;
+ -moz-animation-duration: 1s;
+ -moz-animation-iteration-count: infinite;
+ animation-name: greenPulse;
+ animation-duration: 1s;
+ animation-iteration-count: infinite;
margin: 2px;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/884b1e8c/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 77d79ef..35b7f80 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -30,9 +30,9 @@
{{#with App.router.backgroundOperationsController}}
{{#if allOperationsCount}}
- <span class="label operations-count" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}}</span>
+ <span class="label operations-count" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}} {{t ops}}</span>
{{else}}
- <span class="label" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}}</span>
+ <span class="label" {{action "showPopup" target="App.router.backgroundOperationsController"}}>{{allOperationsCount}} {{t ops}}</span>
{{/if}}
{{/with}}
</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/884b1e8c/ambari-web/test/views/common/table_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/table_view_test.js b/ambari-web/test/views/common/table_view_test.js
index 769c6b6..27808e5 100644
--- a/ambari-web/test/views/common/table_view_test.js
+++ b/ambari-web/test/views/common/table_view_test.js
@@ -20,6 +20,7 @@ var App = require('app');
require('utils/db');
require('views/common/filter_view');
require('views/common/sort_view');
+require('mixins');
require('mixins/common/userPref');
require('views/common/table_view');
http://git-wip-us.apache.org/repos/asf/ambari/blob/884b1e8c/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
index d574729..d3aa3f9 100644
--- a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
+++ b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
@@ -19,6 +19,7 @@
var App = require('app');
require('models/host_component');
require('views/main/host/details/host_component_view');
+require('mixins');
require('mixins/main/host/details/host_components/decommissionable');
var hostComponentView;