diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index bb85769..bff90bf 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -70,74 +70,76 @@
## Page header.
<div class="az-page-header">
- <div class="container">
- <h1>History</h1>
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-6">
+ <h1>History</h1>
+ </div>
+ <div class="col-lg-6">
+ <form id="search-form" method="get" class="form-inline az-page-header-form" role="form">
+ <input type="hidden" name="search" value="true">
+ <div class="form-group">
+ <div class="input-group">
+ <input type="text" id="searchtextbox" placeholder="flow name containing ..." value=#if($search_term) ${search_term} #else "" #end class="form-control input-sm" name="searchterm">
+ <span class="input-group-btn">
+ <button class="btn btn-primary btn-sm">Quick Search</button>
+ <button type="button" class="btn btn-success btn-sm" id="adv-filter-btn">Advanced Filter</button>
+ </span>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-12">
- <div class="panel panel-default">
- <div class="panel-heading">
- <form id="search-form" method="get" class="form-inline" role="form">
- <input type="hidden" name="search" value="true">
- <div class="form-group">
- <div class="input-group">
- <input type="text" id="searchtextbox" placeholder="flow name containing ..." value=#if($search_term) ${search_term} #else "" #end class="form-control" name="searchterm">
- <span class="input-group-btn">
- <button class="btn btn-primary">Quick Search</button>
- <button type="button" class="btn btn-success" id="adv-filter-btn">Advanced Filter</button>
- </span>
- </div>
- </div>
- </form>
- </div>
- <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">
- <thead>
- <tr>
- <th class="execid">Execution Id</th>
- <th>Flow</th>
- <th>Project</th>
- <th>User</th>
- <th class="date">Start Time</th>
- <th class="date">End Time</th>
- <th class="elapse">Elapsed</th>
- <th class="status">Status</th>
- <th class="action">Action</th>
- </tr>
- </thead>
- <tbody>
+ <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">
+ <thead>
+ <tr>
+ <th class="execid">Execution Id</th>
+ <th>Flow</th>
+ <th>Project</th>
+ <th>User</th>
+ <th class="date">Start Time</th>
+ <th class="date">End Time</th>
+ <th class="elapse">Elapsed</th>
+ <th class="status">Status</th>
+ <th class="action">Action</th>
+ </tr>
+ </thead>
+ <tbody>
#if (!$flowHistory.isEmpty())
#foreach ($flow in $flowHistory)
- <tr>
- <td class="tb-name execId">
- <a href="${context}/executor?execid=${flow.executionId}">${flow.executionId}</a>
- </td>
- <td class="tb-name">
- <a href="${context}/executor?execid=${flow.executionId}">${flow.flowId}</a>
- </td>
- <td>
- <a href="${context}/manager?project=$vmutils.getProjectName(${flow.projectId})">$vmutils.getProjectName(${flow.projectId})</a>
- </td>
- <td>${flow.submitUser}</td>
- <td>$utils.formatDate(${flow.startTime})</td>
- <td>$utils.formatDate(${flow.endTime})</td>
- <td>$utils.formatDuration(${flow.startTime}, ${flow.endTime})</td>
- <td>
- <div class="status ${flow.status}">$utils.formatStatus(${flow.status})</div>
- </td>
- <td></td>
- </tr>
+ <tr>
+ <td class="tb-name execId">
+ <a href="${context}/executor?execid=${flow.executionId}">${flow.executionId}</a>
+ </td>
+ <td class="tb-name">
+ <a href="${context}/executor?execid=${flow.executionId}">${flow.flowId}</a>
+ </td>
+ <td>
+ <a href="${context}/manager?project=$vmutils.getProjectName(${flow.projectId})">$vmutils.getProjectName(${flow.projectId})</a>
+ </td>
+ <td>${flow.submitUser}</td>
+ <td>$utils.formatDate(${flow.startTime})</td>
+ <td>$utils.formatDate(${flow.endTime})</td>
+ <td>$utils.formatDuration(${flow.startTime}, ${flow.endTime})</td>
+ <td>
+ <div class="status ${flow.status}">$utils.formatStatus(${flow.status})</div>
+ </td>
+ <td></td>
+ </tr>
#end
#else
- <tr>
- <td class="last" colspan="9">No History Results Found</td>
- </tr>
+ <tr>
+ <td class="last" colspan="9">No History Results Found</td>
+ </tr>
#end
- </tbody>
- </table>
- </div><!-- /panel -->
+ </tbody>
+ </table>
<ul class="pagination" id="pageSelection">
#if ($search)
<li id="previous" class="first"><a href="${context}/history?page=${previous.page}&size=${previous.size}&search=true&searchterm=${search_term}"><span class="arrow">←</span>Previous</a></li>
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index fc278d1..acbeab0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -69,12 +69,12 @@
#end
</div>
<div class="col-lg-6">
- <form id="search-form" method="get" class="form-inline pull-right az-page-header-form" role="form">
+ <form id="search-form" method="get" class="form-inline az-page-header-form" role="form">
<input type="hidden" name="doaction" value="search">
#if ($allProjects)
<input type="hidden" name="all" value="true">
#end
- <div class="form-group col-md-8">
+ <div class="form-group col-md-9">
<div class="input-group">
<input id="search-textbox" type="text" placeholder="Project name containing..." value=#if($search_term) ${search_term} #else "" #end class="form-control input-sm" name="searchterm">
<span class="input-group-btn">
@@ -83,8 +83,12 @@
</div>
</div>
#if (!$hideCreateProject)
- <div class="form-group col-md-4" id="create-project">
- <button type="button" id="create-project-btn" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-plus"></span> Create Project</button>
+ <div class="form-group col-md-3" id="create-project">
+## Note: The Create Project button is not completely flush to the right because
+## form-group has padding.
+ <div class="pull-right">
+ <button type="button" id="create-project-btn" class="btn btn-sm btn-success"><span class="glyphicon glyphicon-plus"></span> Create Project</button>
+ </div>
</div>
#end
</form>
