From 0e672f38ac429078c9c9c544aa81c947a85a88d2 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 17 May 2017 19:47:35 +0200
Subject: [PATCH 1/2] net/haproxy: hide statistics tabs if service is not
 enabled, closes #154

---
 .../mvc/app/views/OPNsense/HAProxy/statistics.volt       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
index 6b96dfa5b..7aa2d9306 100644
--- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
+++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/statistics.volt
@@ -64,6 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     callback = function (data, status) {
                         if (status == "success") {
                             // status
+                            $("#status_nav").show();
                             $("#grid-status").bootgrid('destroy');
                             var html = [];
                             $.each(data, function (key, value) {
@@ -94,6 +95,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     callback = function (data, status) {
                         if (status == "success") {
                             // counters
+                            $("#counters_nav").show();
                             $("#grid-counters").bootgrid('destroy');
                             var html = [];
                             $.each(data, function (key, value) {
@@ -124,6 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     callback = function (data, status) {
                         if (status == "success") {
                             // tables
+                            $("#tables_nav").show();
                             $("#grid-tables").bootgrid('destroy');
                             var html = [];
                             $.each(data, function (key, value) {
@@ -157,9 +160,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 <ul class="nav nav-tabs" role="tablist"  id="maintabs">
     <li class="active"><a data-toggle="tab" href="#info"><b>{{ lang._('Overview') }}</b></a></li>
-    <li><a data-toggle="tab" href="#status"><b>{{ lang._('Status') }}</b></a></li>
-    <li><a data-toggle="tab" href="#counters"><b>{{ lang._('Counters') }}</b></a></li>
-    <li><a data-toggle="tab" href="#tables"><b>{{ lang._('Stick Tables') }}</b></a></li>
+    <li><a data-toggle="tab" href="#status" id="status_nav" style="display:none"><b>{{ lang._('Status') }}</b></a></li>
+    <li><a data-toggle="tab" href="#counters" id="counters_nav" style="display:none"><b>{{ lang._('Counters') }}</b></a></li>
+    <li><a data-toggle="tab" href="#tables" id="tables_nav" style="display:none"><b>{{ lang._('Stick Tables') }}</b></a></li>
 </ul>
 
 <div class="content-box tab-content">

From bc54a60772fa90a2933d3fb9397ea2bd0fc85a55 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 17 May 2017 19:50:26 +0200
Subject: [PATCH 2/2] net/haproxy: bump version

---
 net/haproxy/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index f277a2c24..6f31a5eec 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		1.14
+PLUGIN_VERSION=		1.15
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy
 PLUGIN_MAINTAINER=	opnsense@moov.de