aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2019-06-16 11:26:49 +0100
committerGitHub <noreply@github.com>2019-06-16 11:26:49 +0100
commit7848eeed33a0f7029d82b5e6ddd9bf5a3d475609 (patch)
tree49809c05507e8f9e36fa8381c62d17bccc083b13
parent97f3650d65c7a359d2218986c680b29ded51e976 (diff)
parent0a60f65e127c3aec0638a5c7be6c047e76e3a85a (diff)
downloadrspamd-7848eeed33a0f7029d82b5e6ddd9bf5a3d475609.tar.gz
rspamd-7848eeed33a0f7029d82b5e6ddd9bf5a3d475609.zip
Merge pull request #2926 from moisseev/webui
[Minor] Remove `form` role
-rw-r--r--interface/index.html12
-rw-r--r--interface/js/app/config.js1
-rw-r--r--interface/js/app/rspamd.js2
3 files changed, 4 insertions, 11 deletions
diff --git a/interface/index.html b/interface/index.html
index bb3206aa9..6229d7882 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -244,7 +244,7 @@
<div class="row">
<div class="col-md-6">
<div class="well well-sm">
- <form class="form-inline" role="form">
+ <form class="form-inline">
<h5>Learn Bayessian classifier:</h5>
<div class="form-group">
<div class="btn-group">
@@ -257,7 +257,7 @@
</div>
<div class="col-md-6">
<div class="well well-sm">
- <form class="form-inline" role="form">
+ <form class="form-inline">
<h5>Learn Fuzzy storage:</h5>
<div class="form-group">
<label for="fuzzyFlagText">Flag:</label>
@@ -328,18 +328,14 @@
</div>
<!-- Common modal -->
-<div id="modalDialog" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+<div id="modalDialog" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="modalTitle"></h3>
</div>
- <div class="modal-body" id="modalBody">
- <div class="progress progress-striped active">
- <div class="bar" style="width: 100%;"></div>
- </div>
- </div>
+ <div class="modal-body" id="modalBody"></div>
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true" id="modalClose">Close</button>
<button class="btn btn-primary" id="modalSave">Save changes</button>
diff --git a/interface/js/app/config.js b/interface/js/app/config.js
index 5ab24f9ef..e679780f4 100644
--- a/interface/js/app/config.js
+++ b/interface/js/app/config.js
@@ -192,7 +192,6 @@ define(["jquery"],
$("#modalTitle").html(item.uri);
$("#" + item.map).first().show();
- $("#modalDialog .progress").hide();
$("#modalDialog").modal({backdrop:true, keyboard:"show", show:true});
if (item.editable === false) {
$("#modalSave").hide();
diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js
index e37a08cf0..6e4de609d 100644
--- a/interface/js/app/rspamd.js
+++ b/interface/js/app/rspamd.js
@@ -167,10 +167,8 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
var buttons = $("#navBar .pull-right");
$("#mainUI").show();
- $("#progress").show();
$(buttons).show();
$(".nav-tabs-sticky").stickyTabs({initialTab:"#status_nav"});
- $("#progress").hide();
}
function alertMessage(alertClass, alertText) {