From 15ab47266e39939408dd430663719139f93351ec Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Fri, 26 Nov 2021 15:11:07 +0600
Subject: [PATCH] v5.3.3.0

Changelog: https://haproxy-wi.org/changelog.py#5_3_3
---
 app/templates/ha.html                       |  4 ++--
 app/templates/include/change_pass_form.html |  4 ++--
 app/templates/servers.html                  | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/templates/ha.html b/app/templates/ha.html
index c35f1ab7..a7107a66 100644
--- a/app/templates/ha.html
+++ b/app/templates/ha.html
@@ -42,9 +42,9 @@
 		<td>{{ input('interface', size='7', title='Interface for VRRP address') }}</td>
 		<td>{{ input('vrrp-ip', size='14') }}</td>
 		<td class="checkbox help_cursor">{{ checkbox('hap', title='Roxy-WI will try to install HAProxy') }}</td>
-		<td class="checkbox help_cursor" style="display: none" id="haproxy_docker_td">{{ checkbox('hap_docker', title='Roxy-WI will install HAProxy as Docker container') }}</td>
+		<td class="checkbox help_cursor" style="display: none" id="haproxy_docker_td">{{ checkbox('hap_docker', title='Roxy-WI will install HAProxy as a Docker container') }}</td>
 		<td class="checkbox help_cursor">{{ checkbox('nginx', title='Roxy-WI will try to install Nginx') }}</td>
-		<td class="checkbox help_cursor" style="display: none" id="nginx_docker_td">{{ checkbox('nginx_docker', title='Roxy-WI will install Nginx as Docker container') }}</td>
+		<td class="checkbox help_cursor" style="display: none" id="nginx_docker_td">{{ checkbox('nginx_docker', title='Roxy-WI will install Nginx as a Docker container') }}</td>
 		<td class="checkbox help_cursor">{{ checkbox('virt_server', title='Roxy-WI will add VRRP address as a separated server', checked='checked') }}</td>
 		<td class="syn-flood-protection-field">{{ checkbox('syn_flood') }}</td>
 		<td>
diff --git a/app/templates/include/change_pass_form.html b/app/templates/include/change_pass_form.html
index b4e07852..6fcc9ef4 100644
--- a/app/templates/include/change_pass_form.html
+++ b/app/templates/include/change_pass_form.html
@@ -3,7 +3,7 @@
 	<table class="overview">
 		<tr>
 			<td colspan="2">
-				  <p class="validateTips alert alert-success">Enter password and confirm</p>
+				  <p class="validateTips alert alert-success">Enter a password and confirm</p>
 			</td>
 		</tr>
 		<tr>
@@ -16,7 +16,7 @@
 		</tr>
 		<tr id="missmatchpass" style="display: none;">
 			<td colspan="2">
-				  <p class="validateTips alert alert-danger" style="margin-top: 10px;">Passwords are mismatched</p>
+				  <p class="validateTips alert alert-danger" style="margin-top: 10px;">The passwords are mismatched</p>
 			</td>
 		</tr>
 	</table>
diff --git a/app/templates/servers.html b/app/templates/servers.html
index 86171d18..9f61c2f4 100644
--- a/app/templates/servers.html
+++ b/app/templates/servers.html
@@ -47,7 +47,7 @@
 				<td class="padding10 first-collumn">Current version</td>
 				<td class="padding10 first-collumn" style="width: 30%;">Available Versions</td>			
 				<td class="padding10 first-collumn" style="width: 20%;">Server</td>
-				<td>Install as a Docker container</td>
+				<td class="help_cursor" title="Install HAProxy service as a Docker container">Use Docker</td>
 				<td>SYN-flood protection</td>
 				<td></td>
 			</tr>
@@ -70,8 +70,8 @@
 						{% endfor %}
 					</select>
 				</td>
-				<td class="syn-flood-protection-field">
-					{{ checkbox('haproxy_docker', title="Install as a Docker container") }}
+				<td style="padding-left: 25px;">
+					{{ checkbox('haproxy_docker', title="Install HAProxy service as a Docker container") }}
 				</td>
 				<td class="syn-flood-protection-field">
 					{{ checkbox('syn_flood', title="Enable SYN-flood protection", checked='checked') }}
@@ -87,7 +87,7 @@
 				<td class="padding10 first-collumn">Current version</td>
 				<td class="padding10 first-collumn" style="width: 30%;">Available Versions</td>			
 				<td class="padding10 first-collumn" style="width: 20%;">Server</td>
-				<td>Install as a Docker container</td>
+				<td class="help_cursor" title="Install Nginx service as a Docker container" >Use Docker</td>
 				<td>SYN-flood protection</td>
 				<td></td>
 			</tr>
@@ -95,7 +95,7 @@
 				<td id="cur_nginx_ver" class="padding10 first-collumn">
 				</td>
 				<td class="padding10 first-collumn" style="width: 20%;">
-					Roxy-WI will try to install the latest Nginx version from official Nginx repository
+					Roxy-WI will try to install the latest Nginx version from an official Nginx repository
 				</td>
 				<td class="padding10 first-collumn">
 					<select autofocus required name="nginxaddserv" id="nginxaddserv">
@@ -105,8 +105,8 @@
 						{% endfor %}
 					</select>
 				</td>
-				<td class="syn-flood-protection-field">
-					{{ checkbox('nginx_docker', title="Install as a Docker container") }}
+				<td style="padding-left: 25px;">
+					{{ checkbox('nginx_docker', title="Install Nginx service as a Docker container") }}
 				</td>
 				<td class="syn-flood-protection-field">
 					{{ checkbox('nginx_syn_flood', title="Enable SYN-flood protection", checked='checked') }}