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

v5.0.2.0 

Changelog: https://haproxy-wi.org/changelog.py#5_0_2
pull/304/head
Pavel Loginov 2021-03-22 12:33:28 +06:00
parent f863aa9e42
commit 236f25113b
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/options.py
View File

@ -792,7 +792,10 @@ if serv is not None and act == "showMap":
line_new[0] = line_new2[0] line_new[0] = line_new2[0]
line_new[0] = line_new[0].strip(' \t\n\r') line_new[0] = line_new[0].strip(' \t\n\r')
try:
line_new2[1] = line_new2[1].strip(' \t\n\r') line_new2[1] = line_new2[1].strip(' \t\n\r')
except Exception as e:
line_new2 = ['','']
if j % 2 == 0: if j % 2 == 0:
G.add_node(line_new[0], pos=(k + 230, i - 335), label_pos=(k + 225, i - 180)) G.add_node(line_new[0], pos=(k + 230, i - 335), label_pos=(k + 225, i - 180))
@ -2791,7 +2794,7 @@ if form.getvalue('provisiningdestroyserver'):
tf_workspace = workspace + '_' + group + '_' + cloud_type tf_workspace = workspace + '_' + group + '_' + cloud_type
cmd = 'cd scripts/terraform/ && sudo terraform workspace select ' + tf_workspace cmd = 'cd scripts/terraform/ && sudo terraform init -upgrade -no-color && sudo terraform workspace select ' + tf_workspace
output, stderr = funct.subprocess_execute(cmd) output, stderr = funct.subprocess_execute(cmd)
if stderr != '': if stderr != '':

16
app/templates/login.html
View File

@ -19,8 +19,17 @@ body, .container {
background-color: #ededee !important; background-color: #ededee !important;
font-weight: bold !important; font-weight: bold !important;
} }
#main_div {
margin-top: 15%;
background-color: #5d9ceb;
}
@supports (-moz-osx-font-smoothing: auto) {
#main_div {
background-color: #4a91e7;
}
}
</style> </style>
<center style="margin-top: 15%; background-color: #5d9ceb;"> <div id="main_div">
{{error_log}} {{error_log}}
{{error}} {{error}}
<div id="login-form" style="padding-top: 40px; padding-bottom: 50px; height: 250px; color: #000;"> <div id="login-form" style="padding-top: 40px; padding-bottom: 50px; height: 250px; color: #000;">
@ -29,7 +38,7 @@ body, .container {
</span> </span>
<form name="auth" id="auth" action="login.py" class="form-horizontal" method="post" style="margin-top: 40px;left: 0;float: left;margin-left: 93px;"> <form name="auth" id="auth" action="login.py" class="form-horizontal" method="post" style="margin-top: 40px;left: 0;float: left;margin-left: 93px;">
<br> <br>
{{ input('login', class='form-login', placeholder='Login', required='required') }}<br /><br /> {{ input('login', class='form-login', placeholder='Login', required='required', autofocus='autofocus') }}<br /><br />
{{ input('pass', type='password', class='form-login', placeholder='Password', required='required') }}<br /><br /> {{ input('pass', type='password', class='form-login', placeholder='Password', required='required') }}<br /><br />
{{ input('ref', type='hidden', value=ref) }} {{ input('ref', type='hidden', value=ref) }}
<button type="submit" name="Login" value="Enter" id="enter">Login</button> <button type="submit" name="Login" value="Enter" id="enter">Login</button>
@ -43,5 +52,6 @@ body, .container {
</span> </span>
</div> </div>
<br /><br /> <br /><br />
</center> </div>
</div>
{% endblock %} {% endblock %}