From 363af5d51040c7abb8d6a0f31882a57eacf4a930 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 20 Apr 2008 20:28:50 +0000 Subject: [PATCH] CSS classes formed to ids and command LocalHome finished --- Doxyfile | 2 +- .../selector/templates/de/code/selector_main.ctp | 10 +++++----- .../templates/de/code/shipsimu_main.ctp | 16 +++++++++------- application/ship-simu/templates/de/html/home.tpl | 6 +++--- .../templates/de/html/selector_ship-simu.tpl | 2 +- .../commands/local/class_LocalHomeCommand.php | 4 +++- .../main/template/class_TemplateEngine.php | 11 +++++++++++ 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Doxyfile b/Doxyfile index 0312e4b..ea284c5 100644 --- 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 a834a9b..ff75745 100644 --- a/application/selector/templates/de/code/selector_main.ctp +++ b/application/selector/templates/de/code/selector_main.ctp @@ -1,15 +1,15 @@ -{?header:title=[--WELCOME_APPLICATION_SELECTOR--]?} +{?header:title=[WELCOME_APPLICATION_SELECTOR]?} {?navigation:nav_row=home;imprint;contact?} -
- [--HEADER_APPLICATION_SELECTOR--] +
+ [HEADER_APPLICATION_SELECTOR]
-
+
{?selector_apps?}
-{?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 12429ff..7e00108 100644 --- a/application/ship-simu/templates/de/code/shipsimu_main.ctp +++ b/application/ship-simu/templates/de/code/shipsimu_main.ctp @@ -1,19 +1,21 @@ -{?header:title=[--WELCOME_SHIP_SIMU--]?} +{?header:title=[WELCOME_SHIP_SIMU]?} + -
- [--HEADER_SHIP_SIMU--] +
+ [HEADER_SHIP_SIMU]
-
+
{?content?}
-
- [--FOOTER_SHIP_SIMU--] + -{?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 6845ef1..2523adf 100644 --- a/application/ship-simu/templates/de/html/home.tpl +++ b/application/ship-simu/templates/de/html/home.tpl @@ -1,9 +1,9 @@ -
-
+
+
Willkommen zum Schiffsimulator "Ship-Simu"!
-
+
{?ship_simu_news?}
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 d56a95f..b96640e 100644 --- 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 @@ -
+
Gründen Sie eine virtuelle Reederei an den bedeutestens Welthä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 02f0928..24ef746 100644 --- 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("
".print_r($templateInstance, true)."
"); + + // 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 20984c2..980f56c 100644 --- 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] -- 2.39.2