Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11FD91063D for ; Wed, 8 Jan 2014 15:22:08 +0000 (UTC) Received: (qmail 76937 invoked by uid 500); 8 Jan 2014 15:22:07 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 76881 invoked by uid 500); 8 Jan 2014 15:22:06 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 76842 invoked by uid 99); 8 Jan 2014 15:22:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jan 2014 15:22:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 29A355483A; Wed, 8 Jan 2014 15:22:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akovalenko@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-4228. Mirroring: Dataset page redesign. (Mikhail Bayuk via akovalenko) Date: Wed, 8 Jan 2014 15:22:02 +0000 (UTC) Updated Branches: refs/heads/trunk 366a263c4 -> 7a25e8557 AMBARI-4228. Mirroring: Dataset page redesign. (Mikhail Bayuk via akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a25e855 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a25e855 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a25e855 Branch: refs/heads/trunk Commit: 7a25e8557f62b5f36b7405eb8f3fbca634725b01 Parents: 366a263 Author: Aleksandr Kovalenko Authored: Wed Jan 8 17:21:15 2014 +0200 Committer: Aleksandr Kovalenko Committed: Wed Jan 8 17:21:15 2014 +0200 ---------------------------------------------------------------------- .../main/mirroring/jobs_controller.js | 7 +- ambari-web/app/messages.js | 9 +- ambari-web/app/models/dataset_job.js | 7 +- ambari-web/app/styles/application.less | 14 ++- .../app/templates/main/mirroring/jobs.hbs | 89 ++++++-------------- 5 files changed, 54 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7a25e855/ambari-web/app/controllers/main/mirroring/jobs_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/mirroring/jobs_controller.js b/ambari-web/app/controllers/main/mirroring/jobs_controller.js index 5cd08d3..01fd720 100644 --- a/ambari-web/app/controllers/main/mirroring/jobs_controller.js +++ b/ambari-web/app/controllers/main/mirroring/jobs_controller.js @@ -21,7 +21,12 @@ var App = require('app'); App.MainJobsController = Em.Controller.extend({ name: 'mainJobsController', jobs: function () { - return App.DataSetJob.find().filterProperty('dataset', this.get('content')); + var jobs = App.DataSetJob.find().filterProperty('dataset', this.get('content')).sort( + function(a, b) { + return a.get('id') < b.get('id'); + } + ); + return jobs; }.property('content'), actionDesc: function () { http://git-wip-us.apache.org/repos/asf/ambari/blob/7a25e855/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index aef361b..71aa8b8 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1682,9 +1682,10 @@ Em.I18n.translations = { 'mirroring.dataset.selectTargetClusters':'Select Target Cluster...', 'mirroring.dataset.name':'Name', 'mirroring.dataset.save': 'Save & Run', - 'mirroring.dataset.sourceDir':'Source Cluster Directory', - 'mirroring.dataset.target':'Target Cluster', + 'mirroring.dataset.sourceDir':'Location', + 'mirroring.dataset.target':'Target', 'mirroring.dataset.source':'Source', + 'mirroring.dataset.filespec':'Spec', 'mirroring.dataset.avgData':'Avg. Data', 'mirroring.dataset.dateCreated':'Date Created', 'mirroring.dataset.targetDir':'Target Cluster Directory', @@ -1709,8 +1710,8 @@ Em.I18n.translations = { 'mirroring.table.lastFail':'Last Fail', 'mirroring.table.lastDuration':'Last Duration', 'mirroring.table.avgData':'Avg Data', - 'mirroring.table.noJobs':'No jobs to display', - 'mirroring.table.jobId':'Job ID', + 'mirroring.table.noJobs':'No instances to display', + 'mirroring.table.jobId':'Instance ID', 'mirroring.table.start':'Start', 'mirroring.table.end':'End', 'mirroring.table.duration':'Duration', http://git-wip-us.apache.org/repos/asf/ambari/blob/7a25e855/ambari-web/app/models/dataset_job.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/dataset_job.js b/ambari-web/app/models/dataset_job.js index aeb3e98..5ad698d 100644 --- a/ambari-web/app/models/dataset_job.js +++ b/ambari-web/app/models/dataset_job.js @@ -28,8 +28,11 @@ App.DataSetJob = DS.Model.extend({ duration: DS.attr('number'), startDateFormatted: function () { return date.dateFormatShort(this.get('startDate')); - }.property('startDate') + }.property('startDate'), //data : DS.attr('string') + healthClass: function () { + return this.get('status') === 'FAILED' ? 'health-status-DEAD-RED' : 'health-status-LIVE'; + }.property('status') }); @@ -42,4 +45,4 @@ App.DataSetJob.FIXTURES = [/* racks: [1, 2, 3, 4, 5, 6], max_hosts_per_rack: 10 }*/ -]; \ No newline at end of file +]; http://git-wip-us.apache.org/repos/asf/ambari/blob/7a25e855/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 05531cf..f07da32 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -3663,6 +3663,16 @@ ul.filter { margin-bottom: 20px; } +.switcher { + background-color: #e5e5e5; + -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + margin-bottom: 20px; + border-radius: 4px; + border-color: #D8D8D8; +} + .schedule-toggle { min-width: 190px; } @@ -3892,9 +3902,9 @@ ul.filter { } } .jobs-middleportion{ - width: 80%; + width: 82%; height: 100%; - float:left; + float: right; } /*End Mirroring*/ http://git-wip-us.apache.org/repos/asf/ambari/blob/7a25e855/ambari-web/app/templates/main/mirroring/jobs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/mirroring/jobs.hbs b/ambari-web/app/templates/main/mirroring/jobs.hbs index e26e305..bed8ae3 100644 --- a/ambari-web/app/templates/main/mirroring/jobs.hbs +++ b/ambari-web/app/templates/main/mirroring/jobs.hbs @@ -17,43 +17,43 @@ }}
- +
+ {{view.dataset.name}} + ← {{t common.back}} +
{{#if App.isAdmin}} -
- {{#if isScheduled}} - {{content.status}} +
+ {{#if isScheduled}} + - + class="btn btn-danger enabled" {{action "suspend" target="controller"}}> + {{actionDesc}} - {{else}} - {{content.status}} + {{content.status}}  + + {{else}} + +  {{content.status}} - + {{actionDesc}} - {{/if}} -
+ + {{/if}} +
{{/if}} - +
-
{{t common.details}} {{t common.edit}}
+
{{t common.details}} +
-

{{t mirroring.dataset.source}}: {{view.dataset.sourceClusterName}}

+

{{t mirroring.dataset.target}}: {{view.dataset.targetCluster.clusterName}}

+

{{t mirroring.dataset.sourceDir}}: {{view.dataset.sourceDir}}

+

{{t mirroring.dataset.filespec}}: {{view.dataset.filespec}}

-

{{t mirroring.dataset.target}}: {{view.dataset.targetClusterName}}

-
{{t common.stats}}
-
-

{{t mirroring.dataset.avgData}}: {{view.dataset.avgData}}

- -

{{t mirroring.dataset.dateCreated}}: {{view.dataset.createdDate}}

@@ -65,12 +65,6 @@ {{view view.parentView.idSort}} {{view view.parentView.startSort}} {{view view.parentView.endSort}} - {{view view.parentView.durationSort}} - {{view view.parentView.dataSort}} - - {{t common.status}} - - {{/view}} @@ -78,8 +72,6 @@ {{view view.idFilterView}} {{view view.startFilterView}} {{view view.endFilterView}} - {{view view.durationFilterView}} - {{view view.dataFilterView}} @@ -88,41 +80,12 @@ {{#view view.JobView contentBinding="job"}} + {{unbound job.id}} {{view.startFormatted}} {{view.endFormatted}} - - - {{view.durationFormatted}} - - - {{job.data}} - - - {{#if view.canActionBeTaken}} -
- - {{view.content.status}} - - -
    - {{#each view.listOfOptions}} -
  • - {{title}} -
    • - {{/each}} -
-
- {{else}} - {{#if view.isKilled}} - {{view.content.status}} - {{else}} - {{view.content.status}} - {{/if}} - {{/if}} - {{/view}} {{/each}} {{else}} @@ -149,4 +112,4 @@
- \ No newline at end of file +