diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 05d4240..77346fb 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -16,13 +16,11 @@
<!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" src="${context}/js/d3.v3.min.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
@@ -59,91 +57,117 @@
</style>
</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>
-#if($errorMsg)
- <div class="box-error-message">$errorMsg</div>
+#set ($current_page="all")
+#parse ("azkaban/webapp/servlet/velocity/nav2.vm")
+
+ <div class="container">
+
+#if ($errorMsg)
+ <div class="panel panel-danger">
+ <div class="panel-heading">Error</div>
+ <div class="panel-body">
+ $errorMsg
+ </div>
+ </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>
+ #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
- <div id="all-jobs-content">
- <div class="section-hd">
- <h2><a href="${context}/manager?project=${projectName}&job=${jobid}&history">Job History <span>$jobid</span></a></h2>
- <div class="section-sub-hd">
- <h4><a href="${context}/manager?project=${projectName}">Project <span>$projectName</span></a></h4>
- <h4 class="separator">></h4>
- <h4><a href="${context}/manager?project=${projectName}&job=${jobid}&history">Job History <span>$jobid</span></a></h4>
- </div>
- </div>
+
+ ## Alert message
+
+ <div class="alert alert-dismissable alert-messaging" id="messaging">
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+ <p id="messaging-message"></p>
</div>
-
- <div id="timeGraph">
+
+ ## 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>
+
+ <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>
- <div class="executionInfo">
- <table id="all-jobs" class="all-jobs job-table">
- <thead>
- <tr>
- <th class="execid">Execution Id</th>
- <th class="jobid">Job</th>
- <th class="flowid">Flow</th>
- <th class="date">Start Time</th>
- <th class="date">End Time</th>
- <th class="elapse">Elapse</th>
- <th class="status">Status</th>
- <th class="logs">Logs</th>
- </tr>
- </thead>
- <tbody>
- #foreach($job in $history)
- <tr>
- <td class="first">
- #if ($job.attempt > 0)
- <a href="${context}/executor?execid=${job.execId}">${job.execId}.${job.attempt}</a>
- #else
- <a href="${context}/executor?execid=${job.execId}">${job.execId}</a>
- #end
- </td>
- <td>
- <a href="${context}/manager?project=${projectName}&flow=${job.flowId}&job=${jobid}">${jobid}</a>
- </td>
- <td>
- <a href="${context}/manager?project=${projectName}&flow=${job.flowId}">${job.flowId}</a>
- </td>
- <td>$utils.formatDate(${job.startTime})</td>
- <td>$utils.formatDate(${job.endTime})</td>
- <td>$utils.formatDuration(${job.startTime}, ${job.endTime})</td>
- <td><div class="status ${job.status}">$utils.formatStatus(${job.status})</div></td>
- <td class="logLink">
- <a href="${context}/executor?execid=${job.execId}&job=${jobid}&attempt=${job.attempt}">Logs</a>
- </td>
- </tr>
- #end
- </tbody>
- </table>
+ <div id="timeGraph"></div>
- <div id="pageSelection" class="nonjavascript">
+ <table id="all-jobs" class="all-jobs job-table">
+ <thead>
+ <tr>
+ <th class="execid">Execution Id</th>
+ <th class="jobid">Job</th>
+ <th class="flowid">Flow</th>
+ <th class="date">Start Time</th>
+ <th class="date">End Time</th>
+ <th class="elapse">Elapse</th>
+ <th class="status">Status</th>
+ <th class="logs">Logs</th>
+ </tr>
+ </thead>
+ <tbody>
+ #foreach ($job in $history)
+ <tr>
+ <td class="first">
+ #if ($job.attempt > 0)
+ <a href="${context}/executor?execid=${job.execId}">${job.execId}.${job.attempt}</a>
+ #else
+ <a href="${context}/executor?execid=${job.execId}">${job.execId}</a>
+ #end
+ </td>
+ <td>
+ <a href="${context}/manager?project=${projectName}&flow=${job.flowId}&job=${jobid}">${jobid}</a>
+ </td>
+ <td>
+ <a href="${context}/manager?project=${projectName}&flow=${job.flowId}">${job.flowId}</a>
+ </td>
+ <td>$utils.formatDate(${job.startTime})</td>
+ <td>$utils.formatDate(${job.endTime})</td>
+ <td>$utils.formatDuration(${job.startTime}, ${job.endTime})</td>
+ <td>
+ <div class="status ${job.status}">
+ $utils.formatStatus(${job.status})
+ </div>
+ </td>
+ <td class="logLink">
+ <a href="${context}/executor?execid=${job.execId}&job=${jobid}&attempt=${job.attempt}">Logs</a>
+ </td>
+ </tr>
+ #end
+ </tbody>
+ </table>
+
<ul>
<li id="previous" class="first"><a href="${context}/manager?project=${projectId}&job=${jobid}&history&page=${previous.page}&size=${previous.size}"><span class="arrow">←</span>Previous</a></li>
-
<li id="page1" #if($page1.selected) class="selected" #elseif ($page1.disabled) class="disabled" #end><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${page1.nextPage}&size=${page1.size}">${page1.page}</a></li>
<li id="page2" #if($page2.selected) class="selected" #elseif ($page2.disabled) class="disabled" #end><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${page2.nextPage}&size=${page2.size}">${page2.page}</a></li>
<li id="page3" #if($page3.selected) class="selected" #elseif ($page3.disabled) class="disabled" #end><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${page3.nextPage}&size=${page3.size}">${page3.page}</a></li>
<li id="page4" #if($page4.selected) class="selected" #elseif ($page4.disabled) class="disabled" #end><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${page4.nextPage}&size=${page4.size}">${page4.page}</a></li>
<li id="page5" #if($page5.selected) class="selected" #elseif ($page5.disabled) class="disabled" #end><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${page5.nextPage}&size=${page5.size}">${page5.page}</a></li>
-
<li id="next"><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${next.page}&size=${next.size}">Next<span class="arrow">→</span></a></li>
</ul>
- </div>
- </div>
- </div>
+
+ </div><!-- /col-lg-8 -->
+ <div class="col-lg-4">
+
+ </div><!-- /col-lg-4 -->
+ </div><!-- /row -->
#end
+ </div>
</body>
</html>
