azkaban-uncached
Changes
src/less/azkaban.less 1(+1 -0)
src/less/flow.less 5(+5 -0)
src/less/job.less 22(+0 -22)
src/less/log.less 41(+41 -0)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 2ea9b51..b0c63ca 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -148,17 +148,19 @@
<div class="container-full container-fill" id="flowLogView">
<div class="row">
<div class="col-lg-12 col-content">
- <div class="panel panel-default log-panel">
- <div class="panel-heading">
- <div class="pull-right">
- <button type="button" id="updateLogBtn" class="btn btn-xs btn-info">Refresh</button>
- </div>
- Flow log
- </div>
- <div class="panel-body log-viewer">
- <pre id="logSection"></pre>
- </div>
- </div><!-- /.panel -->
+ <div class="log-viewer">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <div class="pull-right">
+ <button type="button" id="updateLogBtn" class="btn btn-xs btn-info">Refresh</button>
+ </div>
+ Flow log
+ </div>
+ <div class="panel-body">
+ <pre id="logSection"></pre>
+ </div>
+ </div><!-- /.panel -->
+ </div><!-- /.log-viewer -->
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
</div><!-- /. -->
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm b/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm
index 7040d62..fd7be3e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm
@@ -19,17 +19,17 @@
<div class="container-full container-fill" id="graphView">
<div class="row row-offcanvas row-offcanvas-left" id="graphView">
- <div class="col-xs-6 col-sm-3 sidebar-offcanvas col-sidebar">
- <div class="panel panel-default" id="jobList">
- <div class="panel-heading">
- <input id="filter" type="text" placeholder="Job Filter" class="form-control">
- </div>
- <div id="list" class="list-group"></div>
- <div class="panel-footer">
- <button type="button" class="btn btn-sm btn-default" id="resetPanZoomBtn">Reset Pan Zoom</button>
- </div>
- </div>
- </div>
+ <div class="col-xs-6 col-sm-3 sidebar-offcanvas graph-sidebar">
+ <div class="panel panel-default" id="jobList">
+ <div class="panel-heading">
+ <input id="filter" type="text" placeholder="Job Filter" class="form-control">
+ </div>
+ <div id="list" class="list-group"></div>
+ <div class="panel-footer">
+ <button type="button" class="btn btn-sm btn-default" id="resetPanZoomBtn">Reset Pan Zoom</button>
+ </div>
+ </div><!-- /.panel -->
+ </div><!-- /.col-sidebar -->
<div class="col-xs-12 col-sm-9 col-content">
<div id="svgDiv" class="well well-clear well-sm">
<svg id="flow-graph" xmlns="http://www.w3.org/2000/svg" version="1.1" shape-rendering="optimize-speed" text-rendering="optimize-speed">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index c3791ed..b126c03 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -88,18 +88,20 @@
<div class="container-full container-fill" id="jobLogView">
<div class="row">
<div class="col-lg-12 col-content">
- <div class="panel panel-default log-panel">
- <div class="panel-heading">
- <div class="pull-right">
- <button type="button" id="updateLogBtn" class="btn btn-xs btn-default">Refresh</button>
- </div>
- Job Logs
+ <div class="log-viewer">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <div class="pull-right">
+ <button type="button" id="updateLogBtn" class="btn btn-xs btn-default">Refresh</button>
+ </div>
+ Job Logs
+ </div>
+ <div class="panel-body">
+ <pre id="logSection"></pre>
+ </div>
</div>
- <div class="panel-body log-viewer">
- <pre id="logSection"></pre>
- </div>
- </div>
- </div>
+ </div>
+ </div>
</div>
</div>
src/less/azkaban.less 1(+1 -0)
diff --git a/src/less/azkaban.less b/src/less/azkaban.less
index deed07a..da43720 100644
--- a/src/less/azkaban.less
+++ b/src/less/azkaban.less
@@ -11,3 +11,4 @@
@import "project.less";
@import "flow.less";
@import "job.less";
+@import "log.less";
src/less/flow.less 5(+5 -0)
diff --git a/src/less/flow.less b/src/less/flow.less
index a13b9d5..931f47c 100644
--- a/src/less/flow.less
+++ b/src/less/flow.less
@@ -114,6 +114,11 @@ td {
}
}
+.graph-sidebar {
+ height: 100%;
+ overflow-y: auto;
+}
+
// TODO: Rename this as #job-list
#list {
height: 100%;
src/less/job.less 22(+0 -22)
diff --git a/src/less/job.less b/src/less/job.less
index 18fc638..d531488 100644
--- a/src/less/job.less
+++ b/src/less/job.less
@@ -1,25 +1,3 @@
-.log-panel {
- width: 100%;
-}
-
-.log-viewer {
- padding: 0;
- background-color: #fcfcfc;
- height: 100%;
-
- pre {
- margin: 0;
- border: 0;
- height: 100%;
- font-size: 12px;
- background-color: transparent;
- overflow: auto;
- width: auto;
- word-wrap: normal;
- white-space: pre;
- }
-}
-
.panel-body-stats {
padding: 0;
overflow: auto;
src/less/log.less 41(+41 -0)
diff --git a/src/less/log.less b/src/less/log.less
new file mode 100644
index 0000000..368e159
--- /dev/null
+++ b/src/less/log.less
@@ -0,0 +1,41 @@
+.log-viewer {
+ height: 100%;
+ margin: 0;
+ padding: 0;
+
+ .panel {
+ height: 100%;
+
+ .panel-heading {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ height: 55px;
+ }
+
+ .panel-body {
+ position: absolute;
+ top: 55px;
+ left: 0;
+ right: 0;
+ bottom: 0;
+
+ padding: 0;
+ background-color: #fcfcfc;
+ height: 100%;
+
+ pre {
+ margin: 0;
+ border: 0;
+ height: 100%;
+ font-size: 12px;
+ background-color: transparent;
+ overflow: auto;
+ width: auto;
+ word-wrap: normal;
+ white-space: pre;
+ }
+ }
+ }
+}