From effe3d091dd1484ea161e8d72ef1adc4eb01759e Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 21 Jun 2021 11:46:53 +0600
Subject: [PATCH] v5.2.0

Changelog: https://haproxy-wi.org/changelog.py#5_2
---
 app/metrics.py                        |  2 +-
 app/templates/ajax/load_telegram.html |  2 +-
 app/templates/servers.html            |  2 +-
 inc/add.js                            |  2 +-
 inc/style.css                         |  4 ++++
 inc/table.css                         | 16 ++++++++--------
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/metrics.py b/app/metrics.py
index 27889cc4..04f55983 100644
--- a/app/metrics.py
+++ b/app/metrics.py
@@ -10,7 +10,7 @@ funct.check_login()
 
 try:
 	user, user_id, role, token, servers = funct.get_users_params()
-	cmd = "rpm --query haproxy-wi-metrics-* |awk -F\"metrics\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'"
+	cmd = "rpm --query roxy-wi-metrics-* |awk -F\"metrics\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'"
 	service_ver, stderr = funct.subprocess_execute(cmd)
 	services = '0'
 
diff --git a/app/templates/ajax/load_telegram.html b/app/templates/ajax/load_telegram.html
index b70b3a78..53d52a3c 100644
--- a/app/templates/ajax/load_telegram.html
+++ b/app/templates/ajax/load_telegram.html
@@ -1,6 +1,6 @@
 {% from 'include/input_macros.html' import input, select %}
 {% for s in services %}
-{% if s.0 == 'checker_haproxy' %}
+{% if s.0 == 'roxy-wi-checker' %}
     {% if s.3 != '* is not installed' and s.3 != '' %}
     <table id="checker_table" class="overview">
         <caption><h3>Add Telegram channel</h3></caption>
diff --git a/app/templates/servers.html b/app/templates/servers.html
index 228a9370..67d85782 100644
--- a/app/templates/servers.html
+++ b/app/templates/servers.html
@@ -150,7 +150,7 @@
 			<tr class="overviewHead">
 				<th colspan=13 style="background-color: #d1ecf1; padding: 10px;">
 					<span id="table_metrics_head" style="position: absolute;margin-left: 43%;">Country codes</span>
-					<span id="show_country_codes" class="add switcher_table_metric" title="Show country codes"></span>
+					<span id="show_country_codes" class="plus switcher_table_metric" title="Show country codes"></span>
 					<span id="hide_country_codes" class="minus switcher_table_metric" title="Hide country codes" style="display: none;"></span>
 				</th>
 			</tr>
diff --git a/inc/add.js b/inc/add.js
index 22717186..1389ea71 100644
--- a/inc/add.js
+++ b/inc/add.js
@@ -865,7 +865,7 @@ $( function() {
 				$(this).children("#add7").css('padding-left', '30px');
 				$(this).children("#add7").css('border-left', '4px solid #5D9CEB');
 			});
-			$( "#tabs" ).tabs( "option", "active", 8 );
+			$( "#tabs" ).tabs( "option", "active", 9 );
 		} );
 	}
 	
diff --git a/inc/style.css b/inc/style.css
index cd25e47c..7647523b 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -3,6 +3,7 @@
 	--red-color: #be2424;
 	--blue-color: #5d9ceb;
 	--link-dark-blue: #23527c;
+	--light-blue-color: #d1ecf1;
 }
 html {
   font-size: 10px;
@@ -670,6 +671,9 @@ td,th {
   text-align: left;
   min-width: 25px;
 }
+.odd:hover, .even:hover {
+    background-color: var(--light-blue-color);
+}
 .row {
   margin-right: -15px;
   margin-left: -15px;
diff --git a/inc/table.css b/inc/table.css
index 3a9af3f0..6b3d8939 100644
--- a/inc/table.css
+++ b/inc/table.css
@@ -49,7 +49,7 @@ table.dataTable {
   table.dataTable tbody tr {
     background-color: white; }
     table.dataTable tbody tr.selected {
-      background-color: #5d9ceb; }
+      background-color: var(--blue-color); }
   table.dataTable tbody th,
   table.dataTable tbody td {
     padding: 8px 10px; }
@@ -73,7 +73,7 @@ table.dataTable {
     table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected {
       background-color: #5a98e5; }
   table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
-    background-color: #e9f0f5; }
+    background-color: #d1ecf1; }
     table.dataTable.hover tbody tr:hover.selected, table.dataTable.display tbody tr:hover.selected {
       background-color: #5996e2; }
   table.dataTable.order-column tbody tr > .sorting_1,
@@ -271,17 +271,17 @@ table.dataTable td {
         color: white !important;
         border: 1px solid #bbb;
         background-color: #dceafb;
-        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dceafb), color-stop(100%, #5d9ceb));
+        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dceafb), color-stop(100%, var(--blue-color)));
         /* Chrome,Safari4+ */
-        background: -webkit-linear-gradient(top, #dceafb 0%, #5d9ceb 100%);
+        background: -webkit-linear-gradient(top, #dceafb 0%, var(--blue-color) 100%);
         /* Chrome10+,Safari5.1+ */
-        background: -moz-linear-gradient(top, #dceafb 0%, #5d9ceb 100%);
+        background: -moz-linear-gradient(top, #dceafb 0%, var(--blue-color) 100%);
         /* FF3.6+ */
-        background: -ms-linear-gradient(top, #dceafb 0%, #5d9ceb 100%);
+        background: -ms-linear-gradient(top, #dceafb 0%, var(--blue-color) 100%);
         /* IE10+ */
-        background: -o-linear-gradient(top, #dceafb 0%, #5d9ceb 100%);
+        background: -o-linear-gradient(top, #dceafb 0%, var(--blue-color) 100%);
         /* Opera 11.10+ */
-        background: #5d9ceb;
+        background: var(--blue-color);
         /* W3C */ }
       .dataTables_wrapper .dataTables_paginate .paginate_button:active {
         outline: none;