azkaban-uncached
Changes
src/java/azkaban/webapp/servlet/velocity/propertypage.vm 169(+103 -66)
Details
src/java/azkaban/webapp/servlet/velocity/propertypage.vm 169(+103 -66)
diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index d771ca6..192c105 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -16,13 +16,10 @@
<!DOCTYPE html>
<html>
- <head>
-#parse( "azkaban/webapp/servlet/velocity/style.vm" )
- <script type="text/javascript" src="${context}/js/jquery/jquery-1.9.1.js"></script>
- <script type="text/javascript" src="${context}/js/underscore-1.4.4-min.js"></script>
- <script type="text/javascript" src="${context}/js/namespace.js"></script>
- <script type="text/javascript" src="${context}/js/backbone-0.9.10-min.js"></script>
- <script type="text/javascript" src="${context}/js/jquery.simplemodal-1.4.4.js"></script>
+ <head lang="en">
+
+#parse("azkaban/webapp/servlet/velocity/style2.vm")
+#parse ("azkaban/webapp/servlet/velocity/javascript.vm")
<script type="text/javascript" src="${context}/js/azkaban.nav.js"></script>
<script type="text/javascript">
@@ -36,73 +33,113 @@
</script>
</head>
<body>
+
#set($current_page="all")
-#parse( "azkaban/webapp/servlet/velocity/nav.vm" )
- <div class="messaging"><p id="messageClose">X</p><p id="message"></p></div>
+#parse("azkaban/webapp/servlet/velocity/nav2.vm")
+
+ <div class="container">
-#if($errorMsg)
- <div class="box-error-message">$errorMsg</div>
-#else
- <div class="content">
- #if($error_message != "null")
- <div class="box-error-message">$error_message</div>
- #elseif($success_message != "null")
- <div class="box-success-message">$success_message</div>
- #end
- <div id="all-jobs-content">
- <div class="section-hd">
- <h2><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=${property}">Property <span>$property</span></a></h2>
- <div class="section-sub-hd">
- <h4><a href="${context}/manager?project=${project.name}">Project <span>$project.name</span></a></h4>
- <h4 class="separator">></h4>
- <h4><a href="${context}/manager?project=${project.name}&flow=${flowid}">Flow <span>$flowid</span></a></h4>
- <h4 class="separator">></h4>
- <h4><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job <span>$jobid</span></a></h4>
- </div>
+## Page error or success message.
+
+#if ($errorMsg)
+ <div class="panel panel-danger">
+ <div class="panel-heading">Error</div>
+ <div class="panel-body">
+ $errorMsg
</div>
</div>
-
- <div id="property-summary">
- <table class="summary-table">
- <tr><td class="first">Inherited From:</td><td>
-#if ($inheritedproperties)
-#foreach($inheritedproperty in $inheritedproperties)
- <a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=$inheritedproperty">$inheritedproperty</a>
-#end
#else
- <span>No Inherited Properties</span>
-#end
- </td></tr>
- <tr><td class="first">Source Of:</td><td>
-#if ($dependingproperties)
-#foreach($dependingproperty in $dependingproperties)
- <span class="nowrap"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=$dependingproperty">$dependingproperty</a></span>
-#end
-#else
- <span>No Dependents</span>
-#end
- </td></tr>
+ #if ($error_message != "null")
+ <div class="alert alert-danger">$error_message</div>
+ #elseif ($success_message != "null")
+ <div class="alert alert-success">$success_message</div>
+ #end
- </table>
+ ## Page header
+
+ <div class="page-header">
+ <h1>
+ <a href="${context}/manager?project=${project.name}">$project.name</a> /
+ <a href="${context}/manager?project=${project.name}&flow=${flowid}">$flowid</a>
+ </h1>
</div>
-
- <table id="all-jobs" class="all-jobs job-table parameters">
- <thead>
- <tr>
- <th class="tb-pname">Parameter Name</th>
- <th class="tb-pvalue">Value</th>
- </tr>
- </thead>
- <tbody>
-#foreach($parameter in $parameters)
- <tr>
- <td class="first">$parameter.first</td><td>$parameter.second</td>
- </tr>
-#end
- </tbody>
- </table>
- </div>
+
+ <div class="row">
+ <div class="col-lg-8">
+
+ ## Breadcrumb
+
+ <ol class="breadcrumb">
+ <li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
+ <li><a href="${context}/manager?project=${project.name}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
+ <li><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
+ </ol>
+
+ ## Tabs
+
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Properties</a></li>
+ <li><a id="jobs-logs-btn" href="${context}/manager?project=${project.name}&job=$jobid&history">History</a></li>
+ </ul>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">Property $property</div>
+
+ <table id="all-jobs" class="table table-striped table-bordered">
+ <thead>
+ <tr>
+ <th class="tb-pname">Parameter Name</th>
+ <th class="tb-pvalue">Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ #foreach ($parameter in $parameters)
+ <tr>
+ <td class="first">$parameter.first</td><td>$parameter.second</td>
+ </tr>
+ #end
+ </tbody>
+ </table>
+ </div>
+ </div><!-- /col-lg-8 -->
+ <div class="col-lg-4">
+ <div class="well" id="job-summary">
+ <h4>Properties <small>$property</small></h4>
+ <p><strong>Job</strong> $jobid</p>
+ <p><strong>Job Type</strong> $jobtype</p>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">Inherited From</div>
+ <ul class="list-group">
+ #if ($inheritedproperties)
+ #foreach ($inheritedproperty in $inheritedproperties)
+ <li class="list-group-item"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=$inheritedproperty">$inheritedproperty</a></li>
+ #end
+ #else
+ <li class="list-group-item">No inherited properties.</li>
+ #end
+ </ul>
+ </div>
+
+ <div class="panel panel-default">
+ <div class="panel-heading">Source of</div>
+ <ul class="list-group">
+ #if ($dependingproperties)
+ #foreach ($dependingproperty in $dependingproperties)
+ <li class="list-group-item"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}&prop=$dependingproperty">$dependingproperty</a></li>
+ #end
+ #else
+ <li class="list-group-item">No dependents.</li>
+ #end
+ </ul>
+ </div>
+ </div>
+ </div><!-- /row -->
#end
+#parse ("azkaban/webapp/servlet/velocity/footer.vm")
+
+ </div><!-- /container -->
</body>
</html>