azkaban-aplcache

add dismiss button to banner (#1871) A dismiss button is added

7/27/2018 4:13:20 PM

Details

diff --git a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/nav.vm b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/nav.vm
index dad4d44..43533af 100644
--- a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/nav.vm
+++ b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/nav.vm
@@ -32,13 +32,33 @@
     color: red;
     cursor: pointer;
   }
+
+  #close {
+    float: right;
+    display: inline-block;
+    padding: 2px 5px;
+    background: #ccc;
+    color: #fff;
+  }
 </style>
 <script type="text/javascript">
   function navMenuClick(url) {
     window.location.href = url;
   }
 
+  function dismissBanner() {
+    var dismissBanner = localStorage.getItem("dismissBanner");
+    if (dismissBanner != "true") {
+      localStorage.setItem("dismissBanner", "true");
+    }
+    $("#banner").slideUp();
+  }
+
   $(function () {
+    var dismissBanner = localStorage.getItem("dismissBanner");
+    if (dismissBanner == "true") {
+      return;
+    }
 
     if ($("#banner").data("id").indexOf('$') == -1 && $('#banner').is(':empty') == false) {
       $('#banner').attr('Target', '_blank');
@@ -60,6 +80,8 @@
           $('#bannerText').append('<span style="font-size: 150%;" >' + $("#banner").data("message")
               + '</span>');
         }
+
+        $('#close').append('dismiss');
         // The banner will side up after 30 seconds
         setTimeout(function () {
           $("#banner").slideUp();
@@ -70,6 +92,7 @@
 </script>
 
 <div id='banner' data-id="$note_type" data-message="$note_message" data-url="$note_url">
+  <span id='close' onclick="dismissBanner()"></span>
   <div id="bannerText">
   </div>
 </div>
diff --git a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/notepage.vm b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/notepage.vm
index 051c53f..b995c06 100644
--- a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/notepage.vm
+++ b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/notepage.vm
@@ -36,6 +36,12 @@
 </head>
 <body>
 
+<script type="text/javascript">
+  function enableBanner() {
+    localStorage.removeItem("dismissBanner");
+  }
+</script>
+
 <style type="text/css">
   .show-and-hide-true {
     display: none;
@@ -90,11 +96,13 @@
       </div>
       <div class="form-group">
         <div class="col-sm-3 col-sm-offset-3">
-          <button type="submit" id="submit-button" class="btn btn-primary btn-block">Submit Note
+          <button type="submit" id="submit-button" class="btn btn-primary btn-block"
+                  onclick="enableBanner()">Submit Note
           </button>
         </div>
         <div class="col-sm-2 col-sm-offset-4">
-          <button type="submit" id="clear-button" class="btn btn-warning btn-block">Clear Note
+          <button type="submit" id="clear-button" class="btn btn-warning btn-block"
+                  onclick="enableBanner()">Clear Note
           </button>
         </div>
       </div>