azkaban-developers
Details
build.xml 24(+24 -0)
diff --git a/build.xml b/build.xml
index 7b1479b..26e9802 100644
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,7 @@
<property name="base.dir" value="${basedir}" />
<property name="dist.jar.dir" value="${basedir}/dist/jars" />
<property name="dist.dust.dir" value="${basedir}/dist/dust" />
+ <property name="dist.less.dir" value="${basedir}/dist/less" />
<property name="dist.classes.dir" value="${basedir}/dist/classes" />
<property name="dist.packages.dir" value="${basedir}/dist/packages" />
<property name="dist.web.package.dir" value="${dist.packages.dir}/azkaban-web-server" />
@@ -21,6 +22,7 @@
<property name="bin.dir" value="${basedir}/bin" />
<property name="java.src.dir" value="${basedir}/src/java" />
<property name="dust.src.dir" value="${basedir}/src/tl" />
+ <property name="less.src.dir" value="${basedir}/src/less" />
<property name="web.src.dir" value="${basedir}/src/web" />
<property name="sql.src.dir" value="${basedir}/src/sql" />
@@ -52,6 +54,8 @@
<mkdir dir="${dist.classes.dir}" />
<delete dir="${dist.dust.dir}" />
<mkdir dir="${dist.dust.dir}" />
+ <delete dir="${dist.less.dir}" />
+ <mkdir dir="${dist.less.dir}" />
<!-- copy non-java files to classes dir to load from classpath -->
<copy todir="${dist.classes.dir}">
@@ -80,6 +84,16 @@
<outputmapper id="out" type="glob" from="*.tl" to="${dist.dust.dir}/*.js" />
</redirector>
</apply>
+
+ <!-- Compile LESS to CSS -->
+ <apply dir="${less.src.dir}" executable="lessc" relative="true">
+ <mapper type="glob" from="*.less" to="*.css" />
+ <srcfile />
+ <fileset dir="${less.src.dir}" includes="*.less" />
+ <redirector>
+ <outputmapper id="out" type="glob" from="*.less" to="${dist.less.dir}/*.css" />
+ </redirector>
+ </apply>
</target>
<target name="jars" depends="build" description="Create azkaban jar">
@@ -179,6 +193,11 @@
<copy todir="${dist.web.package.dir}/web/js">
<fileset dir="${dist.dust.dir}" />
</copy>
+
+ <!-- Copy compiled less CSS -->
+ <copy todir="${dist.web.package.dir}/web/css">
+ <fileset dir="${dist.less.dir}" />
+ </copy>
<!-- Copy conf create table scripts -->
<copy todir="${dist.web.package.dir}/conf">
@@ -270,6 +289,11 @@
<fileset dir="${dist.dust.dir}" />
</copy>
+ <!-- Copy compiled less CSS -->
+ <copy todir="${dist.solo.package.dir}/web/css">
+ <fileset dir="${dist.less.dir}" />
+ </copy>
+
<!-- Copy sql files -->
<copy todir="${dist.solo.package.dir}/sql" >
<fileset dir="${sql.src.dir}" />
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index e21ca51..cec8db1 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -138,7 +138,7 @@
<div class="row" id="jobListView">
<div class="col-lg-12">
- <table class="table table-striped table-bordered">
+ <table class="table table-striped table-bordered table-condensed table-hover executions-table">
<thead>
<tr>
<th>Name</th>
diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 7c0a5d0..7ec5a6c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -56,7 +56,7 @@
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">Currently Running Jobs</div>
- <table id="executingJobs" class="table table-striped">
+ <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">
<thead>
<tr>
<th class="execid">Execution Id</th>
@@ -93,8 +93,7 @@
#end
#else
<tr>
- <td></td>
- <td class="last">No Executing Flows</td>
+ <td colspan="10">No Executing Flows</td>
</tr>
#end
</tbody>
@@ -107,7 +106,7 @@
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">Recently Finished Jobs</div>
- <table id="recentlyFinished" class="table table-striped">
+ <table id="recentlyFinished" class="table table-striped table-bordered table-hover table-condensed executions-table">
<thead>
<tr>
<th class="execid">Execution Id</th>
@@ -144,8 +143,7 @@
#end
#else
<tr>
- <td></td>
- <td class="last">No Recently Finished</td>
+ <td colspan="10">No Recently Finished</td>
</tr>
#end
</tbody>
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index b1b93dc..e31bc0d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -89,7 +89,7 @@
</div>
</form>
</div>
- <table id="executingJobs" class="table table-striped">
+ <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">
<thead>
<tr>
<th class="execid">Execution Id</th>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index b77add2..db11bdd 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -99,7 +99,7 @@
Job Properties
</div>
- <table id="all-jobs" class="table table-striped table-bordered">
+ <table class="table table-striped table-bordered properties-table">
<thead>
<tr>
<th class="tb-pname">Parameter Name</th>
diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index b1c5554..e6bcdeb 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -97,7 +97,7 @@
<div class="panel panel-success">
<div class="panel-heading">User</div>
- <table class="table table-striped" id="permissions-table">
+ <table class="table table-striped permission-table" id="permissions-table">
<thead>
<th class="tb-username">User</th>
<th class="tb-perm">Admin</th>
@@ -151,7 +151,7 @@
<div class="panel panel-warning">
<div class="panel-heading">Group</div>
- <table class="table table-striped" id="group-permissions-table">
+ <table class="table table-striped permission-table" id="group-permissions-table">
<thead>
<tr>
<th class="tb-username">Group</th>
@@ -206,7 +206,7 @@
<div class="panel panel-info">
<div class="panel-heading">Proxy Users</div>
- <table class="table table-striped" id="proxy-user-table">
+ <table class="table table-striped permission-table" id="proxy-user-table">
<thead>
<tr>
<th class="tb-username">Proxy User</th>
diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index 192c105..81eb31f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -85,7 +85,7 @@
<div class="panel panel-default">
<div class="panel-heading">Property $property</div>
- <table id="all-jobs" class="table table-striped table-bordered">
+ <table class="table table-striped table-bordered properties-table">
<thead>
<tr>
<th class="tb-pname">Parameter Name</th>
src/less/bootstrap-azkaban.less 130(+130 -0)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
new file mode 100644
index 0000000..6c3a115
--- /dev/null
+++ b/src/less/bootstrap-azkaban.less
@@ -0,0 +1,130 @@
+.modal-wide .modal-dialog {
+ width: 80%; /* or whatever you wish */
+}
+
+.alert-messaging {
+ display: none;
+}
+
+.nav-tabs, .nav-pills {
+ margin-bottom: 15px;
+}
+
+.flow-expander {
+ cursor: pointer;
+}
+
+table .worksheet-key {
+ width: 25%;
+}
+
+#all-jobs {
+ .tb-name {
+ width: 70%;
+ border-bottom-width: 0;
+ border-bottom-style: none;
+ }
+
+ .tb-up-date {
+ width: 140px;
+ min-width: 130px;
+ }
+
+ .tb-owner {
+ width: 10%;
+ min-width: 95px;
+ }
+}
+
+.properties-table {
+ .all-jobs .tb-pname {
+ }
+
+ .all-jobs .tb-pvalue {
+ }
+}
+
+.permission-table {
+ .tb-perm {
+ width: 41px;
+ margin: 0px;
+ }
+
+ .tb-admin {
+ width: 41px;
+ margin: 0px;
+ }
+
+ .tb-read {
+ width: 33px;
+ margin: 0px;
+ }
+
+ .tb-write {
+ width: 34px;
+ margin: 0px;
+ }
+
+ .tb-execute {
+ width: 51px;
+ margin: 0px;
+ }
+
+ .tb-schedule {
+ margin: 0px;
+ width: 60px;
+ }
+
+ .tb-action {
+ margin: 0px;
+ width: 70px;
+ min-width: 70px;
+ max-width: 70px;
+ }
+}
+
+.executions-table {
+ th.date {
+ width: 140px;
+ }
+
+ th.execid {
+ width: 100px;
+ }
+
+ th.project {
+ width: 200px;
+ }
+
+ th.user {
+ width: 60px;
+ }
+
+ th.elapse {
+ width: 90px;
+ }
+
+ th.status {
+ width: 100px;
+ }
+
+ th.details {
+ width: 10px;
+ }
+
+ th.action {
+ width: 20px;
+ }
+
+ td.timeline {
+ width: 280px;
+ padding: 0px;
+ height: 100%;
+ vertical-align: bottom;
+ margin: 0px;
+ }
+
+ td.execId {
+ font-weight: bold;
+ }
+}