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

v3.4.4.8

pull/145/head
Pavel Loginov 2019-09-09 22:14:37 +03:00
parent 55ee044bef
commit adf6fa0dd6
19 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/ajax/overivewWaf.html
View File

@ -16,13 +16,13 @@
<td>
{% if role <= 1 %}
<a id="{{ service.1 }}" class="start-waf" title="Start WAF service">
<img src=/image/pic/start.png alt="start" class="icon">
<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;">
</a>
<a id="{{ service.1 }}" class="stop-waf" title="Stop WAF service">
<img src=/image/pic/stop.png alt="start" class="icon">
<img src=/inc/images/stop.png alt="start" class="icon" width="17px">
</a>
<a id="{{ service.1 }}" class="restart-waf" title="Restart WAF service">
<img src=/image/pic/update.png alt="restart" class="icon">
<img src=/inc/images/update.png alt="restart" class="icon">
</a>
{% endif %}
</td>

18
app/templates/ajax/overview.html
View File

@ -7,9 +7,9 @@
{% if service.5.0.0|int() >= 1 %}
<img
{% if service.6.0.0|int() >= 1 %}
src="/image/pic/shield.png" title="Auto start enabled"
src="/inc/images/shield.png" title="Auto start enabled"
{% else %}
src="/image/pic/shield-red.png" title="Auto start enabled, but keep alive service does not work"
src="/inc/images/shield-red.png" title="Auto start enabled, but keep alive service does not work"
{% endif %}
width=18 style="padding-left: 5px; margin-bottom: -3px;">
{% endif %}
@ -26,23 +26,23 @@
<td>
{% if role <= 1 %}
<a id="{{ service.1 }}" class="start" title="Start HAProxy service">
<img src=/image/pic/start.png alt="start" class="icon">
<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;">
</a>
<a id="{{ service.1 }}" class="stop" title="Stop HAProxy service">
<img src=/image/pic/stop.png alt="start" class="icon">
<img src=/inc/images/stop.png alt="start" class="icon" width="17px">
</a>
<a id="{{ service.1 }}" class="restart" title="Restart HAProxy service">
<img src=/image/pic/update.png alt="restart" class="icon">
<img src=/inc/images/update.png alt="restart" class="icon">
</a>
{% endif %}
{% if role <= 2 %}
<a href="/app/config.py?serv={{ service.1 }}" target="_blank" title="Working with HAProxy configs">
<img src="/image/pic/edit.png" alt="edit" class="icon">
<img src="/inc/images/edit.png" alt="edit" class="icon" width="15px">
</a>
<a href="/app/viewsttats.py?serv={{ service.1 }}" target="_blank" title="Show stats">
<img src="/image/pic/show.png" alt="show" class="icon">
</a>
{% endif %}
<a href="/app/viewsttats.py?serv={{ service.1 }}" target="_blank" title="Show stats">
<img src="/inc/images/show.png" alt="show" class="icon" width="20px" style="margin-bottom: -3px;">
</a>
</td>
<td>
{{ service.3 }}

1
app/templates/ajax/overviewServers.html
View File

@ -25,7 +25,6 @@ Too old version HAProxy
{% else %}
{{ service.4 }}
{% endif %}
</pre>
</td>
<td></td>

8
app/templates/base.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<link href="/image/pic/favicon.ico" rel="icon" type="image/png" />
<link href="/inc/images/favicon.ico" rel="icon" type="image/png" />
<script>
FontAwesomeConfig = { searchPseudoElements: true, observeMutations: false };
</script>
@ -115,7 +115,7 @@
</ul>
</nav>
<div class="copyright-menu">
<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.7</a>
<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.8</a>
<br>
<a href="https://www.patreon.com/haproxy_wi" title="Donate" target="_blank" style="color: #fff; margin-left: 30px; color: red;" class="patreon"> Patreon</a>
</div>
@ -135,8 +135,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"><img src="/image/pic/update.png" alt="restart" class="icon"> Auto-refresh</a>
<a id="1" style="display: none;"><img src="/image/pic/update.png" alt="restart" class="icon"> Auto-refresh</a>
<a id="0"><img src="/inc/images/update.png" alt="restart" class="icon"> Auto-refresh</a>
<a id="1" style="display: none;"><img src="/inc/images/update.png" alt="restart" class="icon"> Auto-refresh</a>
</span>
{% endif %}
</h2>

40
app/templates/ovw.html
View File

@ -23,7 +23,12 @@
{% set counter = counter + loop.index0 %}
{% if counter <= 2 %}
<tr class="{{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn"> {{ USER.1 }}</td>
<td class="padding10 first-collumn">
<a href="users.py#users" title="Edit user" style="color: #000;">
{{ USER.1 }}
<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px;" />
</a>
</td>
<td class="padding10 second-collumn"> {{ USER.2 }}</td>
{% for group in groups %}
{% if USER.5 == group.0|string() %}
@ -35,7 +40,12 @@
</tr>
{% else %}
<tr style="display: none;" class="show-users {{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn"> {{ USER.1 }}</td>
<td class="padding10 first-collumn">
<a href="users.py#users" title="Edit user" style="color: #000;">
{{ USER.1 }}
<img src="/inc/images/edit.png" alt="Edit" width="15" style="margin-bottom: -3px;" />
</a>
</td>
<td class="padding10"> {{ USER.2 }}</td>
{% for group in groups %}
{% if group.0|string() == USER.5 %}
@ -58,31 +68,35 @@
<tr>
<td class="padding10 first-collumn">
{% if metrics_master|int() >= 1 %}
<span title="running {{ metrics_master }} master processes"><span class="serverUp"> UP</span> Metrics master</span>
<span title="running {{ metrics_master }} master processes"><span class="serverUp"> UP</span>
{% else %}
<span title="running {{ metrics_master }} master processes"><span class="serverDown"> DOWN</span> running {{metrics_master }} master processes
<span title="running {{ metrics_master }} master processes"><span class="serverDown"> DOWN</span>
{% endif %}
<span>Metrics master</span>
</td>
<td class="padding10 second-collumn">
{% if metrics_worker|int() >= 1 %}
<span title="running {{metrics_worker}} worker processes"><span class="serverUp"> UP</span> Metrics workers</span>
<span title="running {{metrics_worker}} worker processes"><span class="serverUp"> UP</span>
{% else %}
<span title="running {{metrics_worker}} worker processes"><span class="serverDown"> DOWN</span> Metrics workers</span>
<span title="running {{metrics_worker}} worker processes"><span class="serverDown"> DOWN</span>
{% endif %}
<span>Metrics workers</span>
</td>
<td class="third-collumn">
{% if checker_master|int() >= 1 %}
<span title="running {{ checker_master }} master processes"><span class="serverUp"> UP</span> Checker master</span>
<span title="running {{ checker_master }} master processes"><span class="serverUp"> UP</span>
{% else %}
<span title="running {{ checker_master }} master processes"><span class="serverDown"> DOWN</span> Checker master</span>
<span title="running {{ checker_master }} master processes"><span class="serverDown"> DOWN</span>
{% endif %}
<span>Checker master</span>
</td>
<td>
{% if checker_worker|int() >= 1 %}
<span title="running {{ checker_worker }} worker processes"><span class="serverUp"> UP</span> Checker workers</span>
<span title="running {{ checker_worker }} worker processes"><span class="serverUp"> UP</span>
{% else %}
<span title="running {{ checker_worker }} worker processes"><span class="serverDown"> DOWN</span> Checker workers</span>
<span title="running {{ checker_worker }} worker processes"><span class="serverDown"> DOWN</span>
{% endif %}
<span>Checker workers</span>
</td>
</tr>
</table>
@ -102,7 +116,7 @@
Last edit
</td class="padding10">
<td>
<a onclick="showOverview()" title="Refresh" style="float: right; margin-right: 25px;"><img src="/image/pic/update.png" alt="restart" class="icon"></a>
<a onclick="showOverview()" title="Refresh" style="float: right; margin-right: 25px;"><img src="/inc/images/update.png" alt="restart" class="icon"></a>
</td>
</tr>
<tbody id="ajaxstatus"></tbody>
@ -122,7 +136,7 @@
WAF mode
</td class="padding10">
<td>
<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img src="/image/pic/update.png" alt="restart" class="icon"></a>
<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img src="/inc/images/update.png" alt="restart" class="icon"></a>
</td>
</tr>
<tbody id="ajaxwafstatus"></tbody>
@ -142,7 +156,7 @@
Front/Back-ends
</td>
<td>
<a onclick="showOverviewServers()" title="Refresh Server Info" style="float: right; margin-right: 25px;"><img src="/image/pic/update.png" alt="restart" class="icon"></a>
<a onclick="showOverviewServers()" title="Refresh Server Info" style="float: right; margin-right: 25px;"><img src="/inc/images/update.png" alt="restart" class="icon"></a>
</td>
</tr>
<tbody id="ajaxservers"></tbody>

2
app/templates/waf.html
View File

@ -18,7 +18,7 @@
Metrics
</td>
<td>
<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img src="/image/pic/update.png" alt="restart" class="icon"></a>
<a onclick="showOverviewWaf()" title="Refresh" style="float: right; margin-right: 25px;"><img src="/inc/images/update.png" alt="Refresh" class="icon"></a>
</td>
</tr>
<tbody id="ajaxwafstatus"></tbody>

0
image/pic/compare.png → inc/images/compare.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 832 B

0
image/pic/edit.png → inc/images/edit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 722 B

0
image/pic/favicon.ico → inc/images/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 932 B

After

Width:  |  Height:  |  Size: 932 B

0
image/pic/map.png → inc/images/map.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
image/pic/shield-red.png → inc/images/shield-red.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
image/pic/shield.png → inc/images/shield.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
image/pic/show.png → inc/images/show.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 847 B

0
image/pic/start.png → inc/images/start.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
image/pic/stop.png → inc/images/stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
inc/images/ui-bg_flat_0_aaaaaa_40x100.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 B

BIN
inc/images/ui-icons_444444_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
inc/images/ui-icons_777777_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

0
image/pic/update.png → inc/images/update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 674 B

After

Width:  |  Height:  |  Size: 674 B