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

v5.2.3.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_3
pull/304/head
Pavel Loginov 2021-08-11 11:37:36 +06:00
parent 701b560df6
commit 8ff3213065
7 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/create_db.py
View File

@ -117,7 +117,7 @@ def default_values():
out_error(e)
try:
Groups.insert(name='All', description='All servers enter in this group').on_conflict_ignore().execute()
Groups.insert(name='All', description='All servers are included in this group by default').on_conflict_ignore().execute()
except Exception as e:
out_error(e)

18
app/templates/add.html
View File

@ -672,7 +672,7 @@
<tr class="overviewHead">
<td class="padding10 first-collumn" style="width: 30%;">View certificates</td>
<td>
Existing certificates
Uploaded certificates
</td>
</tr>
<tr>
@ -695,7 +695,7 @@
Certificate name
</td>
<td>
<span title="This pem file will be used to create https connection with haproxy">Paste certificate content here(?)</span>
<span title="This pem file will be used to create https connection with haproxy" class="help_cursor">Paste the contents of the certificate file</span>
</td>
</tr>
<tr style="width: 50%;">
@ -719,15 +719,9 @@
<table>
<caption><h3>Let's Encrypt</h3></caption>
<tr class="overviewHead">
<td class="padding10 first-collumn">
Server
</td>
<td>
Domain name
</td>
<td>
E-mail
</td>
<td class="padding10 first-collumn">Server</td>
<td>Domain name</td>
<td>E-mail</td>
<td></td>
</tr>
<tr>
@ -746,7 +740,7 @@
{{ input('lets_email') }}
</td>
<td>
<button id="lets_button">Get certificate</button>
<button id="lets_button">Get a certificate</button>
</td>
</tr>
</table>

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

@ -54,7 +54,7 @@
</style>
<table class="overview">
<tr style="border: none;">
<td class="padding20" style="width: 40%;"><b>Choose groups</b></td>
<td class="padding20" style="width: 40%;"><b>Select one or more groups</b></td>
<td>
<select id="usergroup-{{id}}" name="usergroup-{{id}}" multiple class="select-css">
{% for group in groups %}

18
app/templates/include/admins_dialogs.html
View File

@ -10,7 +10,7 @@
</td>
<td>
<select id="new-role" name="new-role">
<option disabled selected>Choose role</option>
<option disabled selected>Select a role</option>
{% for role in roles %}
<option value="{{ role.name }}">{{ role.name }}</option>
{% endfor %}
@ -24,7 +24,7 @@
</td>
<td>
<select id="new-group" name="new-group">
<option disabled selected>Choose group</option>
<option disabled selected>Select a group</option>
{% for group in groups %}
<option value="{{ group.group_id }}">{{ group.name }}</option>
{% endfor %}
@ -61,7 +61,7 @@
</td>
<td>
<select id="new-role" name="new-role">
<option disabled selected>Choose role</option>
<option disabled selected>Select a role</option>
{% for role in roles %}
{% if role.name != "superAdmin" %}
<option value="{{ role.name }}">{{ role.name }}</option>
@ -84,9 +84,9 @@
</td>
<td>
<select id="credentials" required>
<option disabled selected>Choose credentials</option>
<option disabled selected>Select credentials</option>
{% for ssh in sshs %}
<option value="{{ssh.0}}">{{ssh.1}}</option>
<option value="{{ssh.id}}">{{ssh.name}}</option>
{% endfor %}
</select>
</td>
@ -99,7 +99,7 @@
</td>
<td>
<select id="new-server-group-add" name="new-server-group-add">
<option disabled selected value="0">Choose group</option>
<option disabled selected value="0">Select a group</option>
{% for group in groups %}
<option value="{{ group.group_id }}">{{ group.name }}</option>
{% endfor %}
@ -179,7 +179,7 @@
<td class="padding20">Group</td>
<td>
<select id="new-telegram-group-add" name="new-telegram-group-add">
<option disabled selected value="0">Choose group</option>
<option disabled selected value="0">Select a group</option>
{% for group in groups %}
<option value="{{ group.group_id }}">{{ group.name }}</option>
{% endfor %}
@ -215,7 +215,7 @@
<td class="padding20">Group</td>
<td>
<select id="new-slack-group-add" name="new-slack-group-add">
<option disabled selected value="0">Choose group</option>
<option disabled selected value="0">Select a group</option>
{% for group in groups %}
<option value="{{ group.group_id }}">{{ group.name }}</option>
{% endfor %}
@ -231,7 +231,7 @@
{% include 'include/add_backup.html' %}
<tr>
<td class="padding20">
Credentials for remote server
Credentials for a remote server
<span class="need-field">*</span>
</td>
<td>

2
app/templates/include/tr_validate_tips.html
View File

@ -1,7 +1,7 @@
<tr>
<td colspan="2">
<p class="validateTips alert alert-success">
Form fields tag "<span class="need-field">*</span>" are required.
Fields marked "<span class="need-field">*</span>" are required.
</p>
</td>
</tr>

2
app/templates/viewstats.html
View File

@ -36,7 +36,7 @@
<div id="ajax" style="margin-left: 5px; margin-right: 5px;"></div>
<div id="notice" style="padding-left: 15px; font-size: 25px;">
Please choose a server
Select a server
<br />
</div>
<script>

3
inc/script.js
View File

@ -1200,10 +1200,11 @@ function changeCurrentGroupF(){
function updateTips( t ) {
var tips = $( ".validateTips" );
tips.text( t ).addClass( "alert-warning" );
tips.text( t ).addClass( "alert-one-row" );
}
function clearTips() {
var tips = $( ".validateTips" );
tips.html('Form fields tag "<span class="need-field">*</span>" are required.').removeClass( "alert-warning" );
tips.html('Fields marked "<span class="need-field">*</span>" are required').removeClass( "alert-warning" );
allFields = $( [] ).add( $('#new-server-add') ).add( $('#new-ip') ).add( $('#new-port')).add( $('#new-username') ).add( $('#new-password') )
allFields.removeClass( "ui-state-error" );
}