You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/07/29 19:08:39 UTC
git commit: AMBARI-6661. Graph scale issue. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 968ac4cdf -> a1e8f545c
AMBARI-6661. Graph scale issue. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1e8f545
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1e8f545
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1e8f545
Branch: refs/heads/trunk
Commit: a1e8f545ce8cfd3770077d148d3ff7d71563be61
Parents: 968ac4c
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue Jul 29 20:05:06 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue Jul 29 20:05:06 2014 +0300
----------------------------------------------------------------------
.../src/main/resources/ui/app/styles/main.less | 17 ++------
.../main/resources/ui/app/templates/job/job.hbs | 42 +++++++-------------
2 files changed, 19 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e8f545/contrib/views/jobs/src/main/resources/ui/app/styles/main.less
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/styles/main.less b/contrib/views/jobs/src/main/resources/ui/app/styles/main.less
index dafb275..ce87bff 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/styles/main.less
+++ b/contrib/views/jobs/src/main/resources/ui/app/styles/main.less
@@ -29,24 +29,15 @@ a {
cursor: pointer;
}
-/*.tooltip {
- z-index: 10000;
-}*/
.icon-remove-sign {
color: #FF4B4B;
}
-
-/*.tooltip-inner {
- text-align: left;
-}*/
-
-/*.jobs-tooltip {
- .tooltip-inner {
- max-width: 400px;
- }
-}*/
+.hidden {
+ display: none;
+ visibility: hidden;
+}
.box {
border: 1px solid #D4D4D4;
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e8f545/contrib/views/jobs/src/main/resources/ui/app/templates/job/job.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/src/main/resources/ui/app/templates/job/job.hbs b/contrib/views/jobs/src/main/resources/ui/app/templates/job/job.hbs
index 9e9b6ef..aab95d7 100644
--- a/contrib/views/jobs/src/main/resources/ui/app/templates/job/job.hbs
+++ b/contrib/views/jobs/src/main/resources/ui/app/templates/job/job.hbs
@@ -24,29 +24,19 @@
<a {{action "actionRouteToJobs" target="controller"}} href="#">{{t menu.item.jobs}}</a> > {{view.content.name}}
<a {{action "toggleShowQuery" target="view"}} href="#" id="toggle-query">{{view.toggleShowQueryText}}</a>
- <div class="pull-right">Job Type: <span class="label label-info">{{view.content.jobType}}</span></div>
+ <div class="pull-right">{{t apps.item.dag.type}}: <span class="label label-info">{{view.content.jobType}}</span></div>
<div class="alert alert-info query-info">
<table id="job-more-details-table">
<tr>
- <td>
- {{t jobs.hive.query}}
- </td>
- <td>
- {{view.content.queryText}}
- </td>
+ <td>{{t jobs.hive.query}}</td>
+ <td>{{view.content.queryText}}</td>
</tr>
<tr>
- <td>
- {{t jobs.hive.yarnApplication}}
- </td>
- <td>
- {{view.content.tezDag.yarnApplicationId}}
- </td>
+ <td>{{t jobs.hive.yarnApplication}}</td>
+ <td>{{view.content.tezDag.yarnApplicationId}}</td>
</tr>
<tr>
- <td>
- {{t jobs.hive.stages}}
- </td>
+ <td>{{t jobs.hive.stages}}</td>
<td>
<ol>
{{#each stage in view.content.stages}}
@@ -103,17 +93,15 @@
</div>
</div>
<div id="tez-dag-section-body">
- {{#if controller.loaded}}
- {{view App.MainHiveJobDetailsTezDagView
- contentBinding="view.content"
- tezDagBinding="view.content.tezDag"
- selectedVertexBinding="view.selectedVertex"
- summaryMetricTypeBinding="view.summaryMetricType"
- zoomScaleBinding="view.zoomScale"
- zoomScaleFromBinding="view.zoomScaleFrom"
- zoomScaleToBinding="view.zoomScaleTo"
- }}
- {{/if}}
+ {{view App.MainHiveJobDetailsTezDagView
+ contentBinding="view.content"
+ tezDagBinding="view.content.tezDag"
+ selectedVertexBinding="view.selectedVertex"
+ summaryMetricTypeBinding="view.summaryMetricType"
+ zoomScaleBinding="view.zoomScale"
+ zoomScaleFromBinding="view.zoomScaleFrom"
+ zoomScaleToBinding="view.zoomScaleTo"
+ }}
</div>
</div>
</div>