github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v6.2.3.0 

Changelog: https://roxy-wi.org/changelog#6_2_3
pull/343/head
Pavel Loginov 2022-11-09 19:47:59 +03:00
parent a9783ee58d
commit a9dc131a84
2 changed files with 70 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/templates/base.html
View File

@ -65,7 +65,7 @@
<li><a href="/app/overview.py" title="Server and service status" class="overview-link">Overview</a></li>
{% if '1' in user_services %}
<li class="p_menu">
<a href="/app/hapservers.py" title="HAProxy servers overview" class="config-show">HAProxy</a>
<a href="/app/hapservers.py?service=haproxy" title="HAProxy servers overview" class="config-show">HAProxy</a>
<ul class="v_menu">
<li><a href="/app/hapservers.py?service=haproxy" title="HAProxy servers overview" class="overview-link head-submenu">Overview</a> </li>
<li><a href="/app/config.py?service=haproxy" title="Working with HAProxy configs" class="edit head-submenu">Configs</a></li>
@ -132,7 +132,7 @@
{% endif %}
{% endif %}
<li class="p_menu">
<a title="Monitoring tools" class="stats">Monitoring</a>
<a href="/app/smon.py?action=view" title="Monitoring tools" class="stats">Monitoring</a>
<ul class="v_menu">
<li><a href="/app/smon.py?action=view" title="SMON Dashboard" class="overview-link head-submenu">SMON Dashboard</a></li>
<li><a href="/app/smon.py?action=history" title="SMON History" class="lists head-submenu">SMON History</a></li>
@ -146,7 +146,7 @@
</li>
{% if role <= 2 %}
<li class="p_menu">
<a title="Servers manage" class="runtime">Servers</a>
<a href="/app/servers.py#users" title="Servers manage" class="runtime">Servers</a>
<ul class="v_menu">
<li><a href="/app/servers.py#users" title="Servers: Manage users" class="users head-submenu">Users</a></li>
<li><a href="/app/servers.py#servers" title="Servers: Manage servers" class="runtime servers head-submenu">Servers</a></li>
@ -163,7 +163,7 @@
{% endif %}
{% if role <= 1 %}
<li class="p_menu">
<a title="Admin area" class="admin">Admin area</a>
<a href="/app/users.py#users" title="Admin area" class="admin">Admin area</a>
<ul class="v_menu">
<li><a href="/app/users.py#users" title="Admin area: Manage users" class="users head-submenu">Users</a></li>
<li><a href="/app/users.py#groups" title="Admin area: Manage groups" class="group groups head-submenu">Groups</a></li>
@ -298,8 +298,10 @@
<tr id="show-user-settings-group"></tr>
</table>
</div>
<div id="current-user-groups-dialog" style="display: none;">
<div id="current-user-groups-form"></div>
<div id="statistic" style="display: none;">
<div style="font-size: 1.1em;font-weight: bold;padding-top: 10px;">
Help us to improve Roxy-WI by sending anonymous statistics. No marketing.
</div>
</div>
{% include 'include/change_pass_form.html' %}
</body>

85
inc/script.js
View File

@ -1325,31 +1325,31 @@ socket.onerror = function(error) {
console.log(`[error] ${error.message}`);
};
function changePassword() {
$( "#user-change-password-table" ).dialog({
autoOpen: true,
resizable: false,
height: "auto",
width: 600,
modal: true,
title: "Change password",
show: {
effect: "fade",
duration: 200
$("#user-change-password-table").dialog({
autoOpen: true,
resizable: false,
height: "auto",
width: 600,
modal: true,
title: "Change password",
show: {
effect: "fade",
duration: 200
},
hide: {
effect: "fade",
duration: 200
},
buttons: {
"Change": function () {
changeUserPasswordItOwn($(this));
},
hide: {
effect: "fade",
duration: 200
},
buttons: {
"Change": function() {
changeUserPasswordItOwn($(this));
},
Cancel: function() {
$( this ).dialog( "close" );
$('#missmatchpass').hide();
}
Cancel: function () {
$(this).dialog("close");
$('#missmatchpass').hide();
}
});
}
});
}
function changeUserPasswordItOwn(d) {
var pass = $('#change-password').val();
@ -1526,3 +1526,42 @@ function show_version() {
} );
NProgress.configure({showSpinner: true});
}
function httpGetAsync() {
if (localStorage.getItem('statistic') == null) {
$("#statistic").dialog({
autoOpen: true,
resizable: false,
height: "auto",
width: 600,
modal: true,
title: "Help us to improve Roxy-WI",
show: {
effect: "fade",
duration: 200
},
hide: {
effect: "fade",
duration: 200
},
buttons: {
"Yes": function () {
localStorage.setItem('statistic', '1');
$(this).dialog("close");
httpGetAsync();
},
"No": function () {
localStorage.setItem('statistic', '0');
$(this).dialog("close");
}
}
});
}
if (localStorage.getItem('statistic') == 1) {
var xmlHttp = new XMLHttpRequest();
var cur_url = btoa(window.location.href.split('/').pop());
var theUrl = 'https://roxy-wi.org/page/send/' + cur_url;
xmlHttp.open("GET", theUrl, true); // true for asynchronous
xmlHttp.send(null);
}
}
window.onload = httpGetAsync;