azkaban-developers

Merge pull request #166 from davidzchen/ui-polishing Use

2/12/2014 12:03:49 AM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 48039cd..acb0573 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -147,7 +147,7 @@
       <div id="flow-stats-container">
         <div class="row">
           <div class="col-xs-12">
-            <div class="alert alert-info">
+            <div class="callout callout-info">
               <h4>Analyze last run</h4>
               <p>Analyze the last run for aggregate performance statistics. <strong>Note:</strong> this may take a few minutes, especially if your flow is large.</p>
               <p>
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 52d4e37..50e2606 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -85,7 +85,7 @@
             </div>
 		#end
 	#else
-            <div class="alert alert-default">
+            <div class="callout callout-default">
               <h4>No Flows</h4>
               <p>No flows have been uploaded to this project yet.</p>
             </div>
diff --git a/src/less/azkaban.less b/src/less/azkaban.less
index 54ba380..f40468d 100644
--- a/src/less/azkaban.less
+++ b/src/less/azkaban.less
@@ -8,6 +8,7 @@
 
 @import "context-menu.less";
 @import "tables.less";
+@import "callout.less";
 
 @import "login.less";
 @import "project.less";
diff --git a/src/less/callout.less b/src/less/callout.less
new file mode 100644
index 0000000..a9f0ca2
--- /dev/null
+++ b/src/less/callout.less
@@ -0,0 +1,64 @@
+/*
+ * Callouts
+ *
+ * Not quite alerts, but custom and helpful notes for folks reading the docs.
+ * Requires a base and modifier class.
+ */
+
+/* Common styles for all types */
+.callout {
+  margin: 20px 0;
+  padding: 20px;
+  border-left: 3px solid #eee;
+
+  h4 {
+    margin-top: 0;
+    margin-bottom: 5px;
+  }
+
+  p:last-child {
+    margin-bottom: 0;
+  }
+
+  code {
+    background-color: #fff;
+    border-radius: 3px;
+  }
+}
+
+/* Variations */
+.callout-danger {
+  background-color: #fdf7f7;
+  border-color: #d9534f;
+  
+  h4 {
+    color: #d9534f;
+  }
+}
+
+.callout-warning {
+  background-color: #fcf8f2;
+  border-color: #f0ad4e;
+
+  h4 {
+    color: #f0ad4e;
+  }
+}
+
+.callout-info {
+  background-color: #f4f8fa;
+  border-color: #5bc0de;
+
+  h4 {
+    color: #5bc0de;
+  }
+}
+
+.callout-default {  
+  background-color: #f5f5f5;
+  border-color: #dddddd;
+
+  h4 {
+    color: #a0a0a0;
+  }
+}
diff --git a/src/less/Makefile b/src/less/Makefile
index 052a96c..c25438a 100644
--- a/src/less/Makefile
+++ b/src/less/Makefile
@@ -19,7 +19,8 @@ azkaban_css_DEPS = \
 	non-responsive.less \
 	off-canvas.less \
 	project.less \
-	tables.less
+	tables.less \
+	callout.less
 
 $(OBJ_DIR)/azkaban.css: $(azkaban_css_DEPS)
 	$(LESSC) $< $@
diff --git a/src/tl/flowstats-no-data.tl b/src/tl/flowstats-no-data.tl
index 2f3605a..fe74240 100644
--- a/src/tl/flowstats-no-data.tl
+++ b/src/tl/flowstats-no-data.tl
@@ -1,6 +1,6 @@
       <div class="row">
         <div class="col-xs-12">
-          <div class="alert alert-default">
+          <div class="callout callout-default">
             <h4>No Flow Stats Available</h4>
             <p>{message}</p>
           </div>
diff --git a/src/tl/flowsummary.tl b/src/tl/flowsummary.tl
index 30c50de..e4f525f 100644
--- a/src/tl/flowsummary.tl
+++ b/src/tl/flowsummary.tl
@@ -58,7 +58,7 @@
             </tbody>
           </table>
           {:else}
-            <div class="alert alert-default">
+            <div class="callout callout-default">
               <h4>None</h4>
               <p>This flow has not been scheduled.</p>
             </div>