From 10ff7e023cc73d738b712ec7a5aeede1309d59cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 28 Jun 2008 16:41:58 +0000 Subject: [PATCH 1/1] All actions now have a prefix 'action_' --- .gitattributes | 8 ++++---- .../de/code/{login_logout.ctp => action_login_logout.ctp} | 0 .../code/{login_profile.ctp => action_login_profile.ctp} | 0 ...status_problem.ctp => action_login_status_problem.ctp} | 0 .../code/{login_welcome.ctp => action_login_welcome.ctp} | 0 .../main/commands/web/class_WebLoginAreaCommand.php | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename application/ship-simu/templates/de/code/{login_logout.ctp => action_login_logout.ctp} (100%) rename application/ship-simu/templates/de/code/{login_profile.ctp => action_login_profile.ctp} (100%) rename application/ship-simu/templates/de/code/{login_status_problem.ctp => action_login_status_problem.ctp} (100%) rename application/ship-simu/templates/de/code/{login_welcome.ctp => action_login_welcome.ctp} (100%) diff --git a/.gitattributes b/.gitattributes index ba30777..06875a8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -136,6 +136,10 @@ application/ship-simu/main/wrapper/class_CompanyDatabaseWrapper.php -text application/ship-simu/starter.php -text application/ship-simu/templates/.htaccess -text application/ship-simu/templates/de/.htaccess -text +application/ship-simu/templates/de/code/action_login_logout.ctp -text +application/ship-simu/templates/de/code/action_login_profile.ctp -text +application/ship-simu/templates/de/code/action_login_status_problem.ctp -text +application/ship-simu/templates/de/code/action_login_welcome.ctp -text application/ship-simu/templates/de/code/block_company_data.ctp -text application/ship-simu/templates/de/code/block_persona_data.ctp -text application/ship-simu/templates/de/code/captch_graphic_code.ctp -text @@ -144,11 +148,7 @@ application/ship-simu/templates/de/code/header.ctp -text application/ship-simu/templates/de/code/home.ctp -text application/ship-simu/templates/de/code/login_failed.ctp -text application/ship-simu/templates/de/code/login_form.ctp -text -application/ship-simu/templates/de/code/login_logout.ctp -text application/ship-simu/templates/de/code/login_main.ctp -text -application/ship-simu/templates/de/code/login_profile.ctp -text -application/ship-simu/templates/de/code/login_status_problem.ctp -text -application/ship-simu/templates/de/code/login_welcome.ctp -text application/ship-simu/templates/de/code/logout_done.ctp -text application/ship-simu/templates/de/code/register_form.ctp -text application/ship-simu/templates/de/code/shipsimu_main.ctp -text diff --git a/application/ship-simu/templates/de/code/login_logout.ctp b/application/ship-simu/templates/de/code/action_login_logout.ctp similarity index 100% rename from application/ship-simu/templates/de/code/login_logout.ctp rename to application/ship-simu/templates/de/code/action_login_logout.ctp diff --git a/application/ship-simu/templates/de/code/login_profile.ctp b/application/ship-simu/templates/de/code/action_login_profile.ctp similarity index 100% rename from application/ship-simu/templates/de/code/login_profile.ctp rename to application/ship-simu/templates/de/code/action_login_profile.ctp diff --git a/application/ship-simu/templates/de/code/login_status_problem.ctp b/application/ship-simu/templates/de/code/action_login_status_problem.ctp similarity index 100% rename from application/ship-simu/templates/de/code/login_status_problem.ctp rename to application/ship-simu/templates/de/code/action_login_status_problem.ctp diff --git a/application/ship-simu/templates/de/code/login_welcome.ctp b/application/ship-simu/templates/de/code/action_login_welcome.ctp similarity index 100% rename from application/ship-simu/templates/de/code/login_welcome.ctp rename to application/ship-simu/templates/de/code/action_login_welcome.ctp diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php index a9d37b2..a841273 100644 --- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php +++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php @@ -122,11 +122,11 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable { $templateInstance->assignTemplateWithVariable('footer', 'footer'); // Load the matching template - $templateInstance->loadCodeTemplate($this->actionName); + $templateInstance->loadCodeTemplate('action_' . $this->actionName); // Assign the template with the master template as a content ... ;) $templateInstance->compileTemplate(); - $templateInstance->assignTemplateWithVariable($this->actionName, "login_content"); + $templateInstance->assignTemplateWithVariable('action_' . $this->actionName, 'login_content'); // Load main template $templateInstance->loadCodeTemplate('login_main'); -- 2.30.2