commit b1b4156: [WebUI] Add date locale setting
moisseev
moiseev at mezonplus.ru
Sun Jun 13 22:14:04 UTC 2021
Author: moisseev
Date: 2021-06-12 19:19:41 +0300
URL: https://github.com/rspamd/rspamd/commit/b1b41562f1ef22a9ab5b240b09db8ffbec5c0afa (refs/pull/3793/head)
[WebUI] Add date locale setting
---
interface/index.html | 28 ++++++++++++++++-
interface/js/app/rspamd.js | 75 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/interface/index.html b/interface/index.html
index f84f76ede..1b66cf329 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -86,7 +86,33 @@
<a class="dropdown-item dynamic active" href="#" id="dynamic-item" data-value="3600000">1 hour</a>
</div>
</div>
- <button class="btn btn-outline-secondary ml-2" id="disconnect"><i class="fas fa-power-off"></i> Disconnect</button>
+ <button class="btn btn-outline-secondary ml-2" id="disconnect" title="Disconnect"><i class="fas fa-power-off"></i></button>
+ <button class="btn btn-outline-secondary ml-2" id="settings" title="WebUI settings"><i class="fas fa-cog"></i></button>
+ <div class="d-none">
+ <div id="settings-popover">
+ <div class="card">
+ <div class="card-body">
+ <h6 class="card-title font-weight-bolder">Date and time locale</h6>
+ <label class="ml-2">
+ <input type="radio" class="mr-2" name="locale" value="browser" checked>
+ Use browser settings
+ </label>
+ <div class="input-group input-group-sm">
+ <div class="input-group-prepend">
+ <div class="input-group-text">
+ <label class="my-auto">
+ <input type="radio" class="mr-2" name="locale" value="custom">
+ Custom
+ </label>
+ </div>
+ </div>
+ <input type="text" id="locale" placeholder="Enter locale" class="form-control" />
+ </div>
+ <p class="mt-2 mb-0">Date: <span id="date-example"></span></p>
+ </div>
+ </div>
+ </div>
+ </div>
</form>
<button class="navbar-toggler ml-2" type="button" data-toggle="collapse" data-target=".navbar-collapse">
<span class="navbar-toggler-icon"></span>
diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js
index 60d356055..7e571602a 100644
--- a/interface/js/app/rspamd.js
+++ b/interface/js/app/rspamd.js
@@ -48,6 +48,7 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
var neighbours = []; // list of clusters
var checked_server = "All SERVERS";
var timer_id = [];
+ var locale = null;
var selData = null; // Graph's dataset selector state
var symbolDescriptions = {};
@@ -273,7 +274,9 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
function unix_time_format(tm) {
var date = new Date(tm ? tm * 1000 : 0);
- return date.toLocaleString();
+ return (locale)
+ ? date.toLocaleString(locale)
+ : date.toLocaleString();
}
function displayUI() {
@@ -406,6 +409,76 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
// Public functions
ui.alertMessage = alertMessage;
ui.setup = function () {
+ (function initSettings() {
+ var selected_locale = null;
+ var custom_locale = null;
+ var localeTextbox = ".popover #settings-popover #locale";
+
+ function validateLocale(saveToLocalStorage) {
+ function toggle_form_group_class(remove, add) {
+ $(localeTextbox).removeClass("is-" + remove).addClass("is-" + add);
+ }
+
+ var now = new Date();
+
+ if (custom_locale.length) {
+ try {
+ now.toLocaleString(custom_locale);
+
+ if (saveToLocalStorage) localStorage.setItem("custom_locale", custom_locale);
+ locale = (selected_locale === "custom") ? custom_locale : null;
+ toggle_form_group_class("invalid", "valid");
+ } catch (err) {
+ locale = null;
+ toggle_form_group_class("valid", "invalid");
+ }
+ } else {
+ if (saveToLocalStorage) localStorage.setItem("custom_locale", null);
+ locale = null;
+ $(localeTextbox).removeClass("is-valid is-invalid");
+ }
+
+ // Display date example
+ $(".popover #settings-popover #date-example").text(
+ (locale)
+ ? now.toLocaleString(locale)
+ : now.toLocaleString()
+ );
+ }
+
+ $("#settings").popover({
+ title: "WebUI settings",
+ container: "body",
+ placement: "bottom",
+ html: true,
+ sanitize: false,
+ content: function () {
+ // Using .clone() has the side-effect of producing elements with duplicate id attributes.
+ return $("#settings-popover").clone();
+ }
+ });
+ $("#settings").on("click", function (e) {
+ e.preventDefault();
+ });
+ $("#settings").on("inserted.bs.popover", function () {
+ selected_locale = localStorage.getItem("selected_locale") || "browser";
+ custom_locale = localStorage.getItem("custom_locale") || "";
+ validateLocale();
+
+ $('.popover #settings-popover input:radio[name="locale"]').val([selected_locale]);
+ $(localeTextbox).val(custom_locale);
+ });
+ $(document).on("change", '.popover #settings-popover input:radio[name="locale"]', function () {
+ selected_locale = this.value;
+ localStorage.setItem("selected_locale", selected_locale);
+ validateLocale();
+ });
+ $(document).on("input", ".popover #settings-popover #locale", function () {
+ custom_locale = $(localeTextbox).val();
+ validateLocale(true);
+ });
+ }());
+
$("#selData").change(function () {
selData = this.value;
tabClick("#throughput_nav");
More information about the Commits
mailing list