azkaban-uncached
Changes
src/java/azkaban/webapp/servlet/velocity/index.vm 126(+63 -63)
src/less/bootstrap-azkaban.less 4(+4 -0)
Details
src/java/azkaban/webapp/servlet/velocity/index.vm 126(+63 -63)
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 3b99772..fc278d1 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -59,12 +59,37 @@
## Page Header and project search form.
<div class="az-page-header">
- <div class="container">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-6">
#if ($allProjects)
- <h1>All Projects</h1>
+ <h1>All Projects</h1>
#else
- <h1>My Projects</h1>
+ <h1>My Projects</h1>
#end
+ </div>
+ <div class="col-lg-6">
+ <form id="search-form" method="get" class="form-inline pull-right 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="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">
+ <button class="btn btn-sm btn-primary">Quick Search</button>
+ </span>
+ </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>
+#end
+ </form>
+ </div>
+ </div>
</div>
</div>
@@ -73,71 +98,46 @@
<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">
- <fieldset>
- <input type="hidden" name="doaction" value="search">
-#if ($allProjects)
- <input type="hidden" name="all" value="true">
-#end
- <div class="form-group col-md-10">
- <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" name="searchterm">
- <span class="input-group-btn">
- <button class="btn btn-primary">Quick Search</button>
- </span>
- </div>
- </div>
-#if (!$hideCreateProject)
- <div class="form-group col-md-2" id="create-project">
- <button type="button" id="create-project-btn" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> Create Project</button>
- </div>
-#end
- </fieldset>
- </form>
- </div>
- <table class="table table-striped table-bordered table-hover" id="all-jobs">
- <thead>
- <tr>
- <th class="tb-name">Name</th>
- <th class="tb-up-date">Modified Date</th>
- <th class="tb-owner">Modified By</th>
- </tr>
- </thead>
- <tbody>
+ <table class="table table-striped table-bordered table-hover" id="all-jobs">
+ <thead>
+ <tr>
+ <th class="tb-name">Name</th>
+ <th class="tb-up-date">Modified Date</th>
+ <th class="tb-owner">Modified By</th>
+ </tr>
+ </thead>
+ <tbody>
#if(!$projects.isEmpty())
#foreach($project in $projects)
- <tr>
- <td id="${project.name}" class="tb-name project-expand expanded">
- <span class="glyphicon glyphicon-plus"></span>
- <a href="${context}/manager?project=${project.name}">$project.name</a>
- </td>
- <td class="tb-up-date">$utils.formatDate($project.lastModifiedTimestamp)</td>
- <td class="tb-owner">$project.lastModifiedUser</td>
- </tr>
- <tr class="childrow collapse" id="${project.name}-child">
- <td colspan="3">
- <table class="table table-bordered">
- <thead>
- <tr>
- <th class="tb-name">Flows</th>
- </tr>
- </thead>
- <tbody id="${project.name}-tbody">
- </tbody>
- </table>
- </td>
- </tr>
+ <tr>
+ <td id="${project.name}" class="tb-name project-expand expanded">
+ <span class="glyphicon glyphicon-plus"></span>
+ <a href="${context}/manager?project=${project.name}">$project.name</a>
+ </td>
+ <td class="tb-up-date">$utils.formatDate($project.lastModifiedTimestamp)</td>
+ <td class="tb-owner">$project.lastModifiedUser</td>
+ </tr>
+ <tr class="childrow collapse" id="${project.name}-child">
+ <td colspan="3">
+ <table class="table table-bordered">
+ <thead>
+ <tr>
+ <th class="tb-name">Flows</th>
+ </tr>
+ </thead>
+ <tbody id="${project.name}-tbody">
+ </tbody>
+ </table>
+ </td>
+ </tr>
#end
#else
- <tr>
- <td colspan="3">No viewable projects found.</td>
- </tr>
+ <tr>
+ <td colspan="3">No viewable projects found.</td>
+ </tr>
#end
- </tbody>
- </table>
- </div>
+ </tbody>
+ </table>
</div>
</div>
src/less/bootstrap-azkaban.less 4(+4 -0)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 405d765..cd5ca51 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -265,6 +265,10 @@ td.worksheet-key {
}
}
+.az-page-header-form {
+ margin-top: 20px;
+}
+
.contextMenu {
position: absolute;
background-color: #FFF;