Stub calles added, instance variable renamed

diff --git a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
index 31d56b3d8d16842b8d0ff3a846daaebf3652b15f..753edcda69a592ae3c47e5d63a48eac1a067a5fe 100644 (file)
--- a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
+++ b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
@@ -114,6 +114,12 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab
                // *every* command has a navigation system and that is want we don't want.
                $menuInstance = ObjectFactory::createObjectByConfiguredName('government_failed_area_menu_class', array($appInstance));
 
                // *every* command has a navigation system and that is want we don't want.
                $menuInstance = ObjectFactory::createObjectByConfiguredName('government_failed_area_menu_class', array($appInstance));
 

+               // Render the menu
+               $menuInstance->renderMenu();
+
+               // Transfer it to the template engine instance
+               $menuInstance->transferToTemplateEngine();
+

                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between
                // these two calls to cache compiled templates.
                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between
                // these two calls to cache compiled templates.

diff --git a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
index 89420676fee120d928e4b3368eeb41429f4869b7..1feecb10e8ca4f2c25d4decd093289fa768f3d47 100644 (file)
--- a/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
+++ b/application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
@@ -114,6 +114,12 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
                // *every* command has a navigation system and that is want we don't want.
                $menuInstance = ObjectFactory::createObjectByConfiguredName('government_failed_area_menu_class', array($appInstance));
 
                // *every* command has a navigation system and that is want we don't want.
                $menuInstance = ObjectFactory::createObjectByConfiguredName('government_failed_area_menu_class', array($appInstance));
 

+               // Render the menu
+               $menuInstance->renderMenu();
+
+               // Transfer it to the template engine instance
+               $menuInstance->transferToTemplateEngine();
+

                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between
                // these two calls to cache compiled templates.
                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between
                // these two calls to cache compiled templates.

diff --git a/index.php b/index.php
index f717dd4fabf5277770af16eee9cb5ded8b80ae7e..d534a4796c15b1caa2032c8049de745f0758ff6a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -87,13 +87,13 @@ final class ApplicationEntryPoint {
 
                // Get some instances
                $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
 
                // Get some instances
                $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');

-               $lang = LanguageSystem::getInstance();
+               $languageInstance = LanguageSystem::getInstance();

 
                // Get response instance
                $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
                // Is the template engine loaded?
 
                // Get response instance
                $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
                // Is the template engine loaded?

-               if ((class_exists($tpl)) && (is_object($lang))) {
+               if ((class_exists($tpl)) && (is_object($languageInstance))) {

                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory


@@ -133,7 +133,7 @@ final class ApplicationEntryPoint {
                        $templateInstance->assignVariable('backtrace', $backtrace);
                        $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
                        $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
                        $templateInstance->assignVariable('backtrace', $backtrace);
                        $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
                        $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());

-                       $templateInstance->assignVariable('title', $lang->getMessage('emergency_exit_title'));
+                       $templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));

 
                        // Load the template
                        $templateInstance->loadCodeTemplate('emergency_exit');
 
                        // Load the template
                        $templateInstance->loadCodeTemplate('emergency_exit');