commit adeb7b5: [WebUI] Rework navbar buttons
moisseev
moiseev at mezonplus.ru
Tue Aug 25 10:07:06 UTC 2020
Author: moisseev
Date: 2020-08-23 19:07:12 +0300
URL: https://github.com/rspamd/rspamd/commit/adeb7b5bd6320e3fc7c60c285fe7218c72f059f1 (refs/pull/3480/head)
[WebUI] Rework navbar buttons
- Convert navbar buttons to <button> elements
- Do not disable Refresh button when auto-refresh is disabled
- Do not refresh current tab on auto-refresh interval change
---
interface/index.html | 6 +++---
interface/js/app/rspamd.js | 29 ++++++++++++++---------------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/interface/index.html b/interface/index.html
index bf241176b..a3810804b 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -47,8 +47,8 @@
</ul>
<form class="form-inline ml-auto">
<div class="btn-group">
- <a href="#" class="btn btn-outline-secondary" role="button" data-toggle="button" id="refresh" style="display: none;"><i class="fas fa-sync-alt"></i> Refresh</a>
- <button class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" id="autoRefresh">
+ <button class="btn btn-outline-secondary" id="refresh" style="display: none;"><i class="fas fa-sync-alt"></i> Refresh</a>
+ <button class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" id="autoRefresh" title="Auto-refresh time interval">
<span id="countdown">--:--</span>
</button>
<div class="dropdown-menu">
@@ -68,7 +68,7 @@
<a class="dropdown-item dynamic active" href="#" id="dynamic-item" data-value="3600000">1 hour</a>
</div>
</div>
- <a href="#" class="btn btn-outline-secondary ml-2" role="button" data-toggle="button" id="disconnect"><i class="fas fa-power-off"></i> Disconnect</a>
+ <button class="btn btn-outline-secondary ml-2" id="disconnect"><i class="fas fa-power-off"></i> Disconnect</a>
</form>
</nav>
diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js
index 184158877..475f0404f 100644
--- a/interface/js/app/rspamd.js
+++ b/interface/js/app/rspamd.js
@@ -89,12 +89,13 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
function tabClick(id) {
var tab_id = id;
- if ($(tab_id).attr("disabled")) return;
- $(tab_id).attr("disabled", true);
+ if ($(id).attr("disabled")) return;
+ var navBarControls = $("#selSrv, #navBar li, #navBar a, #navBar button");
+ navBarControls.attr("disabled", true).addClass("disabled", true);
stopTimers();
- if (tab_id === "#refresh") {
+ if (id === "#refresh" || id === "#autoRefresh") {
tab_id = "#" + $(".nav-link.active").attr("id");
}
@@ -141,7 +142,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
var refreshInterval = $(".dropdown-menu a.active.preset").data("value");
setAutoRefresh(refreshInterval, "status",
function () { return tab_stat.statWidgets(ui, graphs, checked_server); });
- if (refreshInterval) tab_stat.statWidgets(ui, graphs, checked_server);
+ if (id !== "#autoRefresh") tab_stat.statWidgets(ui, graphs, checked_server);
$(".preset").show();
$(".dynamic").hide();
@@ -161,7 +162,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
}
setAutoRefresh(refreshInterval, "throughput",
function () { return tab_graph.draw(ui, graphs, tables, neighbours, checked_server, selData); });
- if (refreshInterval) tab_graph.draw(ui, graphs, tables, neighbours, checked_server, selData);
+ if (id !== "#autoRefresh") tab_graph.draw(ui, graphs, tables, neighbours, checked_server, selData);
$(".preset").hide();
$(".dynamic").show();
@@ -185,9 +186,8 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
}
setTimeout(function () {
- $(tab_id).removeAttr("disabled");
- $("#refresh").removeAttr("disabled");
- }, 1000);
+ navBarControls.removeAttr("disabled").removeClass("disabled");
+ }, (id === "#autoRefresh") ? 0 : 1000);
}
function drawTooltips() {
@@ -403,13 +403,12 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
}, 1000);
});
- $("a[data-toggle=\"tab\"]").on("shown.bs.tab", function (e) {
- var tab_id = "#" + $(e.target).attr("id");
- tabClick(tab_id);
+ $('a[data-toggle="tab"]').on("shown.bs.tab", function (e) {
+ tabClick("#" + $(e.target).attr("id"));
});
- $("a[data-toggle=\"button\"]").on("click", function (e) {
- var tab_id = "#" + $(e.target).attr("id");
- tabClick(tab_id);
+ $("#refresh, #disconnect").on("click", function (e) {
+ e.preventDefault();
+ tabClick("#" + $(e.target).attr("id"));
});
$(".dropdown-menu a").click(function (e) {
e.preventDefault();
@@ -417,7 +416,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
var menuClass = (/\b(?:dynamic|preset)\b/).exec(classList)[0];
$(".dropdown-menu a.active." + menuClass).removeClass("active");
$(this).addClass("active");
- tabClick("#refresh");
+ tabClick("#autoRefresh");
});
$("#selSrv").change(function () {
More information about the Commits
mailing list