ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject ambari git commit: AMBARI-8846. Metrics UI: remove the 'Time range:' text. (xiwang via yusaku)
Date Tue, 23 Dec 2014 01:49:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 63d65a4f3 -> 511f64d76


AMBARI-8846. Metrics UI: remove the 'Time range:' text. (xiwang via yusaku)


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

Branch: refs/heads/trunk
Commit: 511f64d762e0ed09499e794c29ae28a5222703fd
Parents: 63d65a4
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Dec 22 17:49:31 2014 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Dec 22 17:49:31 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/messages.js                             | 1 -
 ambari-web/app/templates/main/service/info/summary.hbs | 3 +--
 ambari-web/app/views/main/service/info/summary.js      | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/511f64d7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index c659ce5..f4fc091 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -332,7 +332,6 @@ Em.I18n.translations = {
   'graphs.timeRange.week': 'Last 1 week',
   'graphs.timeRange.month': 'Last 1 month',
   'graphs.timeRange.year': 'Last 1 year',
-  'graphs.timeRangeControl.label': 'Time range: ',
 
   'users.userName.validationFail': 'Only lowercase letters and numbers are recommended; must
start with a letter',
   'host.spacesValidation': 'Cannot contain whitespace',

http://git-wip-us.apache.org/repos/asf/ambari/blob/511f64d7/ambari-web/app/templates/main/service/info/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs
index 8ba06fc..9ed73f8 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -71,8 +71,7 @@
             <h4>{{t services.service.metrics}}</h4>
             <div class="btn-group pull-right">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                {{t graphs.timeRangeControl.label}} {{view.currentTimeRange.name}}
-                  <span class="caret"></span>
+                {{view.currentTimeRange.name}} &nbsp;<span class="caret"></span>
               </button>
               <ul class="dropdown-menu">
                 {{#each option in view.timeRangeOptions}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/511f64d7/ambari-web/app/views/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js
index 5d568c9..7146f1c 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -366,6 +366,8 @@ App.MainServiceInfoSummaryView = Em.View.extend(App.UserPref, {
   getUserPrefErrorCallback: function (request) {
     if (request.status == 404) {
       console.log('Persist did NOT find the key');
+      this.postUserPref(this.get('persistKey'), 0);
+      this.set('currentTimeRangeIndex', 0);
     }
   },
 


Mime
View raw message