From: Roland Haeder Date: Sun, 5 Apr 2015 20:25:50 +0000 (+0200) Subject: Continued simulation: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b16ed56a0bb7381836bcbd96957df5520cbb50a5;p=city.git 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 --- diff --git a/application/city/main/commands/html/class_CityHtmlHomeCommand.php b/application/city/main/commands/html/class_CityHtmlHomeCommand.php index 1e80dbf..de1ad29 100644 --- 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 142c1dc..70c12a7 100644 --- a/application/city/templates/de/code/city_main.ctp +++ b/application/city/templates/de/code/city_main.ctp @@ -1,3 +1,21 @@ -
- Bla bla ... +{?header?} + +
+ + +
+ {?city_header?} +
+ +
+ {?main_content?} +
+ +
+ +{?footer?} diff --git a/application/city/templates/de/code/header.ctp b/application/city/templates/de/code/header.ctp index ed67731..6f2518f 100644 --- a/application/city/templates/de/code/header.ctp +++ b/application/city/templates/de/code/header.ctp @@ -5,11 +5,11 @@ {?app_full_name?} - {?title?} - - - + + + - + diff --git a/application/city/templates/de/code/menu_block.ctp b/application/city/templates/de/code/menu_block.ctp new file mode 100644 index 0000000..454ccf1 --- /dev/null +++ b/application/city/templates/de/code/menu_block.ctp @@ -0,0 +1,11 @@ +
+ {?title_text?} +
+ +
    +{?block_content?} +
+ +
+ {?footer_text?} +
diff --git a/application/city/templates/de/code/menu_entry.ctp b/application/city/templates/de/code/menu_entry.ctp new file mode 100644 index 0000000..e30bd8c --- /dev/null +++ b/application/city/templates/de/code/menu_entry.ctp @@ -0,0 +1,3 @@ +
  • + {?anchor_text?} +
  • diff --git a/application/city/templates/de/html/.htaccess b/application/city/templates/de/html/.htaccess new file mode 100644 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 69e1588..7badfcb 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 69e15880c80ca131c7ddde022366d4198d0fce4c +Subproject commit 7badfcb82a1ba6c5f547ac031ef33e8bf2bd8ede