From 732d5f674f57339b54795791328ed7be92cb3ec1 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Sun, 22 Sep 2019 21:16:39 +0300
Subject: [PATCH] v3.4.9

---
 app/templates/hapservers.html | 88 ++++++++++++++++++-----------------
 inc/script.js                 |  6 +++
 inc/users.js                  |  2 +-
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html
index e7863368..46861fa8 100644
--- a/app/templates/hapservers.html
+++ b/app/templates/hapservers.html
@@ -1,50 +1,52 @@
 {% extends "base.html" %}
 {% block content %}	
-{% for s in servers %}
-<div class="div-pannel">
-<div id="div-server-{{s.0}}" class="div-server">
-	<div class="server-name">
-		
-		{% if s.5 != False %}
-			<span class="serverUp server-status" title="{{s.5.0.2}}"></span>
-		{% else %}
-			<span class="serverDown server-status" title="HAProxy is down"></span>
-		{% endif %}
-		<span title="Show info about {{s.2}}" onclick="showOverviewServer('{{s.1}}', '{{s.2}}', '{{s.0}}')" style="cursor: pointer;">
-			{{s.1}}
-		</span>
-		{% if role <= 1 %}
-		<span class="server-action">
-			<a id="{{ s.2 }}" class="start" title="Start HAProxy service">
-				<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;" onclick="confirmAjaxAction('start', 'hap', '{{s.2}}')">
-			</a>
-			<a id="{{ s.2 }}" class="stop" title="Stop HAProxy service">
-				<img src=/inc/images/stop.png alt="stop" class="icon" width="17px" onclick="confirmAjaxAction('stop', 'hap', '{{s.2}}')">
-			</a>
-			<a id="{{ s.2 }}" class="restart" title="Restart HAProxy service">
-				<img src=/inc/images/update.png alt="restart" class="icon">
-			</a>
-		</span>
-		{% endif %}
-	</div>
-	<div class="server-desc">
-		{{s.3}}
-		<br />
-		{{s.5.0.0}} {{s.5.0.1}}
-	</div>
-	<div class="server-act-links">
-		<a href="/app/config.py?serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config" target="_blank">Open</a>	
-		<a href="/app/config.py?serv={{s.2}}&showCompare" class="ui-button ui-widget ui-corner-all" title="Compare configs" target="_blank">Compare</a>	
-		<a href="/app/config.py?serv={{s.2}}&showMap" class="ui-button ui-widget ui-corner-all" title="Show map" target="_blank">Map</a>	
-		<a href="/app/viewsttats.py?serv={{s.2}}" class="ui-button ui-widget ui-corner-all" title="View stat" target="_blank">Stat</a>	
-		{% if role <= 2 %}
-			<a href="/app/versions.py?serv={{s.2}}&open=open" class="ui-button ui-widget ui-corner-all" title="Show verisons">Verisons</a>	
-		{% endif %}
+<div id="up-pannel">
+	{% for s in servers %}
+	<div class="div-pannel" id="div-pannel-">
+		<div id="div-server-{{s.0}}" class="div-server">
+			<div class="server-name">
+				
+				{% if s.5 != False %}
+					<span class="serverUp server-status" title="{{s.5.0.2}}"></span>
+				{% else %}
+					<span class="serverDown server-status" title="HAProxy is down"></span>
+				{% endif %}
+				<span title="Show info about {{s.2}}" onclick="showOverviewServer('{{s.1}}', '{{s.2}}', '{{s.0}}')" style="cursor: pointer;">
+					{{s.1}}
+				</span>
+				{% if role <= 1 %}
+				<span class="server-action">
+					<a id="{{ s.2 }}" class="start" title="Start HAProxy service">
+						<img src=/inc/images/start.png alt="start" class="icon" style="margin-bottom: -2px;" onclick="confirmAjaxAction('start', 'hap', '{{s.2}}')">
+					</a>
+					<a id="{{ s.2 }}" class="stop" title="Stop HAProxy service">
+						<img src=/inc/images/stop.png alt="stop" class="icon" width="17px" onclick="confirmAjaxAction('stop', 'hap', '{{s.2}}')">
+					</a>
+					<a id="{{ s.2 }}" class="restart" title="Restart HAProxy service">
+						<img src=/inc/images/update.png alt="restart" class="icon">
+					</a>
+				</span>
+				{% endif %}
+			</div>
+			<div class="server-desc">
+				{{s.3}}
+				<br />
+				{{s.5.0.0}} {{s.5.0.1}}
+			</div>
+			<div class="server-act-links">
+				<a href="/app/config.py?serv={{s.2}}&showConfig" class="ui-button ui-widget ui-corner-all" title="Open running config" target="_blank">Open</a>	
+				<a href="/app/config.py?serv={{s.2}}&showCompare" class="ui-button ui-widget ui-corner-all" title="Compare configs" target="_blank">Compare</a>	
+				<a href="/app/config.py?serv={{s.2}}&showMap" class="ui-button ui-widget ui-corner-all" title="Show map" target="_blank">Map</a>	
+				<a href="/app/viewsttats.py?serv={{s.2}}" class="ui-button ui-widget ui-corner-all" title="View stat" target="_blank">Stat</a>	
+				{% if role <= 2 %}
+					<a href="/app/versions.py?serv={{s.2}}&open=open" class="ui-button ui-widget ui-corner-all" title="Show verisons">Verisons</a>	
+				{% endif %}
+			</div>
+		</div>
+		<div id="ajax-server-{{s.0}}" class="ajax-server"></div>
 	</div>
+	{% endfor %}
 </div>
-<div id="ajax-server-{{s.0}}" class="ajax-server"></div>
-</div>
-{% endfor %}
 <div id="dialog-confirm" style="display: none;">
   <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Are you sure?</p>
 </div>
diff --git a/inc/script.js b/inc/script.js
index c59f6975..be4126bd 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -229,7 +229,13 @@ function showOverviewServer(name,ip,id) {
 			$(".div-pannel").css('display', 'block');
 			$(".div-pannel").css('padding-top', '10px');
 			$(".div-pannel").css('height', '70px');
+			$("#div-pannel-"+id).insertBefore('#up-pannel')
 			$("#ajax-server-"+id).html(data);
+			$("#ajax-server-"+id).addClass( "update", 1000 );
+				setTimeout(function() {
+					$("#ajax-server-"+id).removeClass( "update" );
+					$("#ajax-server-"+id).css('background-color', '#f9fff8');			
+			}, 2500 );
 			// $.getScript('/inc/overview.js');
 		}					
 	} );
diff --git a/inc/users.js b/inc/users.js
index 3bef4afe..fca33671 100644
--- a/inc/users.js
+++ b/inc/users.js
@@ -146,7 +146,7 @@ $( function() {
 				} else if (data.indexOf('Complete!') != '-1'){
 					$('.alert-danger').remove();
 					$('.alert-warning').remove();
-					$("#ajax").html('<div class="alert alert-success">'+data+'</data>');				
+					$("#ajax").html('<div class="alert alert-success">Update was success!</data>');				
 				} else if (data.indexOf('but not installed') != '-1') {
 					$('.alert-danger').remove();
 					$('.alert-warning').remove();