Bugs, style
pull/20/head
Aidaho12 2018-07-05 13:03:26 +06:00
parent dc6a6611bf
commit c8914a3f12
3 changed files with 23 additions and 12 deletions

View File

@ -44,9 +44,9 @@
<nav class="menu">
<ul id="menu">
<li><a title="Statistics, monitoring and logs" class="stats">Stats</a>
<li><a href=/app/overview.py title="Server and service status" class="overview-link head-submenu">Overview</a> </li>
<li><a href=/app/viewsttats.py title"Show stats" class="stats head-submenu">Stats</a> </li>
<li><a href=/app/logs.py title="View logs" class="logs head-submenu">Logs</a></li>
<li><a href=/app/overview.py title="Server and service status" class="overview-link head-submenu">Overview</a></li>
<li><a href=/app/viewsttats.py title"Show stats" class="stats head-submenu">Stats</a></li>
<li><a href=/app/logs.py title="View logs" class="logs head-submenu"> Logs</a></li>
<li><a href=/app/map.py title="View map" class="map head-submenu">Map</a></li>
<li><a href=/app/edit.py title="Runtime API" class="runtime head-submenu">Runtime API</a></li>
</li>
@ -94,11 +94,6 @@
</li>
{% endif %}
{% endif %}
{% if user %}
<li><a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login">Logout</a></li>
{% else %}
<li><a href=/app/login.py title="Login" class="login">Login</a></li>
{% endif %}
</ul>
</nav>
<div class="copyright-menu">
@ -112,6 +107,11 @@
{% if h2 %}
<h2>
{{title}}
{% if user %}
<a href=/app/login.py?logout=logout title="Logout, user name: {{ user }}" class="login"> Logout</a>
{% else %}
<a href=/app/login.py title="Login" class="login"> Login</a>
{% endif %}
{% if autorefresh %}
<span class="auto-refresh">
<a onclick="pauseAutoRefresh()" class="auto-refresh-pause" style="display: none; margin-top: 4px;"></a>

View File

@ -381,13 +381,15 @@ $( function() {
});
var date1_hours = Math.floor(date1/60);
var date2_hours = date1_hours + 1;
var date2_minute = now.getMinutes()
if(date1_hours <= 9) date1_hours = '0' + date1_hours;
if(date2_hours <= 9) date2_hours = '0' + date2_hours;
if(date2_minute <= 9) date2_minute = '0' + date2_minute;
$('#time_range_out_hour').val(date1_hours);
$('#time_range_out_minut').val('00');
$('#time_range_out_hour1').val(date2_hours);
$('#time_range_out_minut1').val(now.getMinutes());
$('#time_range_out_minut1').val(date2_minute);
$('#0').click(function() {
$('.auto-refresh-div').show("blind", "fast");

View File

@ -79,6 +79,14 @@ pre {
margin-left: 207px;
padding-bottom: 10px;
}
.login {
float: right;
margin-top: 5px;
margin-left: 14px;
margin-right: 15px;
color: #fff;
font-size: 15px;
}
.auto-refresh {
margin-left: auto;
float: right;
@ -113,7 +121,8 @@ pre {
.auto-refresh-interval {
float: right;
padding: 0px 15px;
margin-left: 75%;
margin-left: 70%;
border-bottom: solid 1px #D9D9D9;
}
.auto-refresh-ul{
float: left;
@ -336,8 +345,8 @@ pre {
min-height: calc(100vh - 95px);
}
.menu ul li{
padding: 3px;
padding-left: 40px;
padding: 1px;
padding-left: 33px;
margin-right: 0px !important;
}
.menu ul ul > li:hover{