You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/05/29 04:15:57 UTC
svn commit: r1487207 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/styles/apps.less
ambari-web/app/templates/main/apps/item/dag.hbs
ambari-web/vendor/styles/cubism.css
Author: yusaku
Date: Wed May 29 02:15:57 2013
New Revision: 1487207
URL: http://svn.apache.org/r1487207
Log:
AMBARI-2219. Add a legend to Job Timeline. (billie via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/styles/apps.less
incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/dag.hbs
incubator/ambari/trunk/ambari-web/vendor/styles/cubism.css
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487207&r1=1487206&r2=1487207&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 02:15:57 2013
@@ -309,6 +309,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-2199. Add a legend to Job Timeline. (billie via yusaku)
+
AMBARI-2212. Change config loading mechanism to allow for different
stack versions. (yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/styles/apps.less
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/styles/apps.less?rev=1487207&r1=1487206&r2=1487207&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/styles/apps.less (original)
+++ incubator/ambari/trunk/ambari-web/app/styles/apps.less Wed May 29 02:15:57 2013
@@ -466,6 +466,58 @@
visibility: hidden;
}
}
+ #dag_viewer_legend {
+ border: 1px solid #DDDDDD;
+ padding: 10px;
+ padding-left: 20px;
+ float: left;
+ ul {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+ }
+ li {
+ display: block;
+ width: 25%;
+ float: left;
+ }
+ span {
+ width: 15px;
+ height: 15px;
+ display: block;
+ float: left;
+ margin-right: 5px;
+ }
+ #job {
+ border: 1px solid #333;
+ background: #ccc;
+ }
+ #jobdone {
+ border: 1px solid #333;
+ background: rgba(0,128,0,0.8);
+ }
+ #allmap {
+ border: 2px solid #007000;
+ }
+ #map {
+ border: 2px solid #007000;
+ background: rgba(0,128,0,0.8);
+ }
+ #allshuffle {
+ border: 2px solid #97BDC9;
+ }
+ #shuffle {
+ border: 2px solid #97BDC9;
+ background: rgba(173,216,230,0.8);
+ }
+ #allreduce {
+ border: 2px solid #3D729E;
+ }
+ #reduce {
+ border: 2px solid #3D729E;
+ background: rgba(70,130,180,0.8);
+ }
+ }
}
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/dag.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/dag.hbs?rev=1487207&r1=1487206&r2=1487207&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/dag.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/apps/item/dag.hbs Wed May 29 02:15:57 2013
@@ -17,6 +17,19 @@
}}
<div id="dag_viewer"></div>
+ <div id="dag_viewer_legend">
+ <ul>
+ <li><span id="job"></span>Unfinished Job</li>
+ <li><span id="allmap"></span>All Maps on Cluster</li>
+ <li><span id="allshuffle"></span>All Shuffles on Cluster</li>
+ <li><span id="allreduce"></span>All Reduces on Cluster</li>
+ <li><span id="jobdone"></span>Finished Job</li>
+ <li><span id="map"></span>Maps for this App</li>
+ <li><span id="shuffle"></span>Shuffles for this App</li>
+ <li><span id="reduce"></span>Reduces for this App</li>
+ </ul>
+ </div>
+
<table class="table table-bordered table-striped" id="innerTable">
<thead>
<tr>
Modified: incubator/ambari/trunk/ambari-web/vendor/styles/cubism.css
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/vendor/styles/cubism.css?rev=1487207&r1=1487206&r2=1487207&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/vendor/styles/cubism.css (original)
+++ incubator/ambari/trunk/ambari-web/vendor/styles/cubism.css Wed May 29 02:15:57 2013
@@ -43,7 +43,7 @@
#dag_viewer rect {
fill: #ccc;
stroke: #333;
- stroke-width: 1.5px;
+ stroke-width: 1px;
}
#dag_viewer rect.finished {