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

v6.1.2.0 

Change log: https://roxy-wi.org/changelog.py#6_1_2
pull/328/head
Pavel Loginov 2022-07-20 15:38:09 +03:00
parent a73981dc5d
commit 3ef1e35b90
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/add.py
View File

@ -362,7 +362,7 @@ if form.getvalue('peers-name') is not None:
config_add = "\n" + name + servers_split config_add = "\n" + name + servers_split
if form.getvalue('generateconfig') is None: if form.getvalue('generateconfig') is None and serv is not None:
slave_output = '' slave_output = ''
try: try:
server_name = sql.get_hostname_by_server_ip(serv) server_name = sql.get_hostname_by_server_ip(serv)

2
app/funct.py
View File

@ -41,7 +41,7 @@ def checkAjaxInput(ajax_input: str) -> str:
sys.exit() sys.exit()
else: else:
from shlex import quote from shlex import quote
return quote(ajax_input) return quote(ajax_input.rstrip())
def get_config_var(sec, var): def get_config_var(sec, var):

1
inc/add.js
View File

@ -1812,6 +1812,7 @@ function addProxy(form_name) {
data: frm.serialize(), data: frm.serialize(),
type: frm.attr('method'), type: frm.attr('method'),
success: function( data ) { success: function( data ) {
data = data.replace(/\n/g, "<br>");
if (data.indexOf('error: ') != '-1' || data.indexOf('Fatal') != '-1') { if (data.indexOf('error: ') != '-1' || data.indexOf('Fatal') != '-1') {
returnNiceCheckingConfig(data); returnNiceCheckingConfig(data);
} else if (data == '') { } else if (data == '') {

16
inc/style.css
View File

@ -6,6 +6,7 @@
--light-blue-color: #d1ecf1; --light-blue-color: #d1ecf1;
--menu-color: #06212a; --menu-color: #06212a;
--right-menu-blue-rolor: #5D9CEB; --right-menu-blue-rolor: #5D9CEB;
--border-radius: 3px;
} }
html { html {
font-size: 10px; font-size: 10px;
@ -626,7 +627,7 @@ ul{
z-index: 1010 !important; z-index: 1010 !important;
} }
.ui-corner-all { .ui-corner-all {
border-radius: 0 !important; border-radius: 3px !important;
} }
#tabs.ui-widget.ui-widget-content { #tabs.ui-widget.ui-widget-content {
border-bottom: none !important; border-bottom: none !important;
@ -661,10 +662,11 @@ a:focus {
color: var(--link-dark-blue) !important; color: var(--link-dark-blue) !important;
} }
table { table {
border-spacing: 0; border-spacing: 0;
border-collapse: collapse; border-collapse: collapse;
background-color: transparent; background-color: transparent;
width: 100%; border-radius: var(--border-radius);
width: 100%;
} }
caption { caption {
color: #777; color: #777;
@ -764,6 +766,7 @@ label {
.div-server, .div-server-hapwi, .bin_bout { .div-server, .div-server-hapwi, .bin_bout {
background-color: #fbfbfb; background-color: #fbfbfb;
border: 1px solid #A4C7F5; border: 1px solid #A4C7F5;
border-radius: var(--border-radius);
height: 165px; height: 165px;
width: 400px; width: 400px;
padding: 10px 15px 20px; padding: 10px 15px 20px;
@ -839,6 +842,7 @@ label {
float: left; float: left;
} }
.ajax-server { .ajax-server {
border-radius: var(--border-radius);
margin: 25px 25px 0 787px; margin: 25px 25px 0 787px;
width: 797px; width: 797px;
display: none; display: none;
@ -1254,4 +1258,4 @@ label {
float: left; float: left;
width: 250px; width: 250px;
cursor: pointer; cursor: pointer;
} }