Renamed 'content' to 'main_content' + updated 'core'.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
index e7208505201385f654adfb636eb26004421a7602..54ddb058ffaab1cd8c8f960bbee5ee2ad9cec19d 100644 (file)
--- a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
+++ b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
@@ -102,7 +102,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab
 
                // Assign the main template with the master template as a content ... ;)
                $templateInstance->compileTemplate();
 
                // Assign the main template with the master template as a content ... ;)
                $templateInstance->compileTemplate();

-               $templateInstance->assignTemplateWithVariable('government_failed_main', 'content');
+               $templateInstance->assignTemplateWithVariable('government_failed_main', 'main_content');

 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);

diff --git a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
index fe8fc080edec587f34e4b61a77295ee32a0e56fd..7119196973b2921e1ba37220bcdbcd5540f32f80 100644 (file)
--- a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
+++ b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
@@ -102,7 +102,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
 
                // Assign the main template with the master template as a content ... ;)
                $templateInstance->compileTemplate();
 
                // Assign the main template with the master template as a content ... ;)
                $templateInstance->compileTemplate();

-               $templateInstance->assignTemplateWithVariable('government_failed_main', 'content');
+               $templateInstance->assignTemplateWithVariable('government_failed_main', 'main_content');

 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);

diff --git a/application/shipsimu/templates/de/code/shipsimu_main.ctp b/application/shipsimu/templates/de/code/shipsimu_main.ctp
index 3dd12965b4c710abb90a06ff98d3e7feebe9becf..44cbb38561fced709f4ba4e3b65d74f09af01270 100644 (file)
--- a/application/shipsimu/templates/de/code/shipsimu_main.ctp
+++ b/application/shipsimu/templates/de/code/shipsimu_main.ctp
@@ -17,7 +17,7 @@
 </div>
 
 <div id="main_content">
 </div>
 
 <div id="main_content">

-       {?content?}
+       {?main_content?}

 </div>
 
 <div id="main_footer">
 </div>
 
 <div id="main_footer">

diff --git a/core b/core
index f1483fbeae4881d349f9b9558340d1d56b0aab78..a57889486c1cbc1a24f5926a02a80d319ed88a86 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f1483fbeae4881d349f9b9558340d1d56b0aab78
+Subproject commit a57889486c1cbc1a24f5926a02a80d319ed88a86