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

v6.1.1.0 

Change log: https://roxy-wi.org/changelog.py#6_1_1
pull/328/head
Pavel Loginov 2022-07-08 17:40:45 +03:00
parent 43a9f600c1
commit 43f116fdf3
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/templates/ajax/config_show.html
View File

@ -99,6 +99,50 @@
  {{ line }}   {{ line }}
</span><br /> </span><br />
{% endif %} {% endif %}
{% elif service == 'apache' %}
{% if i == 0 and "<VirtualHost" not in line %}
<span class="param">
</span><div>
<span class="configLine">
<span class="numRow">{{ i }}</span>
&emsp;&emsp;{{ line }}
</span><br />
{% continue %}
{% endif %}
{%- if "<VirtualHost" in line -%}
{% if i > 1 %}
</div>
{% endif %}
<span class="param">{{ line }}
</span><div>
{% continue %}
{% endif %}
{% if "<" in line or "</" in line %}
{% if "#" not in line %}
<span class="numRow">
{{ i }}
</span>
<span class="paramInSec">
&emsp;{{ line }}
</span><br />
{% continue %}
{% endif %}
{% endif %}
{% if "#" in line %}
<span class="numRow">
{{ i }}
</span>
<span class="comment">
&emsp;{{ line }}
</span><br />
{% continue %}
{% endif %}
{% if line|length > 1 %}
<span class="configLine">
<span class="numRow">{{ i }}</span>
&emsp;&emsp;{{ line }}
</span><br />
{% endif %}
{% elif service == 'keepalived' %} {% elif service == 'keepalived' %}
{%- if "global_defs {" in line -%} {%- if "global_defs {" in line -%}
{% if i > 1 %} {% if i > 1 %}

2
inc/configshow.js
View File

@ -61,7 +61,7 @@ $( function() {
data: frm.serialize() + "&save=" + $(this).val(), data: frm.serialize() + "&save=" + $(this).val(),
type: frm.attr('method'), type: frm.attr('method'),
success: function( data ) { success: function( data ) {
data = data.replaceAll('\n', '<br>'); data = data.replace(/\n/g, "<br>");
if (data.indexOf(service + ': command not found') != '-1') { if (data.indexOf(service + ': command not found') != '-1') {
try { try {
var service = findGetParameter('service'); var service = findGetParameter('service');

2
inc/script.js
View File

@ -904,7 +904,7 @@ $( function() {
$('#auth').submit(function() { $('#auth').submit(function() {
let searchParams = new URLSearchParams(window.location.search) let searchParams = new URLSearchParams(window.location.search)
if(searchParams.has('ref')) { if(searchParams.has('ref')) {
window.location = /.*ref=([^&]*).*/.exec(document.location.href)[1]; var ref = /.*ref=([^&]*).*/.exec(document.location.href)[1];
} else { } else {
var ref = "overview.py"; var ref = "overview.py";
} }