azkaban-uncached
Changes
src/web/css/bootstrap.css 6(+3 -3)
Details
diff --git a/src/java/azkaban/webapp/AzkabanWebServer.java b/src/java/azkaban/webapp/AzkabanWebServer.java
index df2c02a..c24ea11 100644
--- a/src/java/azkaban/webapp/AzkabanWebServer.java
+++ b/src/java/azkaban/webapp/AzkabanWebServer.java
@@ -758,6 +758,7 @@ public class AzkabanWebServer extends AzkabanServer {
root.addServlet(staticServlet, "/css/*");
root.addServlet(staticServlet, "/js/*");
root.addServlet(staticServlet, "/images/*");
+ root.addServlet(staticServlet, "/fonts/*");
root.addServlet(staticServlet, "/favicon.ico");
root.addServlet(new ServletHolder(new ProjectManagerServlet()),"/manager");
diff --git a/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java b/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
index 5e0c67e..b48e2c9 100644
--- a/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
+++ b/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
@@ -64,6 +64,10 @@ public abstract class LoginAbstractAzkabanServlet extends AbstractAzkabanServlet
contextType.put(".jpeg", "image/jpeg");
contextType.put(".gif", "image/gif");
contextType.put(".jpg", "image/jpeg");
+ contextType.put(".eot", "application/vnd.ms-fontobject");
+ contextType.put(".svg", "image/svg+xml");
+ contextType.put(".ttf", "application/octet-stream");
+ contextType.put(".woff", "application/x-font-woff");
}
private File webResourceDirectory = null;
@@ -121,10 +125,10 @@ public abstract class LoginAbstractAzkabanServlet extends AbstractAzkabanServlet
String prefix = req.getContextPath() + req.getServletPath();
String path = req.getRequestURI().substring(prefix.length());
int index = path.lastIndexOf('.');
- if (index == -1 ) {
+ if (index == -1) {
return false;
}
-
+
String extension = path.substring(index);
if (contextType.containsKey(extension)) {
File file = new File(webResourceDirectory, path);
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 6126e30..d84902b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -91,8 +91,12 @@
<div class="panel panel-default" id="flow-tabs">
<div class="panel-heading">
<div class="pull-right" id="project-options">
- <button id="project-upload-btn" class="btn btn-xs btn-primary">Upload</button>
- <button id="project-delete-btn" class="btn btn-xs btn-danger">Delete Project</button>
+ <button id="project-upload-btn" class="btn btn-xs btn-primary">
+ <span class="glyphicon glyphicon-upload"></span> Upload
+ </button>
+ <button id="project-delete-btn" class="btn btn-xs btn-danger">
+ <span class="glyphicon glyphicon-remove-circle"></span> Delete Project
+ </button>
</div>
Flows
</div>
src/web/css/bootstrap.css 6(+3 -3)
diff --git a/src/web/css/bootstrap.css b/src/web/css/bootstrap.css
index 6aef1f6..fb50e38 100644
--- a/src/web/css/bootstrap.css
+++ b/src/web/css/bootstrap.css
@@ -2634,8 +2634,8 @@ input[type="button"].btn-block {
@font-face {
font-family: 'Glyphicons Halflings';
- src: url('../fonts/glyphicons-halflings-regular.eot');
- src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+ src: url('../../fonts/glyphicons-halflings-regular.eot');
+ src: url('../../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
.glyphicon {
@@ -7095,4 +7095,4 @@ td.visible-print {
td.hidden-print {
display: none !important;
}
-}
\ No newline at end of file
+}