]> source.dussan.org Git - rspamd.git/commitdiff
[WebUI] Fix mouse events on throughput summary table area 1434/head
authorAlexander Moisseev <moiseev@mezonplus.ru>
Sat, 18 Feb 2017 10:47:22 +0000 (13:47 +0300)
committerAlexander Moisseev <moiseev@mezonplus.ru>
Sat, 18 Feb 2017 10:47:22 +0000 (13:47 +0300)
interface/css/rspamd.css
interface/index.html
interface/js/app/graph.js

index 15ca4afac3dedab02c32ba9a3816c53bc5c631ae..1dad20f7ebb5bd30a6b01e3a6166c54d93aa1980 100644 (file)
@@ -549,20 +549,31 @@ td.maps-cell {
 }
 
 /* RRD summary */
+#summary-row {
+    padding-left: 80px;
+    padding-right: 80px;
+}
 .col-fixed,
 .col-fluid {
     position: relative;
     float: left;
-    padding-left: 80px;
-    padding-right: 80px;
 }
 .col-fixed {
     width: 200px;
-    z-index: 1;
+    min-height: 1px; /* make an empty div take space */
 }
 .col-fluid {
     width: calc(100% - 200px);
 }
+#rrd-table_toggle {
+  position: absolute;
+  top: 0;
+  height: 100%;
+  width: 100%;
+}
+#rrd-table_wrapper {
+    z-index: 100;
+}
 #rrd-table {
     width: 100% !important;
     text-align: left;
index 71b9d575454eaeae2373dac13ddab0a684d25c2c..3fd34820604b18119b3868a5fdbd67657cd09a0c 100644 (file)
                                                                </div>
                                                        </div>
 
-                                                       <div class="row">
+                                                       <div id="summary-row" class="row">
                                                                <div class="col-fixed" id="rrd-pie" >
                                                                        <span class="notice">Loading..</span>
                                                                        <noscript>Please enable Javascript</noscript>
 
                                                                <div class="col-fluid">
                                                                        <table id="rrd-table" class="table table-striped table-hover"></table>
+                                                                       <div id="rrd-table_toggle"></div>
                                                                </div>
                                                        </div>
 
index 62452d36768814c6e5cde0b5660598ff86a2d9b7..86f7ca3521924d74a59e87ed619b04228dd84a54 100644 (file)
@@ -148,6 +148,16 @@ function($, D3Evolution, unused) {
         });
     }
 
+    // Handling mouse events on overlapping elements
+    $("#rrd-pie").mouseover(function () {
+        $("#rrd-pie").css("z-index", "200");
+        $("#rrd-table_toggle").css("z-index", "300");
+    });
+    $("#rrd-table_toggle").mouseover(function () {
+        $("#rrd-pie").css("z-index", "0");
+        $("#rrd-table_toggle").css("z-index", "0");
+    });
+
     var interface = {};
 
     interface.draw = function(rspamd, graphs, neighbours, checked_server, type) {