From 236f25113b2f8966e8dc04c801104fe29aac0f31 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 22 Mar 2021 12:33:28 +0600
Subject: [PATCH] v5.0.2.0

Changelog: https://haproxy-wi.org/changelog.py#5_0_2
---
 app/options.py           |  7 +++++--
 app/templates/login.html | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/options.py b/app/options.py
index 598dd4b..b6c2fe1 100644
--- a/app/options.py
+++ b/app/options.py
@@ -792,7 +792,10 @@ if serv is not None and act == "showMap":
                     line_new[0] = line_new2[0]
 
                 line_new[0] = line_new[0].strip(' \t\n\r')
-                line_new2[1] = line_new2[1].strip(' \t\n\r')
+                try:
+                    line_new2[1] = line_new2[1].strip(' \t\n\r')
+                except Exception as e:
+                    line_new2 = ['','']
 
                 if j % 2 == 0:
                     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
 
-    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)
 
     if stderr != '':
diff --git a/app/templates/login.html b/app/templates/login.html
index 36df67f..7ac0dd9 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -19,8 +19,17 @@ body, .container {
 	background-color: #ededee !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>
-<center style="margin-top: 15%; background-color: #5d9ceb;">
+<div id="main_div">
 	{{error_log}}
 		{{error}}
 	<div id="login-form" style="padding-top: 40px; padding-bottom: 50px; height: 250px; color: #000;">
@@ -29,7 +38,7 @@ body, .container {
 		</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;">
 			<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('ref', type='hidden', value=ref) }}
 			<button type="submit" name="Login" value="Enter" id="enter">Login</button>
@@ -43,5 +52,6 @@ body, .container {
 			</span>
 		</div>
 		<br /><br />
-</center>
+	</div>
+</div>
 {% endblock %}
\ No newline at end of file