From ef8be83e0a0dd6cefcf79622c22237fe41092615 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 7 Apr 2015 21:02:45 +0200 Subject: [PATCH] Renamed some menu points: - Terms & Conditions is to much here, better use "Game rules" for it - Added missing template for emergency exit (when something horrible went wrong) - Updated 'core' to latest commit Signed-off-by: Roland Haeder --- .../city/templates/de/code/emergency_exit.ctp | 29 ++++++++++++++ .../de/menu/generic_menu_entries.xml | 4 +- .../de/menu/login_area_menu_entries.xml | 38 +++++++++---------- core | 2 +- 4 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 application/city/templates/de/code/emergency_exit.ctp diff --git a/application/city/templates/de/code/emergency_exit.ctp b/application/city/templates/de/code/emergency_exit.ctp new file mode 100644 index 0000000..e974daf --- /dev/null +++ b/application/city/templates/de/code/emergency_exit.ctp @@ -0,0 +1,29 @@ +{?header:title="Problem in application framework detected!"?} + +
+ $content[message] +
+ +
+
+ File inclusion backtrace: +
+
+ $content[backtrace] +
+
+ +
+
+ Statistics +
+
+ Total objects: $content[total_objects] +
+
+ Loaded class files: $content[total_includes] + (Including exception and interfaces.) +
+
+ +{?footer_msg:footer_msg="Please contact the support and supply the full above message, if you think you are not qualified to fix this problem."?} diff --git a/application/city/templates/de/menu/generic_menu_entries.xml b/application/city/templates/de/menu/generic_menu_entries.xml index c25abc0..e048d51 100644 --- a/application/city/templates/de/menu/generic_menu_entries.xml +++ b/application/city/templates/de/menu/generic_menu_entries.xml @@ -106,8 +106,8 @@ along with this program. If not, see - - + + diff --git a/application/city/templates/de/menu/login_area_menu_entries.xml b/application/city/templates/de/menu/login_area_menu_entries.xml index 9c3a6ee..c93c2e5 100644 --- a/application/city/templates/de/menu/login_area_menu_entries.xml +++ b/application/city/templates/de/menu/login_area_menu_entries.xml @@ -33,23 +33,14 @@ along with this program. If not, see - + - + - + - - - - - - - - - @@ -67,20 +58,29 @@ along with this program. If not, see - + + + + + + + + + + - - - - + + + + - - + + diff --git a/core b/core index e3a4a58..b2f9b3f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit e3a4a5852a945b740513d6ce9eeedc686a1be017 +Subproject commit b2f9b3f98dad63c32b07b891f3e19135398090ad -- 2.39.5