Logout procedure basicly finished, login area splitted in main and action-dependent...

[shipsimu.git] / inc / classes / main / commands / web / class_WebLoginAreaCommand.php

diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index 9908233fe20c68c4bd98d57e47c4bb98c18a6916..ac26849836c375393d5161fe223512a607b89242 100644 (file)
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -32,7 +32,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                parent::__construct(__CLASS__);
 
                // Set special description
-               $this->setObjectDescription("Command for the "home" page");
+               $this->setObjectDescription("Command for the "login area" page");
 
                // Create unique ID number
                $this->generateUniqueId();
@@ -128,13 +128,22 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($action);
 
                // Assign the template with the master template as a content ... ;)
-               $templateInstance->assignTemplateWithVariable($action, "content");
+               $templateInstance->assignTemplateWithVariable($action, "login_content");
+
+               // Load main template
+               $templateInstance->loadCodeTemplate("login_main");
+
+               // Assign the main template with the master template as a content ... ;)
+               $templateInstance->assignTemplateWithVariable("login_main", "content");
 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage("login_{$action}_title"));
+               $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage($action."_title"));
+
+               // Assign base URL
+               $templateInstance->assignConfigVariable('base_url');
 
                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between