From 31382f46482204e37c5f269322524ea53a14e92c Mon Sep 17 00:00:00 2001
From: Aidaho12 <buffoon2001@mail.ru>
Date: Sun, 6 May 2018 23:07:13 +0600
Subject: [PATCH] v2.5.1

---
 app/funct.py              | 2 +-
 app/templates/base.html   | 2 +-
 app/templates/config.html | 2 +-
 update.sh                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/funct.py b/app/funct.py
index d3647799..b1dbff86 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -279,7 +279,7 @@ def upload_and_restart(serv, cfg, **kwargs):
 	for command in commands:
 		stdin, stdout, stderr = ssh.exec_command(command)
 
-	return stderr.read().decode(encoding='UTF-8'), error
+	return stderr.read().decode(encoding='UTF-8')
 	ssh.close()
 		
 def open_port_firewalld(cfg):
diff --git a/app/templates/base.html b/app/templates/base.html
index 823dc575..fd4845d5 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -33,7 +33,7 @@
 		<div class="top-menu">
 			<div class="LogoText">
 				<span style="padding: 10px;">HAproxy-WI</span>
-				<a href="#" id="hide_menu" title="Hide menu" style="margin-left: 16px;margin-top: -10px;position: absolute;">
+				<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>
diff --git a/app/templates/config.html b/app/templates/config.html
index a735c839..ab17e190 100644
--- a/app/templates/config.html
+++ b/app/templates/config.html
@@ -62,8 +62,8 @@
 		{% else %}
 			<div class="alert alert-success">Config ok</div>
 			<a href="viewsttats.py?serv={{ serv }}" target="_blank" title="View stats">Go to view stats</a>
-			<script>window.history.pushState("Map", "Map", cur_url[0])</script>
 		{% endif %}
+		<script>window.history.pushState("Config", "Config", cur_url[0])</script>
 	{% endif %}
 	</center>
 {% endblock %}
\ No newline at end of file
diff --git a/update.sh b/update.sh
index 977354a3..fdfd4485 100644
--- a/update.sh
+++ b/update.sh
@@ -10,7 +10,7 @@ chown -R apache:apache *
 cd app/
 ./update_db.py
 
-pip install -r requirements.txt 
+pip3 install -r ../requirements.txt
 
 echo ""
 echo "#################"