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

v4.5.3.0 

Changelog: https://haproxy-wi.org/changelog.py#4_5_3
pull/260/head
Pavel Loginov 2020-11-04 18:28:51 +06:00
parent f7dd5398da
commit 7ee162916e
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/base.html
View File

@ -149,8 +149,8 @@
<span class="auto-refresh"> <span class="auto-refresh">
<a onclick="pauseAutoRefresh()" class="auto-refresh-pause" style="display: none; margin-top: 4px;"></a> <a onclick="pauseAutoRefresh()" class="auto-refresh-pause" style="display: none; margin-top: 4px;"></a>
<a onclick="pauseAutoResume()" class="auto-refresh-resume" style="display: none; margin-top: 4px;"></a> <a onclick="pauseAutoResume()" class="auto-refresh-resume" style="display: none; margin-top: 4px;"></a>
<span id="0" class="auto-refresh-span "><span class="service-reload auto-refresh-reload-icon"></span> Auto-refresh</span> <span id="0" class="auto-refresh-span"><span class="auto-refresh-reload auto-refresh-reload-icon"></span> Auto-refresh</span>
<span id="1" style="display: none;" class="auto-refresh-span "><span class="service-reload auto-refresh-reload-icon"></span> Auto-refresh</span> <span id="1" style="display: none;" class="auto-refresh-span"><span class="auto-refresh-reload auto-refresh-reload-icon"></span> Auto-refresh</span>
</span> </span>
{% endif %} {% endif %}
</h2> </h2>

15
inc/awesome.css
View File

@ -2,6 +2,14 @@
margin-right: 0.5em; margin-right: 0.5em;
width: 1.5em; width: 1.5em;
} }
.auto-refresh-reload::after {
display: none;
font-family: "Font Awesome 5 Solid";
content: "\f2f1";
}
.auto-refresh-reload > .fa-sync-alt, .auto-refresh-resume > .fa-play {
color: white !important;
}
.auto-refresh-pause::before { .auto-refresh-pause::before {
display: none; display: none;
font-family: "Font Awesome 5 Solid"; font-family: "Font Awesome 5 Solid";
@ -147,13 +155,6 @@
font-family: "Font Awesome 5 Solid"; font-family: "Font Awesome 5 Solid";
content: "\f007"; content: "\f007";
} }
.patreon::before {
display: none;
font-family: "Font Awesome 5 Solid";
content: "\f004";
color: #ff0000;
padding-left: 3px;
}
.update-row::before { .update-row::before {
display: none; display: none;
font-family: "Font Awesome 5 Solid"; font-family: "Font Awesome 5 Solid";

34
inc/script.js
View File

@ -131,7 +131,7 @@ jQuery.expr[':'].regex = function(elem, index, match) {
} }
window.onblur= function() { window.onblur= function() {
window.onfocus= function () { window.onfocus= function () {
if(Cookies.get('auto-refresh-pause') == "0" && Cookies.get('auto-refresh') > 5000) { if(sessionStorage.getItem('auto-refresh-pause') == "0" && sessionStorage.getItem('auto-refresh') > 5000) {
if (cur_url[0] == "logs.py") { if (cur_url[0] == "logs.py") {
showLog(); showLog();
} else if (cur_url[0] == "viewsttats.py") { } else if (cur_url[0] == "viewsttats.py") {
@ -204,30 +204,32 @@ function autoRefreshStyle(autoRefresh) {
} }
function setRefreshInterval(interval) { function setRefreshInterval(interval) {
if (interval == "0") { if (interval == "0") {
var autoRefresh = Cookies.get('auto-refresh'); var autoRefresh = sessionStorage.getItem('auto-refresh');
if (autoRefresh !== undefined) { if (autoRefresh !== undefined) {
Cookies.remove('auto-refresh'); sessionStorage.removeItem('auto-refresh');
pauseAutoRefresh(); pauseAutoRefresh();
$('.auto-refresh').prepend('<span class="service-reload auto-refresh-reload-icon"></span>'); $('#0').html('<span class="auto-refresh-reload auto-refresh-reload-icon"></span> Auto-refresh');
$('.auto-refresh').css('display', 'inline');
$('.auto-refresh').css('font-size', '15px'); $('.auto-refresh').css('font-size', '15px');
$('#1').text('Auto-refresh'); $('#1').text('Auto-refresh');
$('#0').text('Auto-refresh'); //$('#0').text('Auto-refresh');
$('.auto-refresh-pause').css('display', 'none'); $('.auto-refresh-pause').css('display', 'none');
$('.auto-refresh-resume').css('display', 'none'); $('.auto-refresh-resume').css('display', 'none');
$.getScript("/inc/fontawesome.min.js") $.getScript("/inc/fontawesome.min.js")
$.getScript("/inc/scripts.js")
} }
hideAutoRefreshDiv(); hideAutoRefreshDiv();
} else { } else {
clearInterval(intervalId); clearInterval(intervalId);
Cookies.set('auto-refresh', interval, { expires: 365, samesite: 'strict', secure: 'true' }); sessionStorage.setItem('auto-refresh', interval)
Cookies.set('auto-refresh-pause', "0", { expires: 365, samesite: 'strict', secure: 'true' }); sessionStorage.setItem('auto-refresh-pause', 0)
startSetInterval(interval); startSetInterval(interval);
hideAutoRefreshDiv(); hideAutoRefreshDiv();
autoRefreshStyle(interval); autoRefreshStyle(interval);
} }
} }
function startSetInterval(interval) { function startSetInterval(interval) {
if(Cookies.get('auto-refresh-pause') == "0") { if(sessionStorage.getItem('auto-refresh-pause') == "0") {
if (cur_url[0] == "logs.py") { if (cur_url[0] == "logs.py") {
intervalId = setInterval('showLog()', interval); intervalId = setInterval('showLog()', interval);
showLog(); showLog();
@ -275,13 +277,13 @@ function pauseAutoRefresh() {
$(function() { $(function() {
$('.auto-refresh-pause').css('display', 'none'); $('.auto-refresh-pause').css('display', 'none');
$('.auto-refresh-resume').css('display', 'inline'); $('.auto-refresh-resume').css('display', 'inline');
Cookies.set('auto-refresh-pause', "1", { expires: 365, samesite: 'strict', secure: 'true' }); sessionStorage.setItem('auto-refresh-pause', '1')
}); });
} }
function pauseAutoResume(){ function pauseAutoResume(){
var autoRefresh = Cookies.get('auto-refresh'); var autoRefresh = sessionStorage.getItem('auto-refresh');
setRefreshInterval(autoRefresh); setRefreshInterval(autoRefresh);
Cookies.set('auto-refresh-pause', "0", { expires: 365, samesite: 'strict', secure: 'true' }); sessionStorage.setItem('auto-refresh-pause', '0');
} }
function hideAutoRefreshDiv() { function hideAutoRefreshDiv() {
@ -627,7 +629,7 @@ $( function() {
} }
var pause = '<a onclick="pauseAutoRefresh()" title="Pause auto-refresh" class="auto-refresh-pause"></a>' var pause = '<a onclick="pauseAutoRefresh()" title="Pause auto-refresh" class="auto-refresh-pause"></a>'
var autoRefresh = Cookies.get('auto-refresh'); var autoRefresh = sessionStorage.getItem('auto-refresh');
if ($('.auto-refresh')) { if ($('.auto-refresh')) {
if(autoRefresh) { if(autoRefresh) {
@ -651,7 +653,7 @@ $( function() {
$(".footer").css("margin-left", "1%"); $(".footer").css("margin-left", "1%");
$(".show_menu").show(); $(".show_menu").show();
$("#hide_menu").hide(); $("#hide_menu").hide();
Cookies.set('hide_menu', 'hide', { expires: 365, samesite: 'strict', secure: 'true' }); sessionStorage.setItem('hide_menu', 'hide');
}); });
$( "#show_menu" ).click(function() { $( "#show_menu" ).click(function() {
$(".top-menu").show( "drop", "fast" ); $(".top-menu").show( "drop", "fast" );
@ -661,9 +663,9 @@ $( function() {
$(".footer").css("margin-left", "207px"); $(".footer").css("margin-left", "207px");
$(".show_menu").hide(); $(".show_menu").hide();
$("#hide_menu").show(); $("#hide_menu").show();
Cookies.set('hide_menu', 'show', { expires: 365, samesite: 'strict', secure: 'true' }); sessionStorage.setItem('hide_menu', 'show');
}); });
var hideMenu = Cookies.get('hide_menu'); var hideMenu = sessionStorage.getItem('hide_menu');
if (hideMenu == "show") { if (hideMenu == "show") {
$(".top-menu").show( "drop", "fast" ); $(".top-menu").show( "drop", "fast" );
$(".container").css("max-width", "100%"); $(".container").css("max-width", "100%");