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

v4.4.1.0 

Changelog: https://haproxy-wi.org/changelog.py#4_4_1
pull/246/head
Pavel Loginov 2020-08-04 18:40:58 +02:00
parent 6158f2c878
commit aed84794d4
9 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/add.html
View File

@ -538,7 +538,7 @@ h3 {
<option value="{{ select.2 }}">{{ select.1 }}</option>
{% endfor %}
</select>
<a class="ui-button ui-widget ui-corner-all" id="ssl_key_view" title="View certificates">View</a>
<button id="ssl_key_view" title="View certificates">View</button>
</td>
<td>
<span id="ajax-show-ssl"></span>
@ -568,7 +568,7 @@ h3 {
</td>
<td style="padding-top: 15px; padding-bottom: 15px;">
<textarea id="ssl_cert" cols="50" rows="5"></textarea><br /><br />
<a class="ui-button ui-widget ui-corner-all" id="ssl_key_upload" title="Upload ssl certificates">Upload</a>
<button id="ssl_key_upload" title="Upload ssl certificates">Upload</button>
</td>
</tr>
</table>
@ -613,7 +613,7 @@ h3 {
{{ input('new-option', size='60') }}
</td>
<td>
<a class="add-admin" id="add-option-new" title="Add new option" style="cursor: pointer;"></a>
<span class="add-admin" id="add-option-new" title="Add new option" style="cursor: pointer;"></span>
</td>
</tr>
</table>
@ -668,7 +668,7 @@ h3 {
{{ input('new-saved-servers-description', size='50') }}
</td>
<td>
<a class="add-admin" id="add-saved-server-new" title="Add new server" style="cursor: pointer;"></a>
<button class="add-admin" id="add-saved-server-new" title="Add new server" style="cursor: pointer;"></button>
</td>
</tr>
</table>
@ -717,7 +717,7 @@ h3 {
{{ input('userlist-group', title="User`s group", placeholder="group_name") }}
</span>
<span>
<a class="add-server" id="add-userlist-group" title="Add extra group" style="cursor: pointer;"></a>
<span class="add-server" id="add-userlist-group" title="Add extra group" style="cursor: pointer;"></span>
</span>
<div class="tooltip tooltipTop">It is also possible to attach users to this group by using a comma separated list of names preceded by "users" keyword.</div>
</td>
@ -731,7 +731,7 @@ h3 {
{{ input('userlist-user-group', title="User`s group", placeholder="user`s group") }}
</span>
<span>
<a class="add-server" id="add-userlist-user" title="Add extra user" style="cursor: pointer;"></a>
<span class="add-server" id="add-userlist-user" title="Add extra user" style="cursor: pointer;"></span>
</span>
<div class="tooltip tooltipTop">It is also possible to attach groups to this user by using a comma separated list of groups.</div>
</td>

30
app/templates/admin.html
View File

@ -26,7 +26,7 @@
<div id="users">
<table class="overview" id="ajax-users">
<thead>
<tr class="overviewHead">
<tr class="overviewHead">
<th class="padding10 first-collumn">Login name</th>
<th>Password</th>
<th>Active</th>
@ -89,7 +89,7 @@
{% set id = 'name-' + group.0|string() %}
{{ input(id, value=group.1) }}
</td>
<td style="width: 100%;">
<td>
{% set id = 'descript-' + group.0|string() %}
{% if group.2 != "None" %}
{{ input(id, value=group.2, size='60') }}
@ -115,13 +115,13 @@
</tr>
<tr>
<td class="padding10 first-collumn">
{{ input('new-group-add') }}
{{ input('new-group-add', autofocus='autofocus') }}
</td>
<td style="width: 100%;">
<td>
{{ input('new-desc', size="60") }}
</td>
<td>
<a class="add-admin" id="add-group" title="Add new group" style="cursor: pointer;"></a>
<span class="add-admin" id="add-group" title="Add new group" style="cursor: pointer;"></span>
</td>
</tr>
</table>
@ -199,7 +199,7 @@
</td>
<td>Group</td>
<td>
<span title="Enter SSH user name. If SSH key disabled, enter password for ssh user">Credentials</span>
<span title="Enter SSH user name. If SSH key disabled, enter password for SSH user">Credentials</span>
</td>
<td></td>
</tr>
@ -257,9 +257,9 @@
</tr>
<tr>
<td class="padding10 first-collumn">
{{ input('new-ssh-add') }}
{{ input('new-ssh-add', size='10', autofocus='autofocus') }}
</td>
<td>
<td class="first-collumn" valign="top" style="padding-top: 15px;">
<label for="new-ssh_enable">Enable SSH key</label><input type="checkbox" id="new-ssh_enable" checked>
</td>
<td>
@ -270,14 +270,14 @@
</select>
</td>
<td style="padding-top: 15px;">
<p>
<p style="width: 100px;">
{{ input('ssh_user', value=ssh_user) }}
</p>
{{ input('ssh_pass', type='password', value=ssh_pass, style="display: none;") }}
<br>
</td>
<td>
<a class="add-admin" id="add-ssh" title="Add new SSH credentials" style="cursor: pointer;"></a>
<span class="add-admin" id="add-ssh" title="Add new SSH credentials" style="cursor: pointer;"></span>
</td>
</tr>
</table>
@ -325,9 +325,9 @@
</tr>
{% for telegram in telegrams %}
<tr id="telegram-table-{{telegram.0}}" class="{{ loop.cycle('odd', 'even') }}">
<td class="first-collumn" style="padding-top: 20px;">
<td class="padding10 first-collumn">
{% set id = 'telegram-token-' + telegram.0|string() %}
{{ input(id, value=telegram.1, style="margin-bottom: 23px;") }}
{{ input(id, value=telegram.1) }}
</td>
<td>
{% set id = 'telegram-chanel-' + telegram.0|string() %}
@ -346,7 +346,7 @@
</select>
</td>
<td>
<a class="add" onclick="cloneTelegram({{telegram.0}})" id="clone-{{telegram.0}}" title="Clone {{telegram.1}}" style="cursor: pointer;"></a>
<a class="add" onclick="cloneTelegram({{telegram.0}})" id="clone-{{telegram.0}}" title="Clone {{telegram.2}}" style="cursor: pointer;"></a>
</td>
<td>
<a class="delete" onclick="confirmDeleteTelegram({{telegram.0}})" title="Delete channel {{telegram.2}}" style="cursor: pointer;"></a>
@ -364,6 +364,7 @@
<td>Chanel name</td>
<td>Group</td>
<td></td>
<td></td>
</tr>
<tr>
<td class="padding10 first-collumn">
@ -380,8 +381,9 @@
{% endfor %}
</select>
</td>
<td></td>
<td>
<a class="add-admin" id="add-telegram" title="Add new Telegram channel" style="cursor: pointer;"></a>
<span class="add-admin" id="add-telegram" title="Add new Telegram channel" style="cursor: pointer;"></span>
</td>
</tr>
</table>

4
app/templates/base.html
View File

@ -142,8 +142,8 @@
<span class="auto-refresh">
<a onclick="pauseAutoRefresh()" class="auto-refresh-pause" style="display: none; margin-top: 4px;"></a>
<a onclick="pauseAutoResume()" class="auto-refresh-resume" style="display: none; margin-top: 4px;"></a>
<a id="0"><span class="service-reload auto-refresh-reload-icon"></span> Auto-refresh</a>
<a id="1" style="display: none;"><span class="service-reload auto-refresh-reload-icon"></span> Auto-refresh</a>
<span id="0" class="auto-refresh-span "><span class="service-reload auto-refresh-reload-icon"></span> Auto-refresh</span>
<span id="1" style="display: none;" class="auto-refresh-span "><span class="service-reload auto-refresh-reload-icon"></span> Auto-refresh</span>
</span>
{% endif %}
</h2>

4
app/templates/ha.html
View File

@ -37,7 +37,7 @@
<td>{{ checkbox('nginx') }}</td>
<td>{{ checkbox('syn_flood') }}</td>
<td>
<a class="ui-button ui-widget ui-corner-all" id="create" title="Create HA configuration">Create</a>
<button id="create" title="Create HA configuration">Create</button>
</td>
</tr>
</table>
@ -77,7 +77,7 @@
<td></td>
<td></td>
<td>
<a class="ui-button ui-widget ui-corner-all" id="add-vrrp" title="Add HA configuration">Add</a>
<button id="add-vrrp" title="Add HA configuration">Add</button>
</td>
</tr>
</table>

12
app/templates/ovw.html
View File

@ -223,9 +223,9 @@
<td>Role</td>
<td>
<span class="add-button-wi">
<a title="Show all users" id="show-all-users" style="color: #fff">
<span title="Show all users" id="show-all-users" style="color: #fff">
Show all
</a>
</span>
</span>
</td>
</tr>
@ -274,9 +274,9 @@
<td class="second-collumn" style="width: 40%">Description</td>
<td>
<span class="add-button-wi">
<a title="Show all groups" id="show-all-groups" style="color: #fff">
<span title="Show all groups" id="show-all-groups" style="color: #fff">
Show all
</a>
</span>
</span>
</td>
</tr>
@ -333,9 +333,9 @@
</td>
<td>
<span class="add-button-wi">
<a title="Show more log" id="show-all-haproxy-wi-log" style="color: #fff">
<span title="Show more log" id="show-all-haproxy-wi-log" style="color: #fff">
Show more log
</a>
</span>
</span>
</td>
</tr>

42
app/templates/servers.html
View File

@ -17,9 +17,9 @@
<li><a href="#servers" title="Servers: Manage servers - HAProxy-WI">Servers</a></li>
<li><a href="#ssh" title="Servers: Manage SSH credentials - HAProxy-WI">SSH credentials</a></li>
<li><a href="#checker" title="Servers: Manage checker - HAProxy-WI">Checker</a></li>
<li><a href="#installproxy" title="Servers: Proxy installation - HAProxy-WI">Proxy installation</a></li>
<li><a href="#installmon" title="Servers: Monitoring installation - HAProxy-WI">Monitoring installation</a></li>
<li><a href="#backup" title="Servers: Backuping configs - HAProxy-WI">Backup</a></li>
<li><a href="#installproxy" title="Servers: Proxy service installation - HAProxy-WI">Proxy installation</a></li>
<li><a href="#installmon" title="Servers: Monitoring service installation - HAProxy-WI">Monitoring installation</a></li>
<li><a href="#backup" title="Servers: Backup configs - HAProxy-WI">Backup</a></li>
{% include 'include/login.html' %}
</ul>
<ul id='browse_histroy'></ul>
@ -141,17 +141,17 @@
<td style="padding-top: 15px;">
<p>
{% set id = 'ssh_user-' + ssh.0|string() %}
{{ input(id, value=ssh.3, size='10') }}
{{ input(id, value=ssh.3) }}
</p>
{% if ssh.2 == 1 %}
<input type="password" id="ssh_pass-{{ssh.0}}" class="form-control" value="{{ssh.4}}" style="display: none;" autocomplete="new-password">
<input type="password" id="ssh_pass-{{ssh.0}}" class="form-control" value="{{ssh.4}}" style="display: none;" autocomplete="off" />
{% else %}
<input type="password" id="ssh_pass-{{ssh.0}}" class="form-control" value="{{ssh.4}}" autocomplete="new-password">
<input type="password" id="ssh_pass-{{ssh.0}}" class="form-control" value="{{ssh.4}}" autocomplete="off" />
{% endif %}
<br>
</td>
<td>
<a class="delete" onclick="confirmDeleteSsh({{ssh.0}})" style="cursor: pointer;"></a>
<a class="delete" onclick="confirmDeleteSsh({{ssh.0}})" title="Delete this SSH credentials" style="cursor: pointer;"></a>
</td>
</tr>
{% endif %}
@ -170,7 +170,7 @@
<td class="padding10 first-collumn">
{{ input('new-ssh-add') }}
</td>
<td>
<td class="first-collumn">
<label for="new-ssh_enable">Enable SSH key</label><input type="checkbox" id="new-ssh_enable" checked>
</td>
<td style="padding-top: 15px;">
@ -181,7 +181,7 @@
<br>
</td>
<td>
<a class="add-admin" id="add-ssh" title="Add new SSH credentials" style="cursor: pointer;"></a>
<span class="add-admin" id="add-ssh" title="Add a new SSH credentials" style="cursor: pointer;"></span>
</td>
</tr>
</table>
@ -206,7 +206,7 @@
</td>
<td style="padding-top: 15px;">
<textarea id="ssh_cert" cols="50" rows="5"></textarea><br /><br />
<a class="ui-button ui-widget ui-corner-all" id="ssh_key_upload" title="Upload ssh key" onclick="uploadSsh()">Upload</a>
<button id="ssh_key_upload" title="Upload ssh key" onclick="uploadSsh()">Upload</button>
</td>
<td></td>
</tr>
@ -226,18 +226,22 @@
</td>
<td>Chanel name</td>
<td></td>
<td></td>
</tr>
{% for telegram in telegrams %}
{% if telegram.3|string() == group %}
<tr style="width: 50%;" id="telegram-table-{{telegram.0}}" class="{{ loop.cycle('odd', 'even') }}">
<td class="first-collumn" style="padding-top: 20px;">
<td class="padding10 first-collumn">
{% set id = 'telegram-token-' + telegram.0|string() %}
{{ input(id, value=telegram.1, style="margin-bottom: 23px;") }}
{{ input(id, value=telegram.1) }}
</td>
<td>
{% set id = 'telegram-chanel-' + telegram.0|string() %}
{{ input(id, value=telegram.2) }}
</td>
<td>
<a class="add" onclick="cloneTelegram({{telegram.0}})" id="clone-{{telegram.0}}" title="Clone {{telegram.2}}" style="cursor: pointer;"></a>
</td>
<td>
<a class="delete" onclick="confirmDeleteSsh({{telegram.0}})" style="cursor: pointer;"></a>
</td>
@ -256,6 +260,7 @@
Channel name
</td>
<td></td>
<td></td>
</tr>
<tr>
<td class="padding10 first-collumn">
@ -267,8 +272,9 @@
<td>
{{ input('telegram-chanel-add') }}
</td>
<td></td>
<td>
<a class="add-admin" id="add-telegram" title="Add new Telegram channel" style="cursor: pointer;"></a>
<span class="add-admin" id="add-telegram" title="Add new Telegram channel" style="cursor: pointer;"></span>
</td>
</tr>
</table>
@ -307,7 +313,7 @@
{{ checkbox('syn_flood', title="Enable SYN flood protect", checked='checked') }}
</td>
<td>
<a class="ui-button ui-widget ui-corner-all" id="install" title="Install HAProxy">Install</a>
<span class="ui-button ui-widget ui-corner-all" id="install" title="Install HAProxy">Install</span>
</td>
</tr>
</table>
@ -338,7 +344,7 @@
{{ checkbox('nginx_syn_flood', title="Enable SYN flood protect", checked='checked') }}
</td>
<td>
<a class="ui-button ui-widget ui-corner-all" id="nginx_install" title="Install Nginx">Install</a>
<span class="ui-button ui-widget ui-corner-all" id="nginx_install" title="Install Nginx">Install</span>
</td>
</tr>
</table>
@ -374,7 +380,7 @@
</td>
<td>
{% if grafana != "Active:" %}
<a class="ui-button ui-widget ui-corner-all" id="grafna_install" title="Install Grafana and Prometheus server">Install</a>
<span class="ui-button ui-widget ui-corner-all" id="grafna_install" title="Install Grafana and Prometheus server">Install</span>
{% endif %}
</td>
</tr>
@ -405,7 +411,7 @@
<td>
</td>
<td>
<a class="ui-button ui-widget ui-corner-all" id="haproxy_exp_install" title="Install HAProxy Exporter">Install</a>
<span class="ui-button ui-widget ui-corner-all" id="haproxy_exp_install" title="Install HAProxy Exporter">Install</span>
</td>
</tr>
</table>
@ -435,7 +441,7 @@
<td>
</td>
<td>
<a class="ui-button ui-widget ui-corner-all" id="nginx_exp_install" title="Install Nginx Exporter">Install</a>
<span class="ui-button ui-widget ui-corner-all" id="nginx_exp_install" title="Install Nginx Exporter">Install</span>
</td>
</tr>
</table>

2
app/templates/viewstats.html
View File

@ -43,7 +43,6 @@
$('.v_menu').css('left', '200px');
$('table.tbl th.pxname').css('width', '100%');
$('a.px:link').css('color', '#fff');
$('td').css('font-family', '-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol');
$('td').css('font-size', '11');
$('h1').css('display', 'none');
$('td').css('border-color', '#ddd');
@ -55,6 +54,7 @@
$('h1').next().next().css('display', 'none');
$('h1').next().next().next().css('display', 'none');
$('h1').next().next().next().next().css('display', 'none');
$('body').css('font-family', '-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol');
$( "select" ).selectmenu();
{% if role == 3 %}
$('input[type=checkbox]').remove()

2
inc/awesome.css
View File

@ -146,7 +146,7 @@
display: none;
font-family: "Font Awesome 5 Solid";
content: "\f004";
color: red;
color: #ff0000;
padding-left: 3px;
}
.update-row::before {

5
inc/style.css
View File

@ -189,7 +189,7 @@ pre {
margin-top: 3.7px;
margin-right: 5px;
}
.auto-refresh a {
.auto-refresh-span, .auto-refresh a {
color: #fff !important;
cursor: pointer;
font-size: 15px;
@ -199,12 +199,11 @@ pre {
position: relative;
padding: 10px;
background-color: #F5F5F5;
//border-bottom: solid 1px #D9D9D9;
border-top: solid 1px #D9D9D9;
margin-bottom: 10px;
line-height: 20px;
}
.auto-refresh-div a {
.auto-refresh-div span, .auto-refresh-div a {
color: #000;
cursor: pointer;
}