#7442 fix Spark connection status in Lab (#7448)

* #7442 fix Spark connection status in Lab * #7442 add tooltip to disconnect button
twosigma · May 30, 2018 · d5ad0d3 · d5ad0d3
1 parent d556f2e
commit d5ad0d3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/js/notebook/src/shared/style/spark.scss b/js/notebook/src/shared/style/spark.scss
@@ -16,6 +16,31 @@
 
 @import "bxvariables";
 
+.label {
+  display: inline;
+  padding: .2em .6em .3em;
+  font-size: 75%;
+  font-weight: bold;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: .25em;
+}
+
+.label-info {
+  background-color: $bxColorInfo;
+}
+
+.label-danger {
+  background-color: $bxColorError;
+}
+
+.label-default {
+  background-color: $bxColorDefault;
+}
+
 .bx-spark-stagePanel {
   max-width: 600px;
   margin: 8px 0;

diff --git a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUI.java b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUI.java
@@ -215,6 +215,7 @@ private Label createAppStatus() {
   private Button createDisconnectButton() {
     Button disconnect = new Button();
     disconnect.registerOnClick((content, message) -> getSparkSession().sparkContext().stop());
+    disconnect.setTooltip("Stop Spark Session");
     disconnect.setDomClasses(new ArrayList<>(Arrays.asList("bx-button", "icon-close")));
     return disconnect;
   }