X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcommands%2Fweb%2Fclass_WebStatusCommand.php;h=e59c555f6a0790d8ada778ca5405853bb6719434;hb=1a91dabdfed365947d1ce11675aacae9d424edff;hp=f07eb35a579b7ae7473e3471abb4e6447084c664;hpb=f674968df3613418156a68f4a475c98507a1d505;p=core.git

diff --git a/inc/classes/main/commands/web/class_WebStatusCommand.php b/inc/classes/main/commands/web/class_WebStatusCommand.php
index f07eb35a..e59c555f 100644
--- a/inc/classes/main/commands/web/class_WebStatusCommand.php
+++ b/inc/classes/main/commands/web/class_WebStatusCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command for Status page
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ class WebStatusCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebStatusCommand (CommandResolver $resolverInstance) {
+	public static final function createWebStatusCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebStatusCommand();
 
@@ -59,16 +59,16 @@ class WebStatusCommand extends BaseCommand implements Commandable {
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Get the application instance
-		$appInstance = $this->getResolverInstance()->getApplicationInstance();
+		$applicationInstance = $this->getResolverInstance()->getApplicationInstance();
 
 		// Prepare a template instance
-		$templateInstance = $this->prepareTemplateInstance($appInstance);
+		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
 
 		// Transfer application data
-		$templateInstance->assignApplicationData($appInstance);
+		$templateInstance->assignApplicationData($applicationInstance);
 
 		// Load the master template
-		$masterTemplate = $appInstance->buildMasterTemplateName();
+		$masterTemplate = $applicationInstance->buildMasterTemplateName();
 
 		// Load header template
 		$templateInstance->loadCodeTemplate('header');
@@ -98,7 +98,13 @@ class WebStatusCommand extends BaseCommand implements Commandable {
 
 		// Construct the menu in every command. We could do this in BaseCommand class. But this means
 		// *every* command has a navigation system and that is want we don't want.
-		$menuInstance = ObjectFactory::createObjectByConfiguredName('status_menu_class', array($appInstance));
+		$menuInstance = ObjectFactory::createObjectByConfiguredName('status_menu_class', array($applicationInstance));
+
+		// Render the menu
+		$menuInstance->renderMenu();
+
+		// Transfer it to the template engine instance
+		$menuInstance->transferContentToTemplateEngine($templateInstance);
 
 		// ... and all variables. This should be merged together in a pattern
 		// to make things easier. A cache mechanism should be added between