From c8914a3f12d192d0d638d98d464f7e70226662b3 Mon Sep 17 00:00:00 2001
From: Aidaho12 <buffoon2001@mail.ru>
Date: Thu, 5 Jul 2018 13:03:26 +0600
Subject: [PATCH]  v2.6.1

Bugs, style
---
 app/templates/base.html | 16 ++++++++--------
 inc/script.js           |  4 +++-
 inc/style.css           | 15 ++++++++++++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index 2d228df0..2ca1bb14 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -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>
diff --git a/inc/script.js b/inc/script.js
index 93f29bd3..e4bbdd90 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -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");
diff --git a/inc/style.css b/inc/style.css
index c013fe7a..b532d70c 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -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{