azkaban-developers
Changes
src/less/header.less 16(+6 -10)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 5582114..93575b0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -69,7 +69,7 @@
</h1>
</div>
<div class="header-control">
- <div class="az-exflow-stats">
+ <div class="exflow-stats">
<div class="col-xs-5">
<p><strong>Submit User</strong> <span id="submitUser">-</span></p>
<p><strong>Duration</strong> <span id="duration">-</span></p>
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index d714510..99f111e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -70,7 +70,7 @@
<h1><a href="${context}/manager?project=${project.name}&flow=${flowid}">Flow <small>$flowid</small></a></h1>
</div>
<div class="header-control">
- <div class="pull-right">
+ <div class="pull-right header-form">
<button type="button" class="btn btn-sm btn-success" id="executebtn">Schedule / Execute Flow</button>
</div>
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 3df93ad..ed0fa38 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -50,7 +50,7 @@
<h1><a href="${context}/history">History</a></h1>
</div>
<div class="header-control">
- <form id="search-form" method="get" class="form-inline az-page-header-form" role="form">
+ <form id="search-form" method="get" class="form-inline header-form" role="form">
<input type="hidden" name="search" value="true">
<div class="form-group">
<div class="input-group">
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 3e8eef8..ef42c09 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -45,7 +45,7 @@
<h1><a href="${context}/index">Projects</a></h1>
</div>
<div class="header-control">
- <form id="search-form" method="get" class="form-inline az-page-header-form" role="form">
+ <form id="search-form" method="get" class="form-inline header-form" role="form">
<input type="hidden" name="doaction" value="search">
#if ($viewProjects == 'all')
<input type="hidden" name="all" value="true">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm
index 5b172c8..5037f49 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailsheader.vm
@@ -19,11 +19,11 @@
<div class="az-page-header">
<div class="container-full">
<div class="row">
- <div class="col-xs-6">
+ <div class="header-title">
<h1><a href="${context}/executor?execid=${execid}&job=${jobid}">Job Execution <small>$jobid</small></a></h1>
</div>
- <div class="col-xs-6">
- <div class="pull-right az-page-header-form">
+ <div class="header-control">
+ <div class="pull-right header-form">
<a href="${context}/manager?project=${projectName}&flow=${parentflowid}&job=$jobname" class="btn btn-info">Job Properties</a>
</div>
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 61fd82e..179cf8d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -47,11 +47,11 @@
<div class="az-page-header">
<div class="container-full">
<div class="row">
- <div class="col-xs-6">
+ <div class="header-title">
<h1><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job <small>$jobid</small></a></h1>
</div>
- <div class="col-xs-6">
- <div class="pull-right az-page-header-form">
+ <div class="header-control">
+ <div class="pull-right header-form">
<a href="${context}/manager?project=${project.name}&job=$jobid&history" class="btn btn-info btn-sm">History</a>
</div>
<div class="clearfix"></div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm b/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm
index cf4c085..80a4a08 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm
@@ -21,7 +21,7 @@
<h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
</div>
<div class="header-control">
- <div class="pull-right" id="project-options">
+ <div class="header-form pull-right" id="project-options">
<button id="project-delete-btn" class="btn btn-sm btn-danger">
<span class="glyphicon glyphicon-trash"></span> Delete Project
</button>
src/less/header.less 16(+6 -10)
diff --git a/src/less/header.less b/src/less/header.less
index 5b10f0e..3e25b84 100644
--- a/src/less/header.less
+++ b/src/less/header.less
@@ -6,7 +6,7 @@
h1 {
font-size: 22px;
- margin: 4px 0 2px 0;
+ margin: 9px 0 7px 0;
font-weight: 400;
small {
@@ -23,15 +23,11 @@
}
}
- .az-page-header-form {
- margin-top: 20px;
- }
-
- .az-exflow-stats {
- margin-top: 10px;
+ .exflow-stats {
+ margin: 0px;
p {
- margin-bottom: 5px;
+ margin: 0px;
}
}
@@ -46,8 +42,8 @@
padding-right: 15px;
width: 500px;
- form {
- margin: 0;
+ .header-form {
+ margin: 5px 0 0 0;
}
.form-group {