From a0aaab0efedf527adff247dcbe6a9e6385861e32 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 30 Jul 2020 07:36:29 +0200
Subject: [PATCH] v4.4.0.0

Changelog: https://haproxy-wi.org/changelog.py#4_4
---
 app/templates/ajax/smon_dashboard.html | 12 +++++-------
 inc/script.js                          |  9 +++++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/templates/ajax/smon_dashboard.html b/app/templates/ajax/smon_dashboard.html
index 5508a18a..1f7e1fdf 100644
--- a/app/templates/ajax/smon_dashboard.html
+++ b/app/templates/ajax/smon_dashboard.html
@@ -52,14 +52,12 @@
         {% else %}
             <span>
         {% endif %}
-        {% if s.9 %}
-            <span title="HTTP check: {{s.9.split(':')[0]}}://{{s.0}}:{{s.1}}{{s.9.split(':')[1]}}
-{% if s.11 and s.11 != 'None' %}Body check: {{s.11}}{% endif %}"
+            <span title="Enabled checks:
+Port check{% if s.9 %}
+HTTP status check: {{s.9.split(':')[0]}}://{{s.0}}:{{s.1}}{{s.9.split(':')[1]}}
+{% if s.11 and s.11 != 'None' %}Body response check: {{s.11}}{% endif %}
+{% endif %}"> {{s.0}}:{{s.1}}
             </span>
-            {{s.0}}:{{s.1}}
-        {% else %}
-            {{s.0}}:{{s.1}}
-        {% endif %}
         </span>
     </div>
     <div class="desc">
diff --git a/inc/script.js b/inc/script.js
index b6c2ed19..fde66582 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -991,7 +991,12 @@ function listHistroy() {
 			$('.menu li ul li').each(function () {
 				var link1 = $(this).find('a').attr('href');
 				var link2 = link1.split('/')[2]
-				if (browse_history[i].split('?')[0] == link2) {
+				if (browse_history[i] == link2) {
+					title[i] = $(this).find('a').attr('title');
+					link_text[i] = $(this).find('a').text();
+					history_link = '<li><a href="'+browse_history[i]+'" title="'+title[i]+'">'+link_text[i]+'</a></li>'
+					$('#browse_histroy').append(history_link);
+				} else if (browse_history[i].split('?')[0] == link2) {
 					title[i] = $(this).find('a').attr('title');
 					link_text[i] = $(this).find('a').text();
 					history_link = '<li><a href="'+browse_history[i]+'" title="'+title[i]+'">'+link_text[i]+'</a></li>'
@@ -1044,7 +1049,7 @@ function showSmon(action) {
 		},
 		type: "POST",
 		success: function( data ) {
-			if (data.indexOf('error') != '-1') {
+			if (data.indexOf('SMON error') != '-1') {
 				toastr.error(data);
 			} else {
 				$("#smon_dashboard").html(data);