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

v5.0.1.0 

Changelog: https://haproxy-wi.org/changelog.py#5_0_1
pull/304/head
Pavel Loginov 2021-03-14 10:58:41 +06:00
parent 83b7c31bb5
commit 9ed61f83e5
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/awesome.css
View File

@ -300,6 +300,9 @@
margin-top: 5px; margin-top: 5px;
padding-left: 2px; padding-left: 2px;
} }
.alert-one-row .fa-exclamation-circle {
margin-top: -5px;
}
.note-symbol::after { .note-symbol::after {
display: none; display: none;
font-family: "Font Awesome 5 Solid"; font-family: "Font Awesome 5 Solid";

25
inc/overview.js
View File

@ -23,8 +23,13 @@ function showHapserversCallBack(serv, hostnamea, service) {
if (data.indexOf('error:') != '-1') { if (data.indexOf('error:') != '-1') {
toastr.error(data); toastr.error(data);
} else { } else {
$("#" + hostnamea).empty(); if (data.indexOf('ls: cannot access') != '-1') {
$("#" + hostnamea).html(data); $("#" + hostnamea).empty();
$("#" + hostnamea).html();
} else {
$("#" + hostnamea).empty();
$("#" + hostnamea).html(data);
}
} }
} }
} ); } );
@ -193,13 +198,15 @@ function ajaxActionWafServers(action, id) {
} ); } );
} }
$( function() { $( function() {
ChartsIntervalId = setInterval(updatingCpuRamCharts, 30000); if ((cur_url[0] == 'hapservers.py' && cur_url[1].split('=')[0] == 'service') || cur_url[0] == 'overview.py') {
$(window).focus(function(){ ChartsIntervalId = setInterval(updatingCpuRamCharts, 30000);
ChartsIntervalId = setInterval(updatingCpuRamCharts, 30000); $(window).focus(function () {
}); ChartsIntervalId = setInterval(updatingCpuRamCharts, 30000);
$(window).blur(function(){ });
clearInterval(ChartsIntervalId); $(window).blur(function () {
}); clearInterval(ChartsIntervalId);
});
}
$( "#show-all-users" ).click( function() { $( "#show-all-users" ).click( function() {
$( ".show-users" ).show("fast"); $( ".show-users" ).show("fast");
$( "#show-all-users" ).text("Hide"); $( "#show-all-users" ).text("Hide");

15
inc/script.js
View File

@ -175,12 +175,12 @@ window.onblur= function() {
} }
}; };
if(localStorage.getItem('restart')) { if(localStorage.getItem('restart')) {
var ip = localStorage.getItem('restart'); var ip_for_restart = localStorage.getItem('restart');
$.ajax( { $.ajax( {
url: "options.py", url: "options.py",
data: { data: {
act: "checkrestart", act: "checkrestart",
serv: ip, serv: ip_for_restart,
token: $('#token').val() token: $('#token').val()
}, },
type: "POST", type: "POST",
@ -190,9 +190,10 @@ if(localStorage.getItem('restart')) {
$("#apply_div").css('width', '850px'); $("#apply_div").css('width', '850px');
if (cur_url[0] == "hapservers.py") { if (cur_url[0] == "hapservers.py") {
$("#apply_div").css('width', '650px'); $("#apply_div").css('width', '650px');
$("#apply_div").html("You have made changes to the server: "+ip+". Changes will take effect only after<a id='"+ip+"' class='restart' title='Restart HAproxy service' onclick=\"confirmAjaxAction('stop', 'hap', '"+ip+"')\">restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>"); $("#apply_div").addClass("alert-one-row");
$("#apply_div").html("You have made changes to the server: "+ip_for_restart+". Changes will take effect only after<a id='"+ip_for_restart+"' class='restart' title='Restart HAproxy service' onclick=\"confirmAjaxAction('restart', 'hap', '"+ip_for_restart+"')\">restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");
} else { } else {
$("#apply_div").html("You have made changes to the server: "+ip+". Changes will take effect only after restart. <a href='hapservers.py' title='Overview'>Go to the HAProxy Overview page and restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>"); $("#apply_div").html("You have made changes to the server: "+ip_for_restart+". Changes will take effect only after restart. <a href='hapservers.py' title='Overview'>Go to the HAProxy Overview page and restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");
} }
$.getScript('/inc/overview.js'); $.getScript('/inc/overview.js');
} }
@ -348,7 +349,7 @@ function showStats() {
} }
function openStats() { function openStats() {
var serv = $("#serv").val(); var serv = $("#serv").val();
if (cur_url[1] == "service=nginx") { if (cur_url[1].split('&')[0] == "service=nginx") {
var url = "viewsttats.py?service=nginx&serv="+serv+"&open=open" var url = "viewsttats.py?service=nginx&serv="+serv+"&open=open"
} else { } else {
var url = "viewsttats.py?serv="+serv+"&open=open" var url = "viewsttats.py?serv="+serv+"&open=open"
@ -358,9 +359,9 @@ function openStats() {
} }
function openVersions() { function openVersions() {
var serv = $("#serv").val(); var serv = $("#serv").val();
if (cur_url[1] == "service=keepalived") { if (cur_url[1].split('&')[0] == "service=keepalived") {
var url = "versions.py?service=keepalived&serv="+serv+"&open=open" var url = "versions.py?service=keepalived&serv="+serv+"&open=open"
} else if (cur_url[1] == "service=nginx") { } else if (cur_url[1].split('&')[0] == "service=nginx") {
var url = "versions.py?service=nginx&serv="+serv+"&open=open" var url = "versions.py?service=nginx&serv="+serv+"&open=open"
} else { } else {
var url = "versions.py?serv="+serv+"&open=open" var url = "versions.py?serv="+serv+"&open=open"