From b96d8279576eee1ab6d66ff7081a483e13a8f69c Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sat, 9 Dec 2017 16:39:09 +0100 Subject: [PATCH 1/2] net/haproxy: add option to hide introduction pages, closes #340 --- .../OPNsense/HAProxy/IndexController.php | 4 +++ .../OPNsense/HAProxy/forms/main.xml | 6 +++++ .../app/models/OPNsense/HAProxy/HAProxy.xml | 5 +++- .../mvc/app/views/OPNsense/HAProxy/index.volt | 26 ++++++++++++------- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php index 9320f90cf..f5dd7b452 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/IndexController.php @@ -28,6 +28,7 @@ * */ namespace OPNsense\HAProxy; +use OPNsense\HAProxy\HAProxy; /** * Class IndexController @@ -51,6 +52,9 @@ class IndexController extends \OPNsense\Base\IndexController $this->view->formDialogAcl = $this->getForm("dialogAcl"); $this->view->formDialogLua = $this->getForm("dialogLua"); $this->view->formDialogErrorfile = $this->getForm("dialogErrorfile"); + // set additional view parameters + $mdlHAProxy = new \OPNsense\HAProxy\HAProxy(); + $this->view->showIntro = (string)$mdlHAProxy->general->showIntro; // pick the template to serve $this->view->pick('OPNsense/HAProxy/index'); } diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml index 3a48bfaeb..04a05134c 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml @@ -13,6 +13,12 @@ checkbox + + haproxy.general.showIntro + + checkbox + + diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml index af366cdcb..bf4252e17 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml @@ -1,6 +1,6 @@ //OPNsense/HAProxy - 2.0.0 + 2.0.1 the HAProxy load balancer @@ -14,6 +14,9 @@ 0 Y + + 1 + 0 diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt index e2ddfaf29..1083b8780 100644 --- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt +++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt @@ -381,10 +381,12 @@ POSSIBILITY OF SUCH DAMAGE. - {{ lang._('Real Servers') }} + {{ lang._('Real Servers') }} @@ -392,10 +394,12 @@ POSSIBILITY OF SUCH DAMAGE. - {{ lang._('Virtual Services') }} + {{ lang._('Virtual Services') }} @@ -404,10 +408,12 @@ POSSIBILITY OF SUCH DAMAGE. - {{ lang._('Rules & Checks') }} + {{ lang._('Rules & Checks') }} @@ -442,10 +448,12 @@ POSSIBILITY OF SUCH DAMAGE. - {{ lang._('Advanced') }} + {{ lang._('Advanced') }} From 6b3acca3d7481201a5ae31d535534584b0cf775b Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sat, 9 Dec 2017 16:39:45 +0100 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 91f859185..de2849155 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= haproxy -PLUGIN_VERSION= 2.2 +PLUGIN_VERSION= 2.3 PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer PLUGIN_DEPENDS= haproxy PLUGIN_MAINTAINER= opnsense@moov.de