Continued simulation:

- Very early menu blocks finished
- The variable for the actual content is 'main_content'
- Updated 'core' to latest commit

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/city/main/commands/html/class_CityHtmlHomeCommand.php b/application/city/main/commands/html/class_CityHtmlHomeCommand.php
index 1e80dbfb7e57622f788ac66465470100ab544688..de1ad2930dc6d99865737c75ad46eceb3304daf8 100644 (file)
--- a/application/city/main/commands/html/class_CityHtmlHomeCommand.php
+++ b/application/city/main/commands/html/class_CityHtmlHomeCommand.php
@@ -88,7 +88,7 @@ class CityHtmlHomeCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate('home');
 
                // Assign the home template with the master template as a content ... ;)
-               $templateInstance->assignTemplateWithVariable('city_home', 'content');
+               $templateInstance->assignTemplateWithVariable('city_home', 'main_content');
 
                // Load the master template
                $templateInstance->loadCodeTemplate($masterTemplate);
@@ -106,9 +106,11 @@ class CityHtmlHomeCommand extends BaseCommand implements Commandable {
                // Transfer it to the template engine instance
                $menuInstance->transferContentToTemplateEngine($templateInstance);
 
-               // ... and all variables. This should be merged together in a pattern
-               // to make things easier. A cache mechanism should be added between
-               // these two calls to cache compiled templates.
+               /*
+                * ... and all variables. This should be merged together in a pattern
+                * to make things easier. A cache mechanism should be added between
+                * these two calls to cache compiled templates.
+                */
                $templateInstance->compileVariables();
 
                // Get the content back from the template engine and put it in response class

diff --git a/application/city/templates/de/code/city_main.ctp b/application/city/templates/de/code/city_main.ctp
index 142c1dc9bca13b9b3a16b490bdfa154cb8460a1d..70c12a7a4a3e3ae3c997d8202c0f96bf25ceda54 100644 (file)
--- a/application/city/templates/de/code/city_main.ctp
+++ b/application/city/templates/de/code/city_main.ctp
@@ -1,3 +1,21 @@
-<div id="content_main">
-       Bla bla ...
+{?header?}
+
+<div id="master">
+       <div class="menu" id="menu">
+               {?menu_content?}
+       </div>
+
+       <div id="main_header">
+               {?city_header?}
+       </div>
+
+       <div class="main_content" id="main_content">
+               {?main_content?}
+       </div>
+
+       <div id="main_footer">
+               {?city_footer?}
+       </div>
 </div>
+
+{?footer?}

diff --git a/application/city/templates/de/code/header.ctp b/application/city/templates/de/code/header.ctp
index ed67731ff5f947f3fb1b7789f313b6efd0b8dbc2..6f2518ff538e2c09c31c1b4d0169bbdb7e04a735 100644 (file)
--- a/application/city/templates/de/code/header.ctp
+++ b/application/city/templates/de/code/header.ctp
@@ -5,11 +5,11 @@
                {?app_full_name?} - {?title?}
        </title>
 
-       <meta name="author" content="$config[meta_author]" />
-       <meta name="publisher" content="$config[meta_publisher]" />
-       <meta name="keywords" content="$config[meta_keywords]" />
+       <meta name="author" content="{?meta_author?}" />
+       <meta name="publisher" content="{?meta_publisher?}" />
+       <meta name="keywords" content="{?meta_keywords?}" />
        <meta name="robots" content="index,follow" />
-       <meta name="description" content="$config[meta_description]" />
+       <meta name="description" content="{?meta_description?}" />
        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
        <meta http-equiv="content-style-type" content="text/css" />
        <meta http-equiv="content-script-type" content="text/javascript" />

diff --git a/application/city/templates/de/code/menu_block.ctp b/application/city/templates/de/code/menu_block.ctp
new file mode 100644 (file)
index 0000000..454ccf1
--- /dev/null
+++ b/application/city/templates/de/code/menu_block.ctp
@@ -0,0 +1,11 @@
+<div id="{?title_id?}" class="{?title_class?}">
+       {?title_text?}
+</div>
+
+<ul>
+{?block_content?}
+</ul>
+
+<div id="{?footer_id?}" class="{?footer_class?}">
+       {?footer_text?}
+</div>

diff --git a/application/city/templates/de/code/menu_entry.ctp b/application/city/templates/de/code/menu_entry.ctp
new file mode 100644 (file)
index 0000000..e30bd8c
--- /dev/null
+++ b/application/city/templates/de/code/menu_entry.ctp
@@ -0,0 +1,3 @@
+<li id="{?entry_id?}">
+       <a id="{?anchor_id?}" href="{?anchor_href?}" title="{?anchor_title?}">{?anchor_text?}</a>
+</li>

diff --git a/application/city/templates/de/html/.htaccess b/application/city/templates/de/html/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/application/city/templates/de/html/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/core b/core
index 69e15880c80ca131c7ddde022366d4198d0fce4c..7badfcb82a1ba6c5f547ac031ef33e8bf2bd8ede 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 69e15880c80ca131c7ddde022366d4198d0fce4c
+Subproject commit 7badfcb82a1ba6c5f547ac031ef33e8bf2bd8ede