From 4109d26e0d3c6e858840169aba06c2828dbd0abf Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 14 May 2015 11:43:10 +0200 Subject: [PATCH] Renamed 'content' to 'main_content' + updated 'core'. Signed-off-by: Roland Haeder --- .../web/government/class_WebGovernmentFailedStartupCommand.php | 2 +- .../web/government/class_WebGovernmentFailedTrainingCommand.php | 2 +- application/shipsimu/templates/de/code/shipsimu_main.ctp | 2 +- core | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php index e720850..54ddb05 100644 --- 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(); - $templateInstance->assignTemplateWithVariable('government_failed_main', 'content'); + $templateInstance->assignTemplateWithVariable('government_failed_main', 'main_content'); // 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 fe8fc08..7119196 100644 --- 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(); - $templateInstance->assignTemplateWithVariable('government_failed_main', 'content'); + $templateInstance->assignTemplateWithVariable('government_failed_main', 'main_content'); // 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 3dd1296..44cbb38 100644 --- a/application/shipsimu/templates/de/code/shipsimu_main.ctp +++ b/application/shipsimu/templates/de/code/shipsimu_main.ctp @@ -17,7 +17,7 @@
- {?content?} + {?main_content?}