azkaban-uncached
Details
ISSUES 13(+13 -0)
diff --git a/ISSUES b/ISSUES
new file mode 100644
index 0000000..9186c94
--- /dev/null
+++ b/ISSUES
@@ -0,0 +1,13 @@
+ Azkaban 3 UI Issues
+ ===================
+
+ - Remind people to clear cache due to JavaScript mismatches.
+ - Fix graph in executing flow panel.
+ - Make log view fit screen size
+ - Make graph view fit screen size
+ - Fix sidebar on graph views.
+ - Job Summary stats table overflows.
+ - Unify error messages.
+ - Change chevron on My Projects list to proper expanders.
+ - Redesign Project Page flows list.
+ - Fix dependency hovering for job list on flows page
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 17c197f..544ca6f 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -166,8 +166,8 @@
</div>
Flow log
</div>
- <div class="panel-body">
- <pre id="logSection" class="log"></pre>
+ <div class="panel-body log-viewer">
+ <pre id="logSection"></pre>
</div>
</div>
</div>
@@ -175,7 +175,7 @@
## Error message message dialog.
- <div class="modal fade" id="messageDialog">
+ <div class="modal" id="messageDialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="messageTitle">
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
index 1b0fd31..277ac4a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
@@ -21,7 +21,7 @@
<script type="text/javascript" src="${context}/js/azkaban.svg.graph.view.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.flow.execute.view.js"></script>
- <div class="modal modal-wide fade" id="execute-flow-panel">
+ <div class="modal modal-wide" id="execute-flow-panel">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index a0fe2b9..dce1759 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -170,7 +170,7 @@
## Advanced Filter Modal.
- <div class="modal fade" id="adv-filter">
+ <div class="modal" id="adv-filter">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 768f6ea..a098c24 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -147,7 +147,7 @@
## Modal dialog to be displayed to create a new project.
- <div class="modal fade" id="create-project-modal">
+ <div class="modal" id="create-project-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/invalidsessionmodal.vm b/src/java/azkaban/webapp/servlet/velocity/invalidsessionmodal.vm
index f0875e4..6f0651d 100644
--- a/src/java/azkaban/webapp/servlet/velocity/invalidsessionmodal.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/invalidsessionmodal.vm
@@ -16,7 +16,7 @@
## Modal dialog to be displayed when the user sesion is invalid.
- <div class="modal fade" id="invalid-session-modal">
+ <div class="modal" id="invalid-session-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index 8977276..fc8d88b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -106,8 +106,8 @@
</div>
Job Logs
</div>
- <div class="panel-body">
- <pre id="logSection" class="log"></pre>
+ <div class="panel-body log-viewer">
+ <pre id="logSection"></pre>
</div>
</div>
</div>
@@ -154,7 +154,7 @@
## Error message message dialog.
- <div class="modal fade" id="messageDialog">
+ <div class="modal" id="messageDialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header" id="messageTitle">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index c1c278a..1626c5e 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -182,7 +182,7 @@
## Edit job modal.
- <div class="modal modal-wide fade" id="job-edit-pane">
+ <div class="modal modal-wide" id="job-edit-pane">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
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 -->
diff --git a/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm b/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm
index 97ce566..3068df5 100644
--- a/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/messagedialog.vm
@@ -16,7 +16,7 @@
<script type="text/javascript" src="${context}/js/azkaban.message.dialog.view.js"></script>
- <div class="modal fade" id="azkaban-message-dialog">
+ <div class="modal" id="azkaban-message-dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 5493c33..ab7c22c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -259,7 +259,7 @@
## Remove proxy user modal dialog.
- <div class="modal fade" id="remove-proxy">
+ <div class="modal" id="remove-proxy">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -280,7 +280,7 @@
## Add proxy user modal dialog.
- <div class="modal fade" id="add-proxy">
+ <div class="modal" id="add-proxy">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -308,7 +308,7 @@
## Change permissions modal dialog.
- <div class="modal fade" id="change-permission">
+ <div class="modal" id="change-permission">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
index 3a36e85..75afd98 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectlogpage.vm
@@ -38,7 +38,7 @@
</head>
<body>
-#set ($current_page="executing")
+#set ($current_page="all")
#parse ("azkaban/webapp/servlet/velocity/nav.vm")
<div class="container">
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectmodals.vm b/src/java/azkaban/webapp/servlet/velocity/projectmodals.vm
index 1d22d58..a3524a0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectmodals.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectmodals.vm
@@ -16,7 +16,7 @@
## Upload project modal
- <div class="modal fade" id="upload-project-modal">
+ <div class="modal" id="upload-project-modal">
<div class="modal-dialog">
<div class="modal-content">
<form id="upload-project-form" enctype="multipart/form-data" method="post" action="$!context/manager">
@@ -48,7 +48,7 @@
## Delete project modal.
- <div class="modal fade" id="delete-project-modal">
+ <div class="modal" id="delete-project-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 708cfaa..16cb339 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -126,7 +126,7 @@
## Set SLA modal.
- <div class="modal modal-wide fade" id="sla-options">
+ <div class="modal modal-wide" id="sla-options">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
diff --git a/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm b/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm
index b3a72b4..7fc469c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm
@@ -17,7 +17,7 @@
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.schedule.panel.view.js"></script>
- <div class="modal fade" id="schedule-modal">
+ <div class="modal" id="schedule-modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
src/less/bootstrap-azkaban.less 49(+46 -3)
diff --git a/src/less/bootstrap-azkaban.less b/src/less/bootstrap-azkaban.less
index 2d1bf4d..e141048 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.
@@ -351,7 +377,7 @@ td.flow-summary-value {
}
#flow-executing-graph {
- width: 750px;
+ width: 100%;
height: 500px;
}
@@ -462,3 +488,20 @@ td {
margin-left: 5px;
}
}
+
+.log-viewer {
+ padding: 0;
+ background-color: #f0f0f0;
+
+ pre {
+ margin: 0;
+ border: 0;
+ height: 500px;
+ font-size: 12px;
+ background-color: transparent;
+ overflow: auto;
+ width: auto;
+ word-wrap: normal;
+ white-space: pre;
+ }
+}
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>