Changelog: https://haproxy-wi.org/changelog.py#5_2_5
pull/304/head v5.2.5.0
Pavel Loginov 2021-09-14 12:02:05 +06:00
parent 7928fb2d90
commit 20ba4eff7a
8 changed files with 21 additions and 23 deletions

View File

@ -215,7 +215,7 @@
<br />
<span style="padding-right: 10px;">Start typing saved options: </span>
{{ input('saved-options') }}
It are the options that you saved in the "Options" tab
These are the options that you saved in the "Options" tab
</div>
<textarea name="option" title="Options thru" id="optionsInput" cols=80 rows=5 placeholder="acl test hdr_beg(host) -i some_host"></textarea>
</div>
@ -425,7 +425,7 @@
<br />
<span style="padding-right: 10px;">Start typing saved options: </span>
{{ input('saved-options1') }}
It are the options that you saved in the "Options" tab
These are the options that you saved in the "Options" tab
</div>
<textarea name="option" title="Options thru" cols=80 rows=5 id="optionsInput1" placeholder="acl test hdr_beg(host) -i some_host"></textarea>
</div>
@ -599,7 +599,7 @@
<br />
<span style="padding-right: 10px;">Start typing saved options: </span>
<input type="text" id="saved-options2" class="form-control">
It are the options that you saved in the "Options" tab
These are the options that you saved in the "Options" tab
</div>
<textarea name="option" title="Options thru" cols=80 rows=5 id="optionsInput2" placeholder="acl test hdr_beg(host) -i some_host"></textarea>
</div>
@ -780,7 +780,7 @@
</tr>
<tr>
<td class="padding10 first-collumn">
Enter option for save:
Enter an option:
</td>
<td style="width: 77%;">
{{ input('new-option', size='60') }}
@ -795,7 +795,7 @@
In this section you can create, edit and delete options with given parameters. And after use them as autocomplete in the "Add" sections
</div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
How to use pre-saved option you can see in
How to use predefined option you can see in
<a href="https://roxy-wi.org/description.py?description=saved" title="How to use pre saved options" target="_blank">
<b>this video</b>
</a>
@ -850,8 +850,8 @@
In this section you can create, edit and delete servers. And after use them as autocomplete in the "Add" sections
</div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
How to use pre-saved servers you can see in
<a href="https://roxy-wi.org/description.py?description=saved" title="How to use pre-saved servers" target="_blank">
How to use predefined servers you can see in
<a href="https://roxy-wi.org/description.py?description=saved" title="How to use predefined servers" target="_blank">
<b>this video</b>
</a>
</div>

View File

@ -289,7 +289,7 @@
<input type="hidden" value="{{serv}}" name="serv">
<input type="hidden" value="{{configver}}" name="configver">
<input type="hidden" value="1" name="config">
<button type='submit' value='save' name='save' class='btn btn-default'>Just save</button>
<button type='submit' value='save' name='save' class='btn btn-default' title="Save config without reloading the service">Save</button>
<button type='submit' value='' name='' class='btn btn-default'>Upload and restart</button>
{% if service != 'keepalived' %}
<button type='submit' value='reload' name='save' class='btn btn-default'>Upload and reload</button>
@ -297,6 +297,6 @@
</form>
{% endif %}
{% endif %}
<div class="alert alert-info"><b>Note:</b> If you reconfigure Master server, Slave will reconfigured automatically</div>
<div class="alert alert-info"><b>Note:</b> If you reconfigure Master server, Slave will be reconfigured automatically</div>
</center>
{% endif %}

View File

@ -175,9 +175,9 @@
</div>
<div class="auto-refresh-interval">
<div class="auto-refresh-ul">
<ul style="width: 60px;">
<ul style="width: 130px;">
<li>
<a class="ui-button ui-widget ui-corner-all" onclick="setRefreshInterval(0)" title="Turn off auto-refresh">Off</a>
<a class="ui-button ui-widget ui-corner-all" onclick="setRefreshInterval(0)" title="Turn off auto-refresh">No auto-refresh</a>
</li>
</ul>
</div>

View File

@ -13,7 +13,7 @@
<form action="{{ action }}" method="post">
<input type="hidden" id="service" value="{{service|default('haproxy', true)}}" />
<select autofocus required name="serv" id="{{ select_id }}">
<option disabled>Choose server</option>
<option disabled>------</option>
{% for select in selects %}
{% if select.2 == serv %}
<option value="{{ select.2 }}" selected>{{ select.1 }}</option>
@ -56,9 +56,9 @@
<p>
<center>
{% if service == 'haproxy' %}
<button type="submit" value="test" name="save" class="btn btn-default">Just test</button>
<button type="submit" value="test" name="save" class="btn btn-default" title="Check config without saving the config">Check config</button>
{% endif %}
<button type="submit" value="save" name="save" class="btn btn-default">Just save</button>
<button type="submit" value="save" name="save" class="btn btn-default" title="Save config without reloading the service">Save</button>
<button type="submit" value="" name="" class="btn btn-default">Save and restart</button>
<button type="submit" value="reload" name="save" class="btn btn-default">Save and reload</button>
{% if service != 'keepalived' %}

View File

@ -35,7 +35,7 @@
</center>
{% endif %}
{% if aftersave %}
<div class="alert alert-info">Was uploaded old version of config: {{ configver }} </div>
<div class="alert alert-info">The following version of the configuration file has been uploaded and saved as: {{ configver }} </div>
{% if stderr or error %}
{% include 'include/errors.html' %}
{% else %}

View File

@ -34,7 +34,7 @@
{% endif %}
{% if open %}
<center>
<h4>Choose old version</h4>
<h4>Select a version</h4>
<form action="{{action}}" method="post">
<label for="select_all" id="label_select_all"><b>Select all</b></label>
<input type="checkbox" id="select_all"><br />

View File

@ -1,6 +1,4 @@
<div class="alert alert-danger" style="margin-bottom: 10px;">
Some errors:
<br> <br>
{{stderr}}
{{error}}
</div>

View File

@ -4,11 +4,11 @@
<script src="/inc/codemirror/codemirror.js"></script>
<script src="/inc/codemirror/nginx.js"></script>
<script src="/inc/codemirror/haproxy.js"></script>
<div style="text-align: center;">
<center>
<p>
<form action="{{ action }}" method="post">
<select autofocus required name="section" id="{{ select_id }}">
<option disabled>Choose a section</option>
<option disabled>------</option>
{% for s in sections %}
{% if s == section %}
<option value="{{ s }}" selected>{{ s }}</option>
@ -37,8 +37,8 @@
</div>
{% if not is_serv_protected or role <= 2 %}
<p>
<button type="submit" value="test" name="save" class="btn btn-default">Just test</button>
<button type="submit" value="save" name="save" class="btn btn-default">Just save</button>
<button type="submit" value="test" name="save" class="btn btn-default" title="Check config without saving the config">Check config</button>
<button type="submit" value="save" name="save" class="btn btn-default" title="Save config without reloading the service">Save</button>
<button type="submit" value="" name="" class="btn btn-default">Save and restart</button>
<button type="submit" value="reload" name="save" class="btn btn-default">Save and reload</button>
{% if section != 'globals' and section != 'defaults' %}
@ -62,7 +62,7 @@
{% endif %}
{% endif %}
{% if aftersave %}
<div class="alert alert-info">New config was saved as: {{ cfg }} </div>
<div class="alert alert-info">A new config has been saved as: {{ cfg }} </div>
{% if stderr or error %}
{% include 'include/errors.html' %}
{% else %}