From 2288082e867a657a12552fa03f2a606ebd4c6879 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 26 Aug 2021 11:44:27 +0600
Subject: [PATCH] v5.2.4.0

Changelog: https://haproxy-wi.org/changelog.py#5_2_4
---
 app/templates/add.html                    | 17 +++++++++++------
 app/templates/include/admins_dialogs.html |  6 +++---
 inc/add.js                                | 18 +++++++++++++++---
 inc/style.css                             | 17 +++++++++--------
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/templates/add.html b/app/templates/add.html
index a2356608..f86295af 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -674,6 +674,7 @@
 				<td>
 					Uploaded certificates
 				</td>
+				<td></td>
 			</tr>
 			<tr>
 				<td class="padding10 first-collumn">
@@ -685,8 +686,8 @@
 					</select>
 					<button id="ssl_key_view" title="View certificates">View</button>
 				</td>
-				<td colspan="2">
-					<span  id="ajax-show-ssl"></span>
+				<td colspan="2" style="padding: 10px 0 10px 0;">
+					<span id="ajax-show-ssl"></span>
 				</td>
 			</tr>
 			<tr class="overviewHead">
@@ -1041,9 +1042,11 @@
 							{% endfor %}
 					</select>
 				</td>
-				<td style="width: 30%;">
+				<td style="width: 30%; padding: 10px 0 10px 0;">
 					{% for list in black_lists %}
-						<a onclick="editList('{{ list }}', 'black')" style="cursor: pointer;" title="Edit list {{ list }}">{{ list }}</a>
+					<span class="list_of_lists">
+						<a onclick="editList('{{ list }}', 'black')" title="Edit the {{ list }} list">{{ list }}</a>
+					</span>
 					{% endfor %}
 				</td>
 
@@ -1070,9 +1073,11 @@
 							{% endfor %}
 					</select>
 				</td>
-				<td style="width: 30%;">
+				<td style="width: 30%; padding: 10px 0 10px 0;">
 					{% for list in white_lists %}
-						<a onclick="editList('{{ list }}', 'white')" style="cursor: pointer;" title="Edit list {{ list }}">{{ list }}</a>
+					<span class="list_of_lists">
+						<a onclick="editList('{{ list }}', 'white')" title="Edit the {{ list }} list">{{ list }}</a>
+					</span>
 					{% endfor %}
 				</td>
 			</tr>
diff --git a/app/templates/include/admins_dialogs.html b/app/templates/include/admins_dialogs.html
index c30c8302..44fb0985 100644
--- a/app/templates/include/admins_dialogs.html
+++ b/app/templates/include/admins_dialogs.html
@@ -258,9 +258,9 @@
 <div id="dialog-confirm-services" style="display: none;">
     <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Are you sure?</p>
 </div>
-<div id="show_scans_ports" style="display: none; padding: 0;">
-    <div id="show_scans_ports_body"></div>
-</div>
 <div id="firewall_rules" style="display: none; padding: 0 2px 0 0; margin-left: 1px; margin-right: -4px;">
     <div id="firewall_rules_body"></div>
+</div>
+<div id="change-user-service-dialog" style="display: none;">
+	<div id="change-user-service-form"></div>
 </div>
\ No newline at end of file
diff --git a/inc/add.js b/inc/add.js
index 4c433fca..8d2b7644 100644
--- a/inc/add.js
+++ b/inc/add.js
@@ -942,12 +942,24 @@ $( function() {
 					var i;
 					var new_data = "";
 					data = data.split("\n");
-					
+					var j = 1
 					for (i = 0; i < data.length; i++) {
 						data[i] = data[i].replace(/\s+/g,' ');
-						new_data += ' <a onclick="view_ssl(\''+data[i]+'\')" style="cursor: pointer;" title="View this cert">'+data[i]+'</a> '
+						if (data[i] != '') {
+							if (j % 2) {
+								if (j != 0) {
+									new_data += '</span>'
+								}
+								new_data += '<span class="list_of_lists">'
+							} else {
+								new_data += '</span><span class="list_of_lists">'
+
+							}
+							j += 1
+							new_data += ' <a onclick="view_ssl(\'' + data[i] + '\')" title="View ' + data[i] + ' cert">' + data[i] + '</a> '
+						}
 					}
-					$("#ajax-show-ssl").html("<b>"+new_data+"</b>");					
+					$("#ajax-show-ssl").html(new_data);
 				} 
 			}
 		} );
diff --git a/inc/style.css b/inc/style.css
index 2b866866..1860dc6d 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -481,7 +481,7 @@ ul{
 	min-height: calc(100vh - 95px);
 	font-size: 1.1em;
 }
-.menu a{
+.menu a {
 	background: var(--menu-color);
 	color: #fff;
 	padding: 10px;
@@ -490,11 +490,7 @@ ul{
 	transition: 0.5s all;
 	cursor: pointer;
 }
-.sidebar{
-	width: 200px;
-	margin: 20px;
-}
-.menu a:hover{
+.menu a:hover {
 	background: #48505A;
 	padding: 10px 0 10px 20px;
 	color: #fff;
@@ -509,8 +505,8 @@ ul{
 .menu li .v_menu li a{
 	border-radius: 0;
 }
-.p_menu{position: relative;}
-.v_menu{
+.p_menu {position: relative;}
+.v_menu {
 	position: absolute;
 	width: 100%;
 	left: 180px;
@@ -1237,4 +1233,9 @@ label {
 .copyToClipboard:active {
 	transition: .3s;
 	color: var(--link-dark-blue);
+}
+.list_of_lists {
+	float: left;
+	width: 250px;
+	cursor: pointer;
 }
\ No newline at end of file