From: Anna Stakhova <anna@rspamd.com>
Date: Fri, 25 Nov 2016 22:47:36 +0000 (+0000)
Subject: Fix maps display
X-Git-Tag: 1.4.1~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1182%2Fhead;p=thirdparty%2Frspamd.git

Fix maps display
---

diff --git a/interface/css/rspamd.css b/interface/css/rspamd.css
index 62501df482..5ab6a63e18 100644
--- a/interface/css/rspamd.css
+++ b/interface/css/rspamd.css
@@ -338,6 +338,9 @@ td.maps-cell {
 		margin:0 10px 10px 0;
 		padding:0 10px;
 		}
+	.stat-box:not(.pull-right) {
+		width: 90px;
+	}
 	/*.stat-boxes .stat-box:first-child {
 		margin-right:0;
 		}*/
diff --git a/interface/index.html b/interface/index.html
index cb3cb7eecc..69d249cb3a 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -19,8 +19,8 @@
 		<div class="navbar-header">
 			<a class="navbar-brand" href="."><img src="./img/rspamd_logo_navbar.png" style="width: 67px; margin-top: -16px;"/></a>
 		</div>
-		<ul class="nav pull-right navbar-nav" style="display:none">
-			<li><a href="#" data-toggle="tab" id="refresh">Refresh</a></li>
+		<ul class="nav pull-right navbar-nav navbar-right" style="display:none">
+			<li><a href="#" data-toggle="tab" id="refresh"><i class="glyphicon glyphicon-refresh"></i> Refresh</a></li>
 			<li class="spinner"><a href="#" data-toggle="tab" id="disconnect">Disconnect</a></li>
 		</ul>
 		<ul class="nav navbar-nav nav-pills" role="tablist">
diff --git a/interface/js/rspamd.js b/interface/js/rspamd.js
index 57d70a39f8..e11c0b3ba4 100644
--- a/interface/js/rspamd.js
+++ b/interface/js/rspamd.js
@@ -255,6 +255,7 @@
                 $('#modalBody').empty();
                 getMaps();
             }
+
             $.each(data, function (i, item) {
                 $.ajax({
                     dataType: 'text',
@@ -376,7 +377,11 @@
         $(document).on('click', '[data-dismiss="modal"]', function (e) {
             $('#modalBody form').hide();
         });
-
+        $(document).on('click', '', function (e) {
+            if (event.target == document.getElementById('modalDialog')) {
+                $('#modalBody form').hide();
+            }
+        });
         function getChart() {
             $.ajax({
                 dataType: 'json',
@@ -1224,6 +1229,7 @@
 
         $('#configuration_nav').bind('click', function (e) {
             getActions();
+            $('#modalBody').empty();
             getMaps();
         });