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

v5.2.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2
pull/304/head
Pavel Loginov 2021-06-21 11:46:53 +06:00
parent 91867cfa6f
commit effe3d091d
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/metrics.py
View File

@ -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'

2
app/templates/ajax/load_telegram.html
View File

@ -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>

2
app/templates/servers.html
View File

@ -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>

2
inc/add.js
View File

@ -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 );
} );
}

4
inc/style.css
View File

@ -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;

16
inc/table.css
View File

@ -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;