diff --git a/app/add.py b/app/add.py index db9885f8..221ca2de 100644 --- a/app/add.py +++ b/app/add.py @@ -254,11 +254,14 @@ elif form.getvalue('mode') is not None: acl += ' http-request deny' acl_then_value = '' elif acl_then[i] == '6': - acl += ' return ' + acl += f' acl return_{acl_value[i]} {acl_if_word} {acl_value[i]}\n' + acl += f' http-request return if return_{acl_value[i]}\n' elif acl_then[i] == '7': - acl += ' set-header ' + acl += f' acl set_header_{acl_value[i]} {acl_if_word} {acl_value[i]}\n' + acl += f' http-request set-header if set_header_{acl_value[i]}\n' - acl += acl_then_value + ' if { ' + acl_if_word + acl_value[i] + ' } \n' + if acl_then[i] in ('2', '3', '4', '5'): + acl += acl_then_value + ' if { ' + acl_if_word + acl_value[i] + ' } \n' except Exception: acl = '' diff --git a/app/templates/ajax/load_services.html b/app/templates/ajax/load_services.html index 65778c0a..df30cec9 100644 --- a/app/templates/ajax/load_services.html +++ b/app/templates/ajax/load_services.html @@ -65,9 +65,8 @@ {{ s.3 }} {% endif %} - + {{ services_name[s.0]['desc'] }} - {% endfor %} diff --git a/app/templates/ajax/load_updateroxywi.html b/app/templates/ajax/load_updateroxywi.html index 400cf6a3..872800ae 100644 --- a/app/templates/ajax/load_updateroxywi.html +++ b/app/templates/ajax/load_updateroxywi.html @@ -38,10 +38,9 @@ {{lang.words.w_update|title()}} {% endif %} - + {{lang.admin_page.desc.main_app}} - {% for s in services %} {% if s.0 in ('roxy-wi-smon', 'roxy-wi-checker', 'roxy-wi-keep_alive', 'roxy-wi-metrics', 'roxy-wi-portscanner', 'roxy-wi-socket', 'roxy-wi-prometheus-exporter') %} diff --git a/app/templates/ajax/smon_dashboard.html b/app/templates/ajax/smon_dashboard.html index 64cc3c3e..166060fc 100644 --- a/app/templates/ajax/smon_dashboard.html +++ b/app/templates/ajax/smon_dashboard.html @@ -9,12 +9,12 @@ {% for s in smon %} {% if s.en == 1 %} {% if s.status == 1 and s.http_status == 1 and s.body_status == 1 %} - {% if up.append('1') %} {% endif %} + {% if up.append('1') %} {% endif %} {% else %} - {% if down.append('1') %} {% endif %} + {% if down.append('1') %} {% endif %} {% endif %} {% else %} - {% if dis.append(s.group) %} {% endif %} + {% if dis.append(s.group) %} {% endif %} {% endif %} {% endfor %} {{lang.smon_page.desc.status_summary}}: {{lang.smon_page.desc.UP}}: {{up|length}}, {{lang.smon_page.desc.DOWN}}: {{down|length}}, {{lang.words.disabled|title()}}: {{dis|length}} @@ -26,7 +26,7 @@ {% set group = [] %} {% set group_prev = [] %} {%- for s in smon -%} - {% set checks = lang.smon_page.desc.enabled_checks +':
' + lang.phrases.port_check|title() %} + {% set checks = lang.smon_page.desc.enabled_checks +':
' + lang.phrases.port_check %} {% if s.http %} {% set checks = checks + ',
' + lang.smon_page.desc.http_status_check + ': ' + s.http.split(':')[0]|string() + '://' + s.ip|string() + ':' + s.port|string() + s.http.split(':')[1]|string() %} {% endif %} @@ -36,66 +36,52 @@ {% if s.ssl_expire_date %} {% set checks = checks + ',
SSL ' + lang.words.expire + ': ' + s.ssl_expire_date %} {% endif %} - {% if s.group %} - {% if s.group not in group %} -
-
- {{ s.group }} -
-
- {% endif %} - {% if group.append(s.group) %} {% endif %} - {% else %} -
-
- None -
-
- {% endif %} {% if s.en == 1 %} {% if s.status == 1 and s.http_status == 1 and s.body_status == 1 %} -
'+s.time_state|string()+'' %} + {% elif s.status == 0 or s.http_status == 0 or s.body_status == 0 %} + {% set additional_classes = 'err div-server-head-down' %} + {% set uptime_desc = lang.words.downtime + ': ' %} {% else %} -
+ {% set additional_style = '' %} + {% if s.ip|string|length > 23 %} + {% set additional_style = 'font-size: 11px;' %} + {% elif s.ip|string|length > 20 %} + {% set additional_style = 'font-size: 12px;' %} + {% elif s.ip|string|length > 17 %} + {% set additional_style = 'font-size: 15px;' %} + {% endif %} + {% if s.group not in group %} +
+
+ {% if s.group %} {{ s.group }} {% else %} None {% endif %} +
+
+ {% endif %} + {% if group.append(s.group) %} {% endif %} +
- {% if s.ip|string|length > 23 %} - - {% elif s.ip|string|length > 20 %} - - {% elif s.ip|string|length > 17 %} - - {% else %} - - {% endif %} - {{s.ip}}:{{s.port}} - + + {{s.ip}}:{{s.port}}
- {% if s.desc is not none %} + {% if s.desc %} {{s.desc}} {% else %} - {{lang.words.desc|title()}}: None + {{lang.words.desc|title()}}: {{lang.words.none}} {% endif %}
- {% if s.en == 1 %} - {% if s.status == 1 and s.http_status == 1 and s.body_status == 1 %} - {{lang.words.uptime}}: - {% elif s.status == 0 or s.http_status == 0 or s.body_status == 0 %} - {{lang.words.downtime}}: - {% else %} - {{lang.words.uptime}}: N/A - {% endif %} - {% else %} - {{lang.words.uptime}}: N/A - {% endif %} + {{uptime_desc|safe}}
{% if s.en == 1 %} @@ -116,40 +102,28 @@ {% if s.en == 1 %} {% if s.status == 1 and s.http_status == 1 and s.body_status == 1 %}
-
- {{lang.smon_page.desc.UP}} -
+ {{lang.smon_page.desc.UP}}
{% elif s.http_status == 0 %}
-
- {{lang.smon_page.desc.HTTP_FAILURE}} -
+ {{lang.smon_page.desc.HTTP_FAILURE}}
{% elif s.body_status == 0 %}
-
- {{lang.smon_page.desc.BODY_FAILURE}} -
+ {{lang.smon_page.desc.BODY_FAILURE}}
{% elif s.status == 3 %}
-
- {{lang.smon_page.desc.UNKNOWN}} -
+ {{lang.smon_page.desc.UNKNOWN}}
{% else %}
-
- {{lang.smon_page.desc.PORT_DOWN}} -
+ {{lang.smon_page.desc.PORT_DOWN}}
{% endif %} {% else %}
-
- {{lang.smon_page.desc.DISABLED}} -
+ {{lang.smon_page.desc.DISABLED}}
{% endif %}
diff --git a/app/templates/languages/en.html b/app/templates/languages/en.html index 8aa31e48..6cd7a928 100644 --- a/app/templates/languages/en.html +++ b/app/templates/languages/en.html @@ -292,7 +292,7 @@ "you_are_editing": "You are editing", "section_from_server": "section from server", "how_to_install": "how to install", - "port_check": "port check", + "port_check": "Port check", "possible_service_name": "Possible service name", "server_info": "Server info", "user_groups": "User groups", diff --git a/app/templates/languages/pt-br.html b/app/templates/languages/pt-br.html index 2b3c334f..42386d81 100644 --- a/app/templates/languages/pt-br.html +++ b/app/templates/languages/pt-br.html @@ -292,7 +292,7 @@ "you_are_editing": "Você está editando", "section_from_server": "Seção do servidor", "how_to_install": "como instalar", - "port_check": "verificação de porta", + "port_check": "Verificação de porta", "possible_service_name": "Possible service name", "server_info": "Informação sobre o servidor", "user_groups": "Grupos de usuários", diff --git a/app/templates/languages/ru.html b/app/templates/languages/ru.html index d3653d72..4973b4ea 100644 --- a/app/templates/languages/ru.html +++ b/app/templates/languages/ru.html @@ -292,7 +292,7 @@ "you_are_editing": "Вы редактируете", "section_from_server": "секцию с сервера", "how_to_install": "как установить", - "port_check": "проверка порта", + "port_check": "Проверка порта", "possible_service_name": "Возможное название службы", "server_info": "Информация о сервере", "user_groups": "Пользовательские группы", @@ -559,7 +559,7 @@ "w_update": "обновить", "updating": "обновление", "monitoring": "мониторинг", - "auto": "автоматическое", + "auto": "авто", "refresh": "обновление", "refresh2": "обновить", "no": "нет", diff --git a/inc/add.js b/inc/add.js index 4da2bc9f..1ad57ae5 100644 --- a/inc/add.js +++ b/inc/add.js @@ -1823,11 +1823,11 @@ function addProxy(form_name) { type: frm.attr('method'), success: function( data ) { data = data.replace(/\n/g, "
"); - if (data.indexOf('error: ') != '-1' || data.indexOf('Fatal') != '-1') { + if (data.indexOf('error: ') != '-1' || data.indexOf('Error(s)') != '-1' || data.indexOf('Fatal') != '-1') { returnNiceCheckingConfig(data); } else if (data == '') { toastr.clear(); - toastr.error('error: Proxy cannot be empty'); + toastr.error('error: Something went wrong. Check configuration'); } else { toastr.clear(); returnNiceCheckingConfig(data); diff --git a/inc/css/style-6.3.9.css b/inc/css/style-6.3.9.css index 5a1bfab8..95f1c191 100644 --- a/inc/css/style-6.3.9.css +++ b/inc/css/style-6.3.9.css @@ -1019,6 +1019,7 @@ label { width: 177px; font-size: 30px; color: #fff; + text-align: center; } .up { color: #3c763d; @@ -1030,6 +1031,8 @@ label { background-color: #f2dede; border-color: #ebccd1; font-size: 22px; + padding-top: 7px; + height: 38px; } .unknown { color: #856404; diff --git a/inc/script-6.3.9.js b/inc/script-6.3.9.js index 5abb4601..9c170ed0 100644 --- a/inc/script-6.3.9.js +++ b/inc/script-6.3.9.js @@ -1459,7 +1459,7 @@ function returnNiceCheckingConfig(data) { console.log(err); } alerts.forEach((element) => { - if (element.indexOf('error: ') != '-1' || element.indexOf('Fatal') != '-1' || element.indexOf('Error') != '-1' || element.indexOf('failed ') != '-1' || element.indexOf('emerg] ') != '-1' || element.indexOf('Syntax error ') != '-1' || element.indexOf('Parsing') != '-1') { + if (element.indexOf('error: ') != '-1' || element.indexOf('Fatal') != '-1' || element.indexOf('Error') != '-1' || element.indexOf('failed ') != '-1' || element.indexOf('emerg] ') != '-1' || element.indexOf('Syntax error ') != '-1' || element.indexOf('Parsing') != '-1' || element.indexOf('parsing') != '-1') { alert_error = alert_error + element; return } diff --git a/inc/smon.js b/inc/smon.js index c8f606ed..fa6ae219 100644 --- a/inc/smon.js +++ b/inc/smon.js @@ -215,7 +215,7 @@ $( function() { updateSmon(id[2]) }); var add_word = $('#translate').attr('data-add'); - var cancel_word = $('#translate').attr('data-cancel_word'); + var cancel_word = $('#translate').attr('data-cancel'); var smon_add_tabel_title = $( "#smon-add-table-overview" ).attr('title'); var addSmonServer = $( "#smon-add-table" ).dialog({ autoOpen: false,