Interface bugs
pull/56/head
Aidaho12 2018-09-28 16:35:44 +06:00
parent 255685f296
commit 2ea6fecacc
4 changed files with 36 additions and 11 deletions

View File

@ -1,6 +1,7 @@
{% extends "base.html" %}
{% block content %}
<script src="/inc/users.js"></script>
<script src="/inc/fontawesome.min.js"></script>
<div id="dialog-confirm" title="Are you sure you want to delete?" style="display: none;">
<p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Deleting irreversibly all data will be lost?</p>
</div>
@ -249,7 +250,7 @@
</select>
</td>
<td>
{% if server.11 %}
{% if server.11 != "None" %}
<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="30" class="form-control">
{% else %}
<input type="text" id="desc-{{server.0}}" value="" size="30" class="form-control">

View File

@ -6,7 +6,7 @@
<td>
<input type="text" id="ip-{{server.0}}" value="{{server.2}}" class="form-control">
{% if page == "servers.py" %}
<input type="hidden" id="servergroup-{{server.0}}" name="servergroup-{{server.0}}" value="{{ ssh_group.0 }}" >
<input type="hidden" id="servergroup-{{server.0}}" name="servergroup-{{server.0}}" value="" >
{% endif %}
</td>
<td>
@ -78,7 +78,11 @@
</select>
</td>
<td>
<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="30" class="form-control">
{% if server.11 != "None" %}
<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="30" class="form-control">
{% else %}
<input type="text" id="desc-{{server.0}}" value="" size="30" class="form-control">
{% endif %}
</td>
<td>
<a class="delete" onclick="removeServer({{server.0}})" title="Delete server {{server.1}}" style="cursor: pointer;"></a>

View File

@ -35,14 +35,14 @@
</div>
<div class="top-menu">
<div class="LogoText">
<span style="padding: 10px;">HAproxy-WI</span>
<span id="logo_text" style="padding: 10px;">HAproxy-WI</span>
<a href="#" id="hide_menu" title="Hide menu" style="margin-left: 24px;position: absolute;">
<span class="ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-arrowthick-1-w" id="arrow"></span>
</span>
</a>
</div>
<div class="top-link">
<div id="top-link" class="top-link">
<nav class="menu">
<ul id="menu">
<li><a title="Statistics, monitoring and logs" class="stats">Stats</a>

View File

@ -28,6 +28,7 @@
<td><span title="Enable save and show metrics">Metrics(?)</span></td>
<td><span title="Actions with master config will automatically apply on slave">Slave for (?)</span></td>
<td>Credentials</td>
<td>Desciption</td>
<td></td>
</tr>
{% set ssh_group = [] %}
@ -38,7 +39,7 @@
<input type="text" id="hostname-{{server.0}}" value="{{server.1}}" class="form-control">
</td>
<td>
<input type="text" id="ip-{{server.0}}" value="{{server.2}}" class="form-control">
<input type="text" id="ip-{{server.0}}" value="{{server.2}}" size="14" class="form-control">
<input type="hidden" id="new-server-group-add" name="servergroup-{{server.0}}" value="{{ group }}" >
<input type="hidden" id="servergroup-{{server.0}}" name="servergroup-{{server.0}}" value="{{ group }}" >
</td>
@ -100,7 +101,14 @@
</select>
</td>
<td>
<a class="delete_button" onclick="confirmDeleteServer({{server.0}})" style="cursor: pointer;"></a>
{% if server.11 != "None" %}
<input type="text" id="desc-{{server.0}}" value="{{server.11}}" size="30" class="form-control">
{% else %}
<input type="text" id="desc-{{server.0}}" value="" size="30" class="form-control">
{% endif %}
</td>
<td>
<a class="delete" onclick="confirmDeleteServer({{server.0}})" title="Delete server {{server.1}}" style="cursor: pointer;"></a>
</td>
</tr>
{% endfor %}
@ -118,6 +126,7 @@
<td><span title="Enable save and show metrics">Metrics(?)</span></td>
<td title="Actions with master config will automatically apply on slave">Slave for</td>
<td>Credentials</td>
<td>Desciption</td>
<td></td>
</tr>
<tr>
@ -125,7 +134,7 @@
<input type="text" name="new-server-add" id="new-server-add" class="form-control">
</td>
<td>
<input type="text" name="new-ip" id="new-ip" class="form-control">
<input type="text" name="new-ip" id="new-ip" size="14" class="form-control">
<input type="hidden" id="new-sshgroup" name="new-sshgroup" value="{{ group }}" >
</td>
<td>
@ -161,6 +170,9 @@
{% endfor %}
</select>
</td>
<td>
<input type="text" id="desc" size="30" class="form-control">
</td>
<td>
<a class="add-admin" id="add-server" style="cursor: pointer;"></a>
</td>
@ -209,7 +221,7 @@
<br>
</td>
<td>
<a class="delete_button" onclick="confirmDeleteSsh({{ssh.0}})" style="cursor: pointer;"></a>
<a class="delete" onclick="confirmDeleteSsh({{ssh.0}})" style="cursor: pointer;"></a>
</td>
</tr>
{% endif %}
@ -291,7 +303,7 @@
<input type="text" id="telegram-chanel-{{telegram.0}}" class="form-control" value="{{telegram.2}}">
</td>
<td>
<a class="delete_button" onclick="confirmDeleteSsh({{telegram.0}})" style="cursor: pointer;"></a>
<a class="delete" onclick="confirmDeleteSsh({{telegram.0}})" style="cursor: pointer;"></a>
</td>
</tr>
{% endif %}
@ -344,9 +356,17 @@
$("input[type=checkbox]").checkboxradio( "disable" );
$("select").selectmenu( "disable" );
$("input").attr( "readonly", "readonly" );
$('.delete_button').remove()
$('.delete').remove()
}, 500 );
}
</script>
<style>
.ui-selectmenu-button.ui-button {
width: 12em;
}
.first-collumn {
width: 10%;
}
</style>
{% endblock %}