From a8b6afba674a2d636a3c583d99d352f570ca8881 Mon Sep 17 00:00:00 2001
From: mxc-commons <frank.hein@maxence.de>
Date: Wed, 13 Nov 2013 06:00:53 +0100
Subject: [PATCH] Support for content ViewModel added

mca-Rule definition changed. See readme.md.
---
 README.md                                     |  81 ++++---
 .../Controller/Plugin/LayoutSchemePlugin.php  |  53 +----
 src/MxcLayoutScheme/Module.php                |   8 +-
 .../Service/LayoutSchemeService.php           | 214 ++++++++++--------
 .../Service/LayoutSchemeServiceFactory.php    |  16 ++
 5 files changed, 196 insertions(+), 176 deletions(-)
 create mode 100644 src/MxcLayoutScheme/Service/LayoutSchemeServiceFactory.php

diff --git a/README.md b/README.md
index be58395..6d9e7be 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 MxcLayoutScheme
 ===============
-Version 0.4.0 created by Frank Hein and the mxc-commons team.
+Version 0.5.0 created by Frank Hein and the mxc-commons team.
 
 MxcLayoutScheme is part of the [maxence openBeee initiative](http://www.maxence.de/mxcweb/index.php/themen/open-business/)
 by [maxence business consulting gmbh, Germany](http://www.maxence.de). 
@@ -61,6 +61,8 @@ view template as far as possible. We want to achieve that within the controller
 
 **9. Provide support for dispatch errors**
 
+**10. Provide support for content view template**
+
 In the current version you can either assign the layout variables within the controller action via `layoutScheme` controller plugin. Alternatively you may supply an event handler for pre- and postprocessing. We provide an example here.
 
 Installation
@@ -198,13 +200,34 @@ the values specify the layout templates to apply.
 #### `<mca_layouts>`
 
 Keys for `<mca_layouts>` are like `<moduleName>[\<controllerName>[\<actionName>]]`, 
-where `<moduleName>` is the name of the module, `<controllerName>` is the name of the controller (without 'Controller' suffix), `<actionName>` is the name of the the controller action.
+where `<moduleName>` is the name of the module, `<controllerName>` is the name of the controller as it is registered to the ControllerLoader, `<actionName>` is the name of the the controller action.
 		
 		Examples
 
-			'MyModule'							//--- applies to all controllers in module
-			'MyModule\MyController'				//--- applies to all actions of a controller
-			'MyModule\MyController\MyAction'	//--- applies to a particular controller action
+			Generic
+
+				'MyModule'							//--- applies to all controllers in module
+				'MyModule\MyController'				//--- applies to all actions of a controller
+				'MyModule\MyController\MyAction'	//--- applies to a particular controller action
+
+			ZfcUser controller (registered as zfcuser)
+	
+				'ZfcUser'							//--- applies to all controllers of ZfcUser (there is only one ;)
+				'ZfcUser\zfcuser'					//--- applies to the controller registered with 'zfcuser'
+													//--- (ZfcUser\Controller\UserController) 
+				'ZfcUser\zfcuser\login'				//--- login action
+
+			MxcUserManagement controller (registered as 'MxcUserManagement\Controller\UserManagement')
+
+				'MxcUserManagement'					//--- applies to all controllers of module MxcUserManagement
+
+				'MxcUserManagement\MxcUserManagement\Controller\UserManagement'	 
+													//--- applies to controller registered with 'MxcUserManagement\Controller\UserManagement' 
+													//--- *** In this rule the first occurance of'MxcUserManagement' identifies the module.
+													//--- *** The second occurance is part of the controller registration string.
+
+				'MxcUserManagement\MxcUserManagement\Controller\UserManagement\index'	//--- index action 
+
 
 Action rules are evaluated before controller rules. Controller rules are evaluated before Module rules. So if you apply an action rule and a module rule for the same module, the
 module rule applies for all controllers and actions but the one action which has an own
@@ -278,9 +301,9 @@ Accessing the route `home` causes a match of the according rule. Defaults get ap
 How MxcLayoutScheme works
 -------------------------
 
-1. On Bootstrap MxcLayoutScheme hooks into the dispatch event of the application's EventManager with low priority (-1000).
+1. On Bootstrap MxcLayoutScheme hooks into the route event of the application's EventManager with low priority (-2000).
 2. On Bootstrap MxcLayoutScheme instantiates the controller plugin `'layoutScheme'` to inject a reference to the application's ServiceManager instance.
-3. On dispatch MxcLayoutScheme evaluates the current route matched, the module name, the controller name and the action name.
+3. On route MxcLayoutScheme evaluates the current route matched, the module name, the controller name and the action name.
 4. Then MxcLayoutScheme triggers an `MxcLayoutSchemeService::HOOK_PRE_SELECT_SCHEME` event. If you registered an event handler for that event in the bootstrap somewhere you can set the active scheme with `$e->getTarget()->setActiveScheme($schemeName)` with a `$schemeName`of your choice. Alternatively, you can set the active scheme within the controller action using the controller plugin: `$this->layoutScheme()->setActiveScheme($schemeName)`.
 5. Then, MxcLayoutScheme loads the currently active scheme.  
 6. MxcLayoutScheme checks the `route_layouts` for a key matching the matched route name. If the key exists the layout template registered to that match gets applied. If the rule defines child view models they get merged with the (optionally) defined default child view models and get applied to the layout. If match continue at 11.
@@ -296,8 +319,22 @@ from within the controller action.
 How MxcLayoutScheme handles dispatch errors
 -------------------------------------------
 
+On Bootstrap MxcLayoutScheme hooks into the dispatch.error event with priority -1000.
+
 When a dispatch error occurs, MxcLayoutScheme first checks for a rule applying to the error code from the `$event->getError()`. If no rule applies MxcLayoutScheme then checks for a rule applying to the status code from $event->getResponse()->getStatusCode().
 
+How MxcLayoutScheme handles content templates
+---------------------------------------------
+
+Content templates may be specified via rules like any other template. `<capture> => <template>`.
+
+While the child layouts to the root layout get attached onRoute, the content template gets attached on the dispatch event. 'MxcLayoutScheme' checks for a child template registered to the `content` capture. If found it replaces it's view template. If no content viewmodel is present,
+MxcLayoutScheme creates one and with the configured template attached to the `content` capture.
+
+#####Note: 
+If you need to set a content view template within your controller action and want it to override a given LayoutScheme definition, you
+need to inform layoutScheme to skip it's content view template definition (if present). Using the controller plugin you do that by `$this->layoutScheme()->useControllerContentTemplate()`. 
+
 
 Example Event Handler to choose the active scheme
 --------------------------------------------------
@@ -426,7 +463,7 @@ the `<div data-role="panel-left"> ... </div>` section at all.
 				'master' => array(
 					'mca_layouts' => array(
 						'options' => array(
-							'ZfcUser\User\login' => array(
+							'ZfcUser\zfcuser\login' => array(
 								'layout' => 'layout\master',
 								'panelLeft' => '<none>',
 							),
@@ -454,6 +491,7 @@ From within a controller action you can access the controller plugin with `$this
 
 `layoutScheme` provides the following interfaces:
 
+**getActiveScheme():** get the currently active layout scheme.
 
 **getChildViewModel($capture):** returns the child view model registered for the $capture capture. Null if capture is not registered.
 
@@ -461,17 +499,9 @@ From within a controller action you can access the controller plugin with `$this
 
 **setVariables($variables, $override = false):** see ViewModels `setVariables` for parameter specification. The `layoutScheme setVariables` function applies the same variables provided through `$variables` to the controller's layout and to all registered child ViewModels.  
 
-**getActiveScheme():** get the currently active layout scheme. 
-
-**setActiveScheme($schemeName, $skipPreSelectSchemeEvent = false):** set the layout scheme to use. Set `skipPreSelectSchemeEvent` to `true` then the `LayoutSchemeService::HOOK_PRE_SELECT_EVENT` will not get triggered by `LayoutSchemeService`.
-
-**skipPreSelectSchemeEvent():** disable triggering of `LayoutSchemeService::HOOK_PRE_SELECT_SCHEME` this time. This event would get triggered after the view action before rendering. You may want to disable the event to prevent the global event handler to override the active scheme you set via `$this->layoutScheme()->setActiveScheme()`. 
-######Note:
-The event is not skipped by default. Within the global event handler you can check if the active scheme was set by the controller plugin using `LayoutSchemeService->hasPluginSetActiveScheme()` to prevent overriding.
-
-**skipPostSelectLayoutEvent():** disable triggering of `LayoutSchemeService::HOOK_POST_SELECT_LAYOUT` this time.
-
-**hasPluginSetActiveScheme()**: returns `true` if the active scheme was set previously through by the user through `layoutScheme()->setActiveScheme($schemeName)`.
+**useControllerContentTemplate($flag = true)**: MxcLayoutScheme supports the provision of content templates via
+it's configuration (`capture = 'content'`). If you want to override the MxcLayoutScheme configuration with your own
+template set in the controller's action, you should inform MxcLayoutScheme not to override your setting by calling `useControllerContentTemplate()`.
 
 #####Note
 
@@ -482,20 +512,11 @@ Example:
 	$this->layout()->setVariables($varMain); // assign variables to the layout's ViewModel
 	$this->layoutScheme()->getChildViewModel('panelLeft')->setVariables($varPanelLeft); // assign variables to leftPanel child
 
-Important:
-
-`LayoutSchemeService` registers to the `MvcEvent::EVENT_DISPATCH` with priority of -1000. So layout selection
-happens *after* your controller action has returned *before* the page gets rendered. This means in particular that at the time the controller action is executed the `LayoutSchemeService` does not know anything about the layout selected and it's child view models.    
-
-To get around this `LayoutSchemeService` was designed for early execution of the onDispatch event handler if called via the controller plugin. If this preponed event handling happens the service prevents event processing to happen again when triggered globally afterwards. Even in early processing the service triggers the `HOOK_PRE_SELECT_SCHEME` and `HOOK_POST_SELECT_LAYOUT` events.
-
-If you do not want one or both events to get triggered make sure to call `layoutScheme()->skipPostSelectLayoutEvent()` and/or `layoutScheme()->skipPreSelectSchemeEvent()` *before* you call `getChildViewModel()`, `getChildViewModels()` or `setVariables()`. Otherwise the event(s) will get fired.   
-
 Notes
 -----
 
-If you do not define a scheme or if the active scheme does not register a global default layout the ViewManager
-configuration gets applied. If you define a global default layout within your schemes it overrides the ViewManager
+If you do not define a scheme or if the active scheme does not register a master layout the ViewManager
+configuration gets applied. If you define a master layout (capture `layout`) within your schemes it overrides the ViewManager
 configuration.
 
 Common use cases for MxcSchemeLayout are 
diff --git a/src/MxcLayoutScheme/Controller/Plugin/LayoutSchemePlugin.php b/src/MxcLayoutScheme/Controller/Plugin/LayoutSchemePlugin.php
index 06c64e3..eab0b71 100644
--- a/src/MxcLayoutScheme/Controller/Plugin/LayoutSchemePlugin.php
+++ b/src/MxcLayoutScheme/Controller/Plugin/LayoutSchemePlugin.php
@@ -7,14 +7,16 @@
 class LayoutSchemePlugin extends AbstractPlugin {
 
 	protected $layoutSchemeService = null;
-
+	
+	protected $useControllerContentTemplate = false;
+	
 	/**
-	 * Set the active scheme
-	 *
-	 * @param string $activeScheme
+	 * Retrieve array of child view models
+	 * 
+	 * @param $flag    default true
 	 */
-	public function setActiveScheme($activeScheme, $skipPreSchemeSelectEvent = false) {
-		$this->getLayoutSchemeService()->pluginSetActiveScheme($activeScheme, $skipPreSchemeSelectEvent);
+	public function useControllerContentTemplate($flag = true) {
+	    $this->getLayoutSchemeService()->useControllerContentTemplate($flag);
 	}
 	
 	/**
@@ -27,10 +29,9 @@ public function getActiveScheme() {
 	/**
 	 * Retrieve array of child view models
 	 * 
-	 * @param $capture
 	 */
 	public function getChildViewModels() {
-		return $this->getLayoutSchemeService()->pluginGetChildViewModels($this->getController());
+		return $this->getLayoutSchemeService()->getChildViewModels();
 	}
 	
 	/**
@@ -39,34 +40,17 @@ public function getChildViewModels() {
 	 * @param $capture
 	 */
 	public function getChildViewModel($capture) {
-		return $this->getLayoutSchemeService()->pluginGetChildViewModel($this->getController(), $capture);
+		return $this->getLayoutSchemeService()->getChildViewModel($capture);
 	}
 	
 	/**
 	 * Apply a set of variables to the layout view model and all it's child view models 
 	 * 
 	 * @param $variables
+	 * @param $override    default false
 	 */
 	public function setVariables($variables, $override = false) {
-	    $this->getLayoutSchemeService()->pluginSetVariables($this->getController(), $variables, $override);
-	}
-	
-	/**
-	 * Prevent LayoutSchemeService::HOOK_PRE_SELECT_SCHEME to get triggered (for this run only) 
-	 * 
-	 * @param $variables
-	 */
-	public function skipPreSelectSchemeEvent() {
-	    $this->getLayoutSchemeService()->setSkipPreSelectSchemeEvent(true);
-	}
-
-	/**
-	 * Prevent LayoutSchemeService::HOOK_POST_SELECT_LAYOUT to get triggered (for this run only) 
-	 * 
-	 * @param $variables
-	 */
-	public function skipPostSelectLayoutEvent() {
-		$this->getLayoutSchemeService()->setSkipPostSelectLayoutEvent(true);
+	    $this->getLayoutSchemeService()->setVariables($variables, $override);
 	}
 	
 	/**
@@ -85,17 +69,4 @@ public function getLayoutSchemeService() {
 		}
 		return $this->layoutSchemeService;
 	}
-	
-	/**
-	 * Get the current controller instance
-	 *
-	 * @return null|Dispatchable
-	 */
-	public function getController()
-	{
-	    if (!$this->controller) {
-		    throw new RuntimeException(sprintf('No Controller reference available. Sorry.'));
-	    } 
-		return $this->controller;
-	}
 }
diff --git a/src/MxcLayoutScheme/Module.php b/src/MxcLayoutScheme/Module.php
index fae3fcc..653f513 100644
--- a/src/MxcLayoutScheme/Module.php
+++ b/src/MxcLayoutScheme/Module.php
@@ -36,9 +36,7 @@ public function onBootstrap(MvcEvent $e)
     	$app = $e->getApplication();
     	$sm = $app->getServiceManager();
     	$em = $app->getEventManager();
-    	$lss = $sm->get('mxclayoutscheme_service');
-    	$em->attach($lss);
-    	$sm->get('ControllerPluginManager')->get('layoutScheme')->setLayoutSchemeService($lss);
+    	$em->attach($sm->get('mxc_layoutscheme_service'));
     }
     
     public function getControllerPluginConfig() {
@@ -52,8 +50,8 @@ public function getControllerPluginConfig() {
     public function getServiceConfig()
     {
         return array(
-    		'invokables' => array(
-				'mxclayoutscheme_service' 	=> 'MxcLayoutScheme\Service\LayoutSchemeService'
+    		'factories' => array(
+				'mxc_layoutscheme_service' 	=> 'MxcLayoutScheme\Service\LayoutSchemeServiceFactory'
    			),
 	    );
 	}
diff --git a/src/MxcLayoutScheme/Service/LayoutSchemeService.php b/src/MxcLayoutScheme/Service/LayoutSchemeService.php
index 989162f..eae8f08 100644
--- a/src/MxcLayoutScheme/Service/LayoutSchemeService.php
+++ b/src/MxcLayoutScheme/Service/LayoutSchemeService.php
@@ -2,17 +2,15 @@
 
 namespace MxcLayoutScheme\Service;
 
-use Zend\Mvc\MvcEvent;
-use Zend\View\Model\ViewModel;
 use Zend\EventManager\ListenerAggregateInterface;
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\ProvidesEvents;
-use Zend\Stdlib\Parameters;
 use Zend\Filter\Word\CamelCaseToDash;
-use MxcLayoutScheme\Service\LayoutSchemeServiceOptions;
-use MxcLayoutScheme\Service\LayoutSchemeOptions;
+use Zend\Mvc\MvcEvent;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\Stdlib\Parameters;
+use Zend\View\Model\ViewModel;
 use MxcGenerics\Stdlib\GenericOptions;
 
 class LayoutSchemeService implements ListenerAggregateInterface, ServiceLocatorAwareInterface 
@@ -28,15 +26,17 @@ class LayoutSchemeService implements ListenerAggregateInterface, ServiceLocatorA
 	protected $schemeOptions = array();
 	protected $params  = null;
 	protected $childViewModels = array();
-	protected $completed = false;
-	protected $hasPluginSetActiveScheme = false;
+	protected $contentTemplate = null;
+	protected $standardLayout = false;
+	protected $useControllerContentTemplate = false;
 	protected $skipPreSelectSchemeEvent = false;
 	protected $skipPostSelectLayoutEvent = false;
 
 	public function attach(EventManagerInterface $events)
 	{
-		$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'onDispatchError'),-1000);
-	    $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'onDispatch'),-1000);
+		$this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($this, 'onDispatchError'),100);
+	    $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'),-2000);
+	    $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'onDispatch'),-2000);
 	}
 	
 	/**
@@ -54,30 +54,48 @@ public function detach(EventManagerInterface $events)
 		}
 	}
 	
+	protected function setParams(MvcEvent $e) {
+		$routeMatch = $e->getRouteMatch();
+		
+		$controller = $routeMatch->getParam('controller');
+		$config = $this->getServiceLocator()->get('Config');
+		$controllers = isset($config['controllers']['invokables']) ? $config['controllers']['invokables'] : array();
+		$module = $controllers[$controller];
+		$module       = substr($module,0,strpos($module,'\\'));
+		
+		$this->setParam('module',$module)
+			->setParam('controller',$controller)
+			->setParam('action',$routeMatch->getParam('action'))
+			->setParam('route',$routeMatch->getMatchedRouteName());
+	}
+	
+	public function onDispatch(MvcEvent $e) {
+	    if ($this->useControllerContentTemplate) { 
+	        $this->useControllerContentTemplate = false;
+	        return;
+	    }
+	    if ($this->contentTemplate) {
+		    $view = $this->getServiceLocator()->get('view_manager')->getViewModel();
+		    $children = $view->getChildren();
+		    foreach ($children as $child) {
+		        if ($child->captureTo() === 'content') break;
+		    }
+		    $child->setTemplate($this->contentTemplate);
+	    } 
+	}
+	
 	/**
-	 * handle dispatch event
+	 * handle route event
 	 */
-	public  function onDispatch(MvcEvent $e)
+	public  function onRoute(MvcEvent $e)
 	{
-        // prevent multiple execution
-	    if ($this->completed) return;
-	    
-		$ctrl = $e->getTarget();
-		$controllerclass = get_class($ctrl);
-		$controller = substr($controllerclass,strrpos($controllerclass,'\\')+1);
-		$routeMatch = $e->getRouteMatch();
-		$this->setParam('controller',$ctrl)
-			->setParam('moduleName',substr($controllerclass,0,strpos($controllerclass,'\\')))
-			->setParam('controllerName',substr($controller,0,strrpos($controller,'Controller')))
-			->setParam('actionName',$routeMatch->getParam('action'))
-			->setParam('routeName',$routeMatch->getMatchedRouteName());
+		$this->setParams($e);
 		
 		// event handler may modify the active scheme
 		if (!$this->getSkipPreSelectSchemeEvent()) {
     		$this->getEventManager()->trigger(LayoutSchemeService::HOOK_PRE_SELECT_SCHEME, $this);
 		}
 		$this->selectLayout();
-		$this->completed = true;
 		// event handler may add variables to the layout
 		if (!$this->getSkipPostSelectLayoutEvent()) {
 		  $this->getEventManager()->trigger(LayoutSchemeService::HOOK_POST_SELECT_LAYOUT, $this);
@@ -116,34 +134,34 @@ public function selectLayout() {
         //--- try to apply route rule based layout
 		if ($schemeOptions->getEnableRouteLayouts()) {
 			$routeLayouts = $schemeOptions->getRouteLayouts();
-			$route = $this->getParam('routeName');
-			if ($this->applyLayout($routeLayouts, $route)) return;
+			$route = $this->getParam('route');
+			if ($this->applyLayoutEx($routeLayouts, $route)) return;
 		}
 		
         //--- try to apply mca rule based layout
 		if ($schemeOptions->getEnableMcaLayouts()) {
 			$mcaLayouts = $schemeOptions->getMcaLayouts();
-			$module = $this->getParam('moduleName');
-			$controller = $this->getParam('controllerName');
-			$action = $this->getParam('actionName');
-			
-			if ($this->applyLayout($mcaLayouts, $module.'\\'.$controller.'\\'.$action)) return;
-			if ($this->applyLayout($mcaLayouts, $module.'\\'.$controller)) return;
-			if ($this->applyLayout($mcaLayouts, $module)) return;
+			$module = $this->getParam('module');
+			$controller = $this->getParam('controller');
+			$action = $this->getParam('action');
+			if ($this->applyLayoutEx($mcaLayouts, $module.'\\'.$controller.'\\'.$action)) return;
+			if ($this->applyLayoutEx($mcaLayouts, $module.'\\'.$controller)) return;
+			if ($this->applyLayoutEx($mcaLayouts, $module)) return;
 		}
 		
         //--- try to apply route rule based default layout
 		if ($schemeOptions->getEnableRouteLayouts()) {
 			$routeLayouts = $schemeOptions->getRouteLayouts();
-			if ($this->applyLayout($routeLayouts)) return;
+			if ($this->applyLayoutEx($routeLayouts)) return;
 		}
 		
         //--- try to apply mca rule based default layout
 		if ($schemeOptions->getEnableMcaLayouts()) {
 			$mcaLayouts = $schemeOptions->getMcaLayouts();
-			if ($this->applyLayout($mcaLayouts)) return;
+			if ($this->applyLayoutEx($mcaLayouts)) return;
 		}
 	}
+	
 	/**
 	 * select template according to error or response status scheme
 	 */
@@ -155,26 +173,54 @@ public function selectErrorLayout() {
 		if ($schemeOptions->getEnableErrorLayouts()) {
     		$errorLayouts = $schemeOptions->getErrorLayouts();
     		$error = $this->getParam('error');
-    		if ($this->applyLayout($errorLayouts, $error)) return;
+    		if ($this->applyLayoutEx($errorLayouts, $error)) return;
 		}
         
         //--- try to apply status rule based layout
 		if ($schemeOptions->getEnableStatusLayouts()) {
     		$statusLayouts = $schemeOptions->getHttpStatusLayouts();
     		$status = (string) $this->getParam('statusCode');
-    		if ($this->applyLayout($statusLayouts, $status)) return;
+    		if ($this->applyLayoutEx($statusLayouts, $status)) return;
 		}
 		
         //--- try to apply error rule based default layout
 		if ($schemeOptions->getEnableErrorLayouts()) {
-		    if ($this->applyLayout($errorLayouts)) return;
+		    if ($this->applyLayoutEx($errorLayouts)) return;
 		}
 		
         //--- try to apply status rule based default layout
 		if ($schemeOptions->getEnableStatusLayouts()) {
-		    if ($this->applyLayout($statusLayouts)) return;
+		    if ($this->applyLayoutEx($statusLayouts)) return;
 		}
 	}
+
+	protected function loadLayout($templates, $key = null) {
+	    //-- return false if no templates array provided
+        if (!$templates) return false;
+  	    
+        //-- return false if the requested option set does not exist 
+	    if ($key && !isset($templates['options'][$key])) return false;
+
+	    $layoutOptions = new GenericOptions($templates, $key);
+
+        //-- return false if the option set does not specify a root layout
+        //-- and the view_manager config section does not contain a 'layout' key
+        if (!$layoutOptions->getLayout()) { 
+	       if ($this->getStandardLayout != false) {
+	           $layoutOptions->setLayout($this->standardLayout);
+	       } else {
+	           return false;
+	       }
+        }
+	    
+	    return $layoutOptions;
+	}
+	
+	protected function applyLayoutEx($templates, $key = null) {
+	    $options = $this->loadLayout($templates, $key);
+	    if (false === $options) return false;
+	    return $this->applyLayout($options);
+	}
 	
 	/**
 	 * @param array  $templates
@@ -182,33 +228,27 @@ public function selectErrorLayout() {
 	 * 
 	 * @return bool
 	 */
-	protected function applyLayout($templates,$key = null) {
-        
-        //-- return false if no templates array provided
-        if (!$templates) return false;
-        
-        //-- return false if the requested option set does not exist 
-	    if ($key && !isset($templates['options'][$key])) return false;
-	    
-	    $layoutOptions = new GenericOptions($templates, $key);
-	    $layoutRoot = $layoutOptions->getLayout();
+	protected function applyLayout(GenericOptions $layoutOptions, $applyContent = false) {
 
-        //-- return false if the option set does not specify a root layout 
-	    if (!$layoutRoot) return false;
-	    
 		$layout = $this->getServiceLocator()->get('view_manager')->getViewModel();
-		$layout->setTemplate($layoutOptions->getLayout());
+        $layoutRoot = $layoutOptions->getLayout();		
+		if ($layoutRoot) $layout->setTemplate($layoutRoot);
     	$filter = new CamelCaseToDash();
 		
 		foreach ($layoutOptions as $capture => $template) {
+		    
 	        if ($capture === 'layout') continue;
-		
+	        if (($applyContent === false) && ($capture === 'content')) {
+	            $this->contentTemplate = $layoutOptions->getContent();
+	               continue;
+	        }
+	        
 			switch ($template) {
 				case null:
 				case '<default>': 
-					$template = strtolower($filter->filter($this->getParam('moduleName').'\\'.
-										   $this->getParam('controllerName').'\\'.
-										   $this->getParam('actionName').'-'.
+					$template = strtolower($filter->filter($this->getParam('module').'\\'.
+										   $this->getParam('controller').'\\'.
+										   $this->getParam('action').'-'.
 										   $capture));
 					break;
 				case '<none>':
@@ -231,13 +271,6 @@ protected function applyLayout($templates,$key = null) {
 		return true;
 	}
 	
-	public function pluginSetVariables($controller, $variables, $override = false) {
-	    if (!$this->completed && $controller) {
-	    	// called early -> need to complete first
-	        $this->onDispatch($controller->getEvent());
-	    }
-	    return $this->setVariables($variables, $override); 
-	}
 	
 	/**
 	 * apply variables to controller view model and all child view models
@@ -261,21 +294,6 @@ protected function setChildViewModel($capture, $view) {
 		$this->childViewModels[$capture] = $view;
 	}
 	
-	/**
-     * @param $controller
-	 * @param $capture
-	 * @param $default
-	 *
-	 * @return mixed | ViewModel
-	 */
-	protected function pluginGetChildViewModel($controller, $capture, $default = null) {
-		if (!$this->completed && $controller) {
-			$this->onDispatch($controller->getEvent());
-		}
-		return $this->getChildViewModel($capture, $default);
-	}
-	
-	
 	/**
 	 * @param $capture
 	 * @param $default
@@ -304,16 +322,6 @@ public function setOptions($options) {
 		$this->options = $options;
 	}
 	
-	/**
-	 * @return the $childViewModels
-	 */
-	public function pluginGetChildViewModels($controller) {
-	    if (!$this->completed && $controller) {
-            $this->onDispatch($controller->getEvent());
-	    }
-		return $this->childViewModels;
-	}
-	
 	/**
 	 * @return the $childViewModels
 	 */
@@ -347,17 +355,6 @@ public function setParam($name, $value) {
 	   return $this;
 	}
 	
-	/**
-	 * set active scheme in associated options object
-	 * 
-	 * @param string
-	 */
-	public function pluginSetActiveScheme($activeScheme, $skipPreSchemeSelectEvent = false) {
-	    $this->setActiveScheme($activeScheme);
-	    $this->hasPluginSetActiveScheme = true;
-	    $this->skipPreSchemeSelectEvent = $skipPreSchemeSelectEvent;
-	}
-	
 	/**
 	 * set active scheme in associated options object
 	 * 
@@ -385,6 +382,7 @@ protected function getActiveSchemeOptions() {
 	protected function getSchemeOptions($schemeName) {
 		if (!isset($this->schemeOptions[$schemeName])) {
 		    $config = $this->getServiceLocator()->get('Config')['mxclayoutscheme'];
+		    
 		    $scheme = new GenericOptions($config, $schemeName);
 		    $this->schemeOptions[$schemeName] = $scheme;
 		}
@@ -442,4 +440,20 @@ public function setServiceLocator(ServiceLocatorInterface $serviceLocator) {
 	public function getServiceLocator() {
 	    return $this->serviceLocator;
 	}
+	
+	/**
+	 * @param boolean $flag
+	 */
+	public function useControllerContentTemplate($flag) {
+	    $this->useControllerContentTemplate = $flag;
+	}
+	
+	protected function getStandardLayout() {
+	    if (!$this->standardLayout) {
+	        $config = $this->getServiceLocator()->get('Config');
+	        $this->standardLayout = isset($config['view_manager']['layout']) ? $config['view_manager']['layout'] : false;
+	    }
+	    return $this->standardLayout;
+	}
+	
 }
diff --git a/src/MxcLayoutScheme/Service/LayoutSchemeServiceFactory.php b/src/MxcLayoutScheme/Service/LayoutSchemeServiceFactory.php
new file mode 100644
index 0000000..cea84b2
--- /dev/null
+++ b/src/MxcLayoutScheme/Service/LayoutSchemeServiceFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MxcLayoutScheme\Service;
+
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class LayoutSchemeServiceFactory implements FactoryInterface {
+    
+    public function createService(ServiceLocatorInterface $serviceLocator) {
+        $service = new LayoutSchemeService;
+        // register service with the layoutScheme controller plugin
+        $serviceLocator->get('ControllerPluginManager')->get('layoutScheme')->setLayoutSchemeService($service);
+        return $service;        
+    }
+}
\ No newline at end of file