浏览代码

AMBARI-6661. Graph scale issue. (onechiporenko)

Oleg Nechiporenko 11 年之前
父节点
当前提交
a1e8f545ce

+ 4 - 13
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;

+ 15 - 27
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>