From ec3283688aafd651ca2fd152e79c6b93fcff2c71 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 27 Dec 2017 10:35:24 +0100 Subject: [PATCH] devel/helloworld: merge version 1.3 from master --- devel/helloworld/Makefile | 2 +- .../mvc/app/controllers/OPNsense/HelloWorld/IndexController.php | 2 -- .../opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/devel/helloworld/Makefile b/devel/helloworld/Makefile index 9347f59dc..de639c35d 100644 --- a/devel/helloworld/Makefile +++ b/devel/helloworld/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= helloworld -PLUGIN_VERSION= 1.2 +PLUGIN_VERSION= 1.3 PLUGIN_COMMENT= A sample framework application PLUGIN_MAINTAINER= ad@opnsense.org diff --git a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php index 5fd186022..5306ba71c 100644 --- a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php +++ b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php @@ -36,8 +36,6 @@ class IndexController extends \OPNsense\Base\IndexController { public function indexAction() { - // set page title, used by the standard template in layouts/default.volt. - $this->view->title = "Hello World"; // pick the template to serve to our users. $this->view->pick('OPNsense/HelloWorld/index'); // fetch form data "general" in diff --git a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml index 60167b104..090c0a819 100644 --- a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml +++ b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/Menu/Menu.xml @@ -1,5 +1,5 @@ - +