diff --git a/src/java/azkaban/webapp/servlet/ExecutorServlet.java b/src/java/azkaban/webapp/servlet/ExecutorServlet.java
index a0adf57..55f5d5b 100644
--- a/src/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/src/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -132,15 +132,9 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
else if (ajaxName.equals("fetchExecJobLogs")) {
ajaxFetchJobLogs(req, resp, ret, session.getUser(), exFlow);
}
-<<<<<<< HEAD
- else if (ajaxName.equals("fetchExecJobSummary")) {
- ajaxFetchJobSummary(req, resp, ret, session.getUser(), exFlow);
- }
else if (ajaxName.equals("fetchExecJobStats")) {
ajaxFetchJobStats(req, resp, ret, session.getUser(), exFlow);
}
-=======
->>>>>>> master
else if (ajaxName.equals("retryFailedJobs")) {
ajaxRestartFailed(req, resp, ret, session.getUser(), exFlow);
}
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index 4f8aa93..ee8aee3 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -113,51 +113,49 @@
<div class="container-full" id="jobSummaryView">
<div class="row">
<div class="col-lg-12">
- <div class="panel panel-default">
- <div class="panel-heading">
- <div class="pull-left">
- <button type="button" id="updateSummaryBtn" class="btn btn-xs btn-default">Refresh</button>
- </div>
-
+ <h3>
+ Job Summary
+ <div class="pull-right">
+ <button type="button" id="updateSummaryBtn" class="btn btn-xs btn-default">Refresh</button>
</div>
+ </h3>
- <div class="panel panel-default" id="commandSummary">
- <div class="panel-heading">Command Summary</div>
- <table id="commandTable" class="table table-striped table-bordered table-hover">
- </table>
- </div>
-
- <div class="panel panel-default" id="pigJobSummary">
- <div class="panel-heading">Pig Job Summary</div>
- <table class="table table-striped table-bordered table-hover">
- <thead id="summaryHeader">
- </thead>
- <tbody id="summaryBody">
- </tbody>
- </table>
- </div>
-
- <div class="panel panel-default" id="pigJobStats">
- <div class="panel-heading">Pig Job Stats</div>
- <div class="panel-body panel-body-stats">
- <table class="table table-striped table-bordered table-hover table-condensed">
- <thead id="statsHeader">
- </thead>
- <tbody id="statsBody">
- </tbody>
- </table>
- </div>
+ <div id="command-summary">
+ <h4>Command Summary</h4>
+ <table id="commandTable" class="table table-striped table-bordered table-hover">
+ </table>
+ </div>
+
+ <div id="pigJobSummary">
+ <h4>Pig Job Summary</h4>
+ <table class="table table-striped table-bordered table-hover">
+ <thead id="summaryHeader">
+ </thead>
+ <tbody id="summaryBody">
+ </tbody>
+ </table>
+ </div>
+
+ <div id="pigJobStats">
+ <h4>Pig Job Stats</h4>
+ <div class="panel-body-stats">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead id="statsHeader">
+ </thead>
+ <tbody id="statsBody">
+ </tbody>
+ </table>
</div>
+ </div>
- <div class="panel panel-default" id="hiveJobSummary">
- <div class="panel-heading">Hive Job Summary</div>
- <table class="table table-striped table-bordered table-hover" id="hiveTable">
- <thead id="hiveTableHeader">
- </thead>
- <tbody id="hiveTableBody">
- </tbody>
- </table>
- </div>
+ <div id="hiveJobSummary">
+ <h4>Hive Job Summary</h4>
+ <table class="table table-striped table-bordered table-hover" id="hiveTable">
+ <thead id="hiveTableHeader">
+ </thead>
+ <tbody id="hiveTableBody">
+ </tbody>
+ </table>
</div>
</div>
</div>
