Renamed 'content' to 'main_content' + updated 'core'.
authorRoland Haeder <roland@mxchange.org>
Thu, 14 May 2015 09:43:10 +0000 (11:43 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 14 May 2015 09:43:10 +0000 (11:43 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
application/shipsimu/templates/de/code/shipsimu_main.ctp
core

index e720850..54ddb05 100644 (file)
@@ -102,7 +102,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab
 
                // 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);
index fe8fc08..7119196 100644 (file)
@@ -102,7 +102,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
 
                // 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);
index 3dd1296..44cbb38 100644 (file)
@@ -17,7 +17,7 @@
 </div>
 
 <div id="main_content">
-       {?content?}
+       {?main_content?}
 </div>
 
 <div id="main_footer">
diff --git a/core b/core
index f1483fb..a578894 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f1483fbeae4881d349f9b9558340d1d56b0aab78
+Subproject commit a57889486c1cbc1a24f5926a02a80d319ed88a86