azkaban-developers
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 21e1713..17c197f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -80,38 +80,42 @@
## Page header
<div class="az-page-header">
- <div class="container">
- <h1>
- <a href="${context}/executor?execid=${execid}">Flow Execution <small>$execid</small></a>
- </h1>
+ <div class="container" id="flow-status">
+ <div class="row">
+ <div class="col-lg-7">
+ <h1>
+ <a href="${context}/executor?execid=${execid}">
+ Flow Execution <small>$execid <span id="flowStatus">-</span></small>
+ </a>
+ </h1>
+ </div>
+ <div class="col-lg-5">
+ <div class="az-exflow-stats">
+ <div class="col-md-5">
+ <p><strong>Submit User</strong> <span id="submitUser">-</span></p>
+ <p><strong>Duration</strong> <span id="duration">-</span></p>
+ </div>
+ <div class="col-md-7">
+ <p><strong>Start Time</strong> <span id="startTime">-</span></p>
+ <p><strong>End Time</strong> <span id="endTime">-</span></p>
+ </div>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+ </div>
</div>
</div>
<div class="container">
## Breadcrumb
+
<ol class="breadcrumb">
<li><a href="${context}/manager?project=${projectName}"><strong>Project</strong> $projectName</a></li>
<li><a href="${context}/manager?project=${projectName}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
<li class="active"><strong>Execution</strong> $execid</li>
</ol>
- ## Flow status
-
- <div class="well">
- <div class="row" id="flow-status">
- <div class="col-lg-6">
- <p><strong>Status</strong> <span id="flowStatus">-</span></p>
- <p><strong>Submit User</strong> <span id="submitUser">-</span></p>
- </div>
- <div class="col-lg-6">
- <p><strong>Start Time</strong> <span id="startTime">-</span></p>
- <p><strong>End Time</strong> <span id="endTime">-</span></p>
- <p><strong>Duration</strong> <span id="duration">-</span></p>
- </div>
- </div>
- </div>
-
## Tabs and buttons.
<ul class="nav nav-tabs" id="headertabs">
src/less/bootstrap-azkaban.less 14(+9 -5)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 4a85270..2cf664b 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -277,6 +277,10 @@ td.flow-summary-value {
margin-top: 20px;
}
+.az-exflow-stats {
+ margin-top: 10px;
+}
+
.contextMenu {
position: absolute;
background-color: #FFF;
@@ -362,11 +366,11 @@ td.flow-summary-value {
}
&.SUCCEEDED {
- background-color: #82b859;
+ background-color: #5cb85c;
}
&.FAILED {
- background-color: #c82123;
+ background-color: #d9534f;
}
&.RUNNING {
@@ -396,11 +400,11 @@ td {
margin-top: 2px;
&.SUCCEEDED {
- background-color: #82b859;
+ background-color: #5cb85c;
}
&.FAILED {
- background-color: #c82123;
+ background-color: #d9534f;
}
&.PAUSED {
@@ -428,7 +432,7 @@ td {
}
&.KILLED {
- background-color: #cc0000;
+ background-color: #d9534f;
}
&.UNKNOWN {
src/web/js/azkaban.exflow.view.js 2(+1 -1)
diff --git a/src/web/js/azkaban.exflow.view.js b/src/web/js/azkaban.exflow.view.js
index 0209a2c..4ac616b 100644
--- a/src/web/js/azkaban.exflow.view.js
+++ b/src/web/js/azkaban.exflow.view.js
@@ -396,7 +396,7 @@ azkaban.ExecutionListView = Backbone.View.extend({
var flowLastTime = data.endTime == -1 ? (new Date()).getTime() : data.endTime;
var flowStartTime = data.startTime;
- var outerWidth = $(".outerProgress").css("width");
+ var outerWidth = $(".flow-progress").css("width");
if (outerWidth) {
if (outerWidth.substring(outerWidth.length - 2, outerWidth.length) == "px") {
outerWidth = outerWidth.substring(0, outerWidth.length - 2);