CSS classes formed to ids and command LocalHome finished

diff --git a/Doxyfile b/Doxyfile
index 0312e4b118b8a41bd902f6763171f015668cdfd2..ea284c5b2cb4bb0149e28217d3e7471305d75914 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1282,7 +1282,7 @@ DOT_GRAPH_MAX_NODES    = 50
 # code bases. Also note that the size of a graph can be further restricted by 
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
-MAX_DOT_GRAPH_DEPTH    = 0
+MAX_DOT_GRAPH_DEPTH    = 1000
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
 # background. This is disabled by default, which results in a white background. 

diff --git a/application/selector/templates/de/code/selector_main.ctp b/application/selector/templates/de/code/selector_main.ctp
index a834a9bb6bef5b33a904cbec869c41be9d4014cc..ff75745e89baf8cab5ad457066b666cdb5d1d98f 100644 (file)
--- a/application/selector/templates/de/code/selector_main.ctp
+++ b/application/selector/templates/de/code/selector_main.ctp
@@ -1,15 +1,15 @@
 <!-- A compileable template for the application selector //-->
 
-{?header:title=[--WELCOME_APPLICATION_SELECTOR--]?}
+{?header:title=[WELCOME_APPLICATION_SELECTOR]?}
 
 {?navigation:nav_row=home;imprint;contact?}
 
-<div class="selector_header">
-       [--HEADER_APPLICATION_SELECTOR--]
+<div id="main_header">
+       [HEADER_APPLICATION_SELECTOR]
 </div>
 
-<div class="selector_list_apps">
+<div id="main_content">
        {?selector_apps?}
 </div>
 
-{?footer_msg:footer_msg=[--FOOTER_APPLICATION_SELECTOR--]?}
+{?footer_msg:footer_msg=[FOOTER_APPLICATION_SELECTOR]?}

diff --git a/application/ship-simu/templates/de/code/shipsimu_main.ctp b/application/ship-simu/templates/de/code/shipsimu_main.ctp
index 12429ffe425ba041f993ac69bde85a378394ca90..7e0010844e9ecee03153fe7dd2af1ecaa182db0d 100644 (file)
--- a/application/ship-simu/templates/de/code/shipsimu_main.ctp
+++ b/application/ship-simu/templates/de/code/shipsimu_main.ctp
@@ -1,19 +1,21 @@
 <!-- The compileable main template for the ship simulator //-->
 
-{?header:title=[--WELCOME_SHIP_SIMU--]?}
+{?header:title=[WELCOME_SHIP_SIMU]?}
 
+<div id="navigation">
 {?navigation:nav_row=home;imprint;contact?}
+</div>
 
-<div class="shipsimu_header">
-       [--HEADER_SHIP_SIMU--]
+<div id="main_header">
+       [HEADER_SHIP_SIMU]
 </div>
 
-<div class="shipsimu_content">
+<div id="main_content">
        {?content?}
 </div>
 
-<div class="shipsimu_content">
-       [--FOOTER_SHIP_SIMU--]
+<div id="main_footer">
+       [FOOTER_SHIP_SIMU]
 </div>
 
-{?footer_msg:footer_msg=[--FOOTER_SHIP_SIMU--]?}
+{?footer_msg:footer_msg=[FOOTER_SHIP_SIMU]?}

diff --git a/application/ship-simu/templates/de/html/home.tpl b/application/ship-simu/templates/de/html/home.tpl
index 6845ef1ab7f73e67c5432804d89023544a6dfd3f..2523adf1bc34f77e732818f5d6c771da291ae575 100644 (file)
--- a/application/ship-simu/templates/de/html/home.tpl
+++ b/application/ship-simu/templates/de/html/home.tpl
@@ -1,9 +1,9 @@
-<div class="home_content">
-       <div class="content_header">
+<div id="home_content">
+       <div id="content_header">
                Willkommen zum Schiffsimulator &quot;Ship-Simu&quot;!
        </div>
 
-       <div class="news_frame">
+       <div id="news_frame">
                {?ship_simu_news?}
        </div>
 </div>

diff --git a/application/ship-simu/templates/de/html/selector_ship-simu.tpl b/application/ship-simu/templates/de/html/selector_ship-simu.tpl
index d56a95f63ea87bc555f40a1008d8d1f8b5011a5f..b96640ecc44c0177688c055e71c41bcb73795819 100644 (file)
--- a/application/ship-simu/templates/de/html/selector_ship-simu.tpl
+++ b/application/ship-simu/templates/de/html/selector_ship-simu.tpl
@@ -1,4 +1,4 @@
-<div class="selector_content">
+<div id="selector_content">
        <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
                Gr&uuml;nden Sie eine virtuelle Reederei an den bedeutestens
                Welth&auml;fen! Oder treten Sie einer Reederei als Angestellter bei und

diff --git a/inc/classes/main/commands/local/class_LocalHomeCommand.php b/inc/classes/main/commands/local/class_LocalHomeCommand.php
index 02f0928f844b7e9e7376d59e6437b0330337ceda..24ef746cf96f7a79e7d79f4d9ec94b510526cd9b 100644 (file)
--- a/inc/classes/main/commands/local/class_LocalHomeCommand.php
+++ b/inc/classes/main/commands/local/class_LocalHomeCommand.php
@@ -94,7 +94,9 @@ class LocalHomeCommand extends BaseCommand implements Commandable {
                // to make things easier. A cache mechanism should be added between
                // these two calls to cache compiled templates.
                $templateInstance->compileVariables();
-               die("<pre>".print_r($templateInstance, true)."</pre>");
+
+               // Get the content back from the template engine and put it in the response class
+               $templateInstance->transferToResponse($responseInstance);
        }
 }
 

diff --git a/inc/classes/main/template/class_TemplateEngine.php b/inc/classes/main/template/class_TemplateEngine.php
index 20984c2fe181ddb40b6f309525060fc04aaec9b2..980f56c9426b1e6eab6b451a96240bf46f41f59c 100644 (file)
--- a/inc/classes/main/template/class_TemplateEngine.php
+++ b/inc/classes/main/template/class_TemplateEngine.php
@@ -1106,6 +1106,17 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                // Purge raw content
                $this->setRawTemplateData("");
        }
+
+       /**
+        * Transfers the content of this template engine to a given response instance
+        *
+        * @param       $responseInstance       An instance of a response class
+        * @return      void
+        */
+       public function transferToResponse (Responseable $responseInstance) {
+               // Get the content and set it in the response class
+               $responseInstance->writeToBody($this->getCompiledData());
+       }
 }
 
 // [EOF]