azkaban-developers

Issue #169 - Make graph CSS styles more reusable and accommodate

2/12/2014 10:12:53 AM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm b/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm
index fdc224f..04b71a4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowgraphview.vm
@@ -15,17 +15,20 @@
 *#
 
 	## Graph view.
+
 		<div class="container-full container-fill" id="graphView">
-			<div class="glyphicon glyphicon-th-list" id="open-joblist-btn" title="Open Job List Panel"></div>
-			<div class="graph-sidebar">
+			<div class="graph-sidebar-open" id="open-joblist-btn">
+				<span class="glyphicon glyphicon-th-list" title="Open Job List Panel"></span>
+			</div>
+			<div class="graph-sidebar-float">
 				<div class="panel panel-default" id="joblist-panel">
 					<div class="panel-heading">
-						<div id="close-btn" title="Close Panel"><span class="glyphicon glyphicon-remove"></span></div>
-						<div id="inputbox-panel">
+						<div class="graph-sidebar-close" id="close-btn" title="Close Panel"><span class="glyphicon glyphicon-remove"></span></div>
+						<div class="graph-sidebar-search">
 							<input id="filter" type="text" placeholder="Job Filter" class="form-control input-sm">
 						</div>
 					</div>
-					<div id="joblist"></div>
+					<div id="joblist" class="graph-sidebar-list"></div>
 					<div class="panel-footer">
 						<button type="button" class="btn btn-sm btn-default" id="resetPanZoomBtn">Reset Pan Zoom</button>
 						<button type="button" class="btn btn-sm btn-default" id="autoPanZoomBtn" data-toggle="button">Auto Pan Zoom</button>
@@ -33,9 +36,9 @@
 				</div><!-- /.panel -->
 			</div>
 			<div class="col-content">
-				<div id="svgDiv" class="well well-clear well-sm">
+				<div id="svgDiv" class="well well-clear well-sm graph-container">
 					<svg id="flow-graph" xmlns="http://www.w3.org/2000/svg" version="1.1" shape-rendering="optimize-speed" text-rendering="optimize-speed">
 					</svg>
 				</div>
 			</div>
-		</div>
\ No newline at end of file
+		</div>

src/less/flow.less 59(+34 -25)

diff --git a/src/less/flow.less b/src/less/flow.less
index 9387933..d68a63f 100644
--- a/src/less/flow.less
+++ b/src/less/flow.less
@@ -1,7 +1,3 @@
-#svgDiv {
-  height: 100%;
-}
-
 #graphView {
    -moz-user-select: none;
    -khtml-user-select: none;
@@ -9,11 +5,6 @@
    user-select: none;
 }
 
-#flow-graph {
-  width: 100%;
-  height: 100%;
-}
-
 #headertabs {
    -moz-user-select: none;
    -khtml-user-select: none;
@@ -168,17 +159,48 @@ td {
 }
 
 .graph-sidebar {
+  height: 100%;
+  overflow-y: auto;
+
+  .graph-sidebar-list {
+    height: 100%;
+  }
+}
+
+.graph-sidebar-float {
   position: absolute;
   top: 0px;
   bottom: 0px;
+
+  .graph-sidebar-list {
+    overflow-y: auto;
+    height: calc(~"100% - 102px");
+  }
+
+  .panel {
+    height: 100%;
+    
+    .panel-heading {
+      padding-right: 10px;
+    }
+  }
+}
+
+.graph-container {
+  height: 100%;
+
+  svg {
+    width: 100%;
+    height: 100%;
+  }
 }
 
-#inputbox-panel {
+.graph-sidebar-search {
 	width: 206px;
 	margin: 0px;
 }
 
-#close-btn {
+.graph-sidebar-close {
 	float: right;
 	color: #CCC;
 	padding: 5px 0px;
@@ -189,15 +211,7 @@ td {
 	}
 }
 
-#joblist-panel {
-	height: 100%;
-	
-	.panel-heading {
-		padding-right: 10px;
-	}
-}
-
-#open-joblist-btn {
+.graph-sidebar-open {
 	position: absolute;
 	margin: 10px;
 	color: #CCC;
@@ -208,11 +222,6 @@ td {
 	}
 }
 
-// TODO: Rename this as #job-list
-#joblist {
-  overflow-y: auto;
-  height: calc(~"100% - 102px");
-}
 ul.tree-list {
   list-style-type: none;
   padding-left: 0px;