azkaban-uncached
Details
ISSUES 1(+0 -1)
diff --git a/ISSUES b/ISSUES
index 043dcd3..9186c94 100644
--- a/ISSUES
+++ b/ISSUES
@@ -1,7 +1,6 @@
Azkaban 3 UI Issues
===================
- - Some UI elements get distorted due to responsive.
- Remind people to clear cache due to JavaScript mismatches.
- Fix graph in executing flow panel.
- Make log view fit screen size
diff --git a/src/java/azkaban/webapp/servlet/velocity/login.vm b/src/java/azkaban/webapp/servlet/velocity/login.vm
index bb8968b..698581f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/login.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/login.vm
@@ -33,31 +33,20 @@
#parse ("azkaban/webapp/servlet/velocity/nav.vm")
<div class="container">
- <div class="row az-login">
- <div class="col-lg-4">
- </div>
- <div class="col-lg-4">
- <div class="alert alert-danger" id="error-msg"></div>
- <div class="well">
- <form role="form" id="login-form">
- <fieldset>
- <legend>Login</legend>
- <div class="form-group">
- <input type="text" class="form-control" name="username" id="username" placeholder="username">
- </div>
- <div class="form-group">
- <input type="password" class="form-control" name="password" id="password" placeholder="password">
- </div>
- <div class="form-group">
- <button type="button" class="btn btn-primary btn-lg btn-block" id="login-submit">Login</button>
- </div>
- </fieldset>
- </form>
- </div><!-- /well -->
- </div>
- <div class="col-lg-4"></div>
- </div><!-- /row -->
-
+ <div class="login">
+ <div class="alert alert-danger" id="error-msg"></div>
+ <div class="well">
+ <form id="login-form" role="form">
+ <fieldset>
+ <legend>Login</legend>
+ <input type="text" class="form-control" name="username" id="username" placeholder="Username">
+ <input type="password" class="form-control" name="password" id="password" placeholder="Password">
+ <button type="button" class="btn btn-primary btn-lg btn-block" id="login-submit">Login</button>
+ </fieldset>
+ </form>
+ </div><!-- /.well -->
+ </div><!-- /.login -->
+
#parse("azkaban/webapp/servlet/velocity/footer.vm")
</div><!-- /container -->
src/less/bootstrap-azkaban.less 30(+28 -2)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 2d1bf4d..b2f3619 100644
--- a/src/less/bootstrap-azkaban.less
+++ b/src/less/bootstrap-azkaban.less
@@ -1,8 +1,34 @@
// Since the azkaban navbar no longer has the 20px bottom margin so that the
// page header sits flush below the navbar, add a 20px top margin to the login
// form.
-.az-login {
- margin-top: 20px;
+.login {
+ max-width: 360px;
+ margin: 20px auto;
+ .form-control {
+ position: relative;
+ font-size: 16px;
+ height: auto;
+ padding: 10px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+
+ &:focus {
+ z-index: 2;
+ }
+ }
+
+ input[type="text"] {
+ margin-bottom: -1px;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+
+ input[type="password"] {
+ margin-bottom: 20px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ }
}
// Wide modal used for certain panels such as executing flow panel.
src/tl/flowsummary.tl 6(+3 -3)
diff --git a/src/tl/flowsummary.tl b/src/tl/flowsummary.tl
index e1227ad..2485671 100644
--- a/src/tl/flowsummary.tl
+++ b/src/tl/flowsummary.tl
@@ -1,5 +1,5 @@
<div class="col-lg-12">
- <table class="table table-striped table-bordered table-condensed table-hover">
+ <table class="table table-bordered table-condensed table-striped">
<tbody>
<tr>
<td class="flow-summary-key">Flow name</td>
@@ -26,7 +26,7 @@
{/schedule}
</div>
{?schedule}
- <table class="table table-striped table-condensed table-bordered table-hover">
+ <table class="table table-condensed table-bordered table-striped">
<tbody>
<tr>
<td class="flow-summary-key">Schedule ID</td>
@@ -70,7 +70,7 @@
<div class="panel panel-default">
<div class="panel-heading">Last Run Stats</div>
{?lastRun}
- <table class="table table-striped table-bordered table-condensed table-hover">
+ <table class="table table-bordered table-condensed table-striped">
<tbody>
<tr>
<td class="flow-summary-key">Max Map Slots from Largest Job</td>