From 1fe479264429e6b921f81dd00964c5233b64459f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 5 Sep 2009 20:04:32 +0000 Subject: [PATCH] A lot menu templates added, XMLs rewritten, TODOs.txt updated --- .gitattributes | 26 ++++++ .../selector/class_ApplicationSelector.php | 4 +- .../templates/de/code/menu_entries_end.ctp | 2 + .../templates/de/code/menu_entries_start.ctp | 2 + .../templates/de/code/menu_entry_home_end.ctp | 2 + .../de/code/menu_entry_home_start.ctp | 2 + .../de/code/menu_entry_imprint_end.ctp | 2 + .../de/code/menu_entry_imprint_start.ctp | 2 + .../de/code/menu_entry_login_end.ctp | 2 + .../de/code/menu_entry_login_start.ctp | 2 + .../de/code/menu_entry_pillory_end.ctp | 2 + .../de/code/menu_entry_pillory_start.ctp | 2 + .../de/code/menu_entry_register_end.ctp | 2 + .../de/code/menu_entry_register_start.ctp | 2 + .../de/code/menu_entry_terms_end.ctp | 2 + .../de/code/menu_entry_terms_start.ctp | 2 + .../templates/de/code/menu_footer_end.ctp | 2 + .../templates/de/code/menu_footer_start.ctp | 2 + .../templates/de/code/menu_global_end.ctp | 2 + .../templates/de/code/menu_global_start.ctp | 2 + .../templates/de/code/menu_header_end.ctp | 2 + .../templates/de/code/menu_header_start.ctp | 2 + .../templates/de/code/menu_text_end.ctp | 2 + .../templates/de/code/menu_text_start.ctp | 2 + .../templates/de/code/menu_title_home_end.ctp | 2 + .../de/code/menu_title_home_start.ctp | 2 + .../templates/de/code/menu_title_law_end.ctp | 2 + .../de/code/menu_title_law_start.ctp | 2 + .../ship-simu/templates/de/menu/base_menu.xml | 17 ++-- .../de/menu/generic_menu_entries.xml | 83 +++++++++++++------ docs/TODOs.txt | 43 +++++----- index.php | 2 +- todo-builder.sh | 10 ++- 33 files changed, 177 insertions(+), 60 deletions(-) create mode 100644 application/ship-simu/templates/de/code/menu_entries_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entries_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_home_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_home_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_login_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_login_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_register_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_register_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_terms_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_entry_terms_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_footer_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_footer_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_global_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_global_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_header_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_header_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_text_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_text_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_title_home_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_title_home_start.ctp create mode 100644 application/ship-simu/templates/de/code/menu_title_law_end.ctp create mode 100644 application/ship-simu/templates/de/code/menu_title_law_start.ctp diff --git a/.gitattributes b/.gitattributes index 7674425..8b128c6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -241,6 +241,32 @@ application/ship-simu/templates/de/code/login_form.ctp -text application/ship-simu/templates/de/code/login_main.ctp -text application/ship-simu/templates/de/code/logout_done.ctp -text application/ship-simu/templates/de/code/mail_debug.ctp -text +application/ship-simu/templates/de/code/menu_entries_end.ctp -text +application/ship-simu/templates/de/code/menu_entries_start.ctp -text +application/ship-simu/templates/de/code/menu_entry_home_end.ctp -text +application/ship-simu/templates/de/code/menu_entry_home_start.ctp -text +application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp -text +application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp -text +application/ship-simu/templates/de/code/menu_entry_login_end.ctp -text +application/ship-simu/templates/de/code/menu_entry_login_start.ctp -text +application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp -text +application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp -text +application/ship-simu/templates/de/code/menu_entry_register_end.ctp -text +application/ship-simu/templates/de/code/menu_entry_register_start.ctp -text +application/ship-simu/templates/de/code/menu_entry_terms_end.ctp -text +application/ship-simu/templates/de/code/menu_entry_terms_start.ctp -text +application/ship-simu/templates/de/code/menu_footer_end.ctp -text +application/ship-simu/templates/de/code/menu_footer_start.ctp -text +application/ship-simu/templates/de/code/menu_global_end.ctp -text +application/ship-simu/templates/de/code/menu_global_start.ctp -text +application/ship-simu/templates/de/code/menu_header_end.ctp -text +application/ship-simu/templates/de/code/menu_header_start.ctp -text +application/ship-simu/templates/de/code/menu_text_end.ctp -text +application/ship-simu/templates/de/code/menu_text_start.ctp -text +application/ship-simu/templates/de/code/menu_title_home_end.ctp -text +application/ship-simu/templates/de/code/menu_title_home_start.ctp -text +application/ship-simu/templates/de/code/menu_title_law_end.ctp -text +application/ship-simu/templates/de/code/menu_title_law_start.ctp -text application/ship-simu/templates/de/code/register_form.ctp -text application/ship-simu/templates/de/code/shipsimu_main.ctp -text application/ship-simu/templates/de/code/status.ctp -text diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 2832f83..ca1f053 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -204,7 +204,7 @@ class ApplicationSelector extends BaseFrameworkSystem { // Remember this template and the application for later usage $this->loadedTemplates->append(array( - 'template_class' => $templateInstance, + 'web_template_class' => $templateInstance, 'app_instance' => $appInstance )); } @@ -270,7 +270,7 @@ class ApplicationSelector extends BaseFrameworkSystem { } elseif (count($curr) != 2) { // Not expected count of entries throw new InvalidArrayCountException(array($this, "curr", count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT); - } elseif (!isset($curr['template_class']) || (!isset($curr['app_instance']))) { + } elseif (!isset($curr['web_template_class']) || (!isset($curr['app_instance']))) { // Expected entries missing throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING); } diff --git a/application/ship-simu/templates/de/code/menu_entries_end.ctp b/application/ship-simu/templates/de/code/menu_entries_end.ctp new file mode 100644 index 0000000..fadc5c8 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entries_end.ctp @@ -0,0 +1,2 @@ + + diff --git a/application/ship-simu/templates/de/code/menu_entries_start.ctp b/application/ship-simu/templates/de/code/menu_entries_start.ctp new file mode 100644 index 0000000..df73178 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entries_start.ctp @@ -0,0 +1,2 @@ + + + diff --git a/application/ship-simu/templates/de/code/menu_entry_home_start.ctp b/application/ship-simu/templates/de/code/menu_entry_home_start.ctp new file mode 100644 index 0000000..248e571 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_home_start.ctp @@ -0,0 +1,2 @@ + +
diff --git a/application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp b/application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp new file mode 100644 index 0000000..e96aec5 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp @@ -0,0 +1,2 @@ +
+ diff --git a/application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp b/application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp new file mode 100644 index 0000000..81a9bf5 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp @@ -0,0 +1,2 @@ + +
diff --git a/application/ship-simu/templates/de/code/menu_entry_login_end.ctp b/application/ship-simu/templates/de/code/menu_entry_login_end.ctp new file mode 100644 index 0000000..84d30c5 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_login_end.ctp @@ -0,0 +1,2 @@ +
+ diff --git a/application/ship-simu/templates/de/code/menu_entry_login_start.ctp b/application/ship-simu/templates/de/code/menu_entry_login_start.ctp new file mode 100644 index 0000000..5f6368b --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_login_start.ctp @@ -0,0 +1,2 @@ + +
diff --git a/application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp b/application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp new file mode 100644 index 0000000..cc297ad --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp @@ -0,0 +1,2 @@ +
+ diff --git a/application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp b/application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp new file mode 100644 index 0000000..0c4c688 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp @@ -0,0 +1,2 @@ + +
diff --git a/application/ship-simu/templates/de/code/menu_entry_register_end.ctp b/application/ship-simu/templates/de/code/menu_entry_register_end.ctp new file mode 100644 index 0000000..90a8e66 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_register_end.ctp @@ -0,0 +1,2 @@ +
+ diff --git a/application/ship-simu/templates/de/code/menu_entry_register_start.ctp b/application/ship-simu/templates/de/code/menu_entry_register_start.ctp new file mode 100644 index 0000000..36e2569 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_register_start.ctp @@ -0,0 +1,2 @@ + +
diff --git a/application/ship-simu/templates/de/code/menu_entry_terms_end.ctp b/application/ship-simu/templates/de/code/menu_entry_terms_end.ctp new file mode 100644 index 0000000..a940440 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_terms_end.ctp @@ -0,0 +1,2 @@ +
+ diff --git a/application/ship-simu/templates/de/code/menu_entry_terms_start.ctp b/application/ship-simu/templates/de/code/menu_entry_terms_start.ctp new file mode 100644 index 0000000..d250b45 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_entry_terms_start.ctp @@ -0,0 +1,2 @@ + +
diff --git a/application/ship-simu/templates/de/code/menu_footer_end.ctp b/application/ship-simu/templates/de/code/menu_footer_end.ctp new file mode 100644 index 0000000..5b0db02 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_footer_end.ctp @@ -0,0 +1,2 @@ +
+ diff --git a/application/ship-simu/templates/de/code/menu_footer_start.ctp b/application/ship-simu/templates/de/code/menu_footer_start.ctp new file mode 100644 index 0000000..b3aa8ba --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_footer_start.ctp @@ -0,0 +1,2 @@ + + + diff --git a/application/ship-simu/templates/de/code/menu_global_start.ctp b/application/ship-simu/templates/de/code/menu_global_start.ctp new file mode 100644 index 0000000..d72c0a5 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_global_start.ctp @@ -0,0 +1,2 @@ + + + diff --git a/application/ship-simu/templates/de/code/menu_header_start.ctp b/application/ship-simu/templates/de/code/menu_header_start.ctp new file mode 100644 index 0000000..a7d6c92 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_header_start.ctp @@ -0,0 +1,2 @@ + + + diff --git a/application/ship-simu/templates/de/code/menu_text_start.ctp b/application/ship-simu/templates/de/code/menu_text_start.ctp new file mode 100644 index 0000000..489e9b9 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_text_start.ctp @@ -0,0 +1,2 @@ + + + diff --git a/application/ship-simu/templates/de/code/menu_title_home_start.ctp b/application/ship-simu/templates/de/code/menu_title_home_start.ctp new file mode 100644 index 0000000..36683a2 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_title_home_start.ctp @@ -0,0 +1,2 @@ + + + diff --git a/application/ship-simu/templates/de/code/menu_title_law_start.ctp b/application/ship-simu/templates/de/code/menu_title_law_start.ctp new file mode 100644 index 0000000..bd10562 --- /dev/null +++ b/application/ship-simu/templates/de/code/menu_title_law_start.ctp @@ -0,0 +1,2 @@ + +