From: Roland Haeder <roland@mxchange.org>
Date: Tue, 7 Apr 2015 19:02:45 +0000 (+0200)
Subject: Renamed some menu points:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef8be83e0a0dd6cefcf79622c22237fe41092615;p=city.git

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 <roland@mxchange.org>
---

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!"?}
+
+<div id="emergency_message">
+	$content[message]
+</div>
+
+<div id="emergency_backtrace">
+	<div id="backtrace_header">
+		File inclusion backtrace:
+	</div>
+	<div id="backtrace_content">
+		$content[backtrace]
+	</div>
+</div>
+
+<div id="stats_box">
+	<div id="stats_header">
+		Statistics
+	</div>
+	<div id="stats_objects">
+		Total objects: $content[total_objects]
+	</div>
+	<div id="stats_includes">
+		Loaded class files: $content[total_includes]
+		<span class="hint">(Including exception and interfaces.)</span>
+	</div>
+</div>
+
+{?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 <http://www.gnu.org/licenses/>
 					<entry-id><![CDATA[terms_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_terms]]></anchor-id>
-						<anchor-text><![CDATA[ANBs]]></anchor-text>
-						<anchor-title><![CDATA[Allgemeine Nutzungsbedingungen (=ANBs)]]></anchor-title>
+						<anchor-text><![CDATA[Spielregeln]]></anchor-text>
+						<anchor-title><![CDATA[Zu den Spielregeln]]></anchor-title>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=terms]]></anchor-href>
 					</anchor>
 				</entry>
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 <http://www.gnu.org/licenses/>
 			</block-header>
 			<entry-list entry-count="{?entry_count?}">
 				<entry>
-					<entry-id><![CDATA[overview_entry]]></entry-id>
+					<entry-id><![CDATA[welcome_entry]]></entry-id>
 					<anchor>
-						<anchor-id><![CDATA[menu_overview]]></anchor-id>
+						<anchor-id><![CDATA[menu_welcome]]></anchor-id>
 						<anchor-text><![CDATA[Home]]></anchor-text>
-						<anchor-title><![CDATA[Zur &Uuml;bersichtsseite]]></anchor-title>
+						<anchor-title><![CDATA[Zur Eingangsseite]]></anchor-title>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=login_area]]></anchor-href>
 					</anchor>
 				</entry>
-				<entry>
-					<entry-id><![CDATA[pillory_entry]]></entry-id>
-					<anchor>
-						<anchor-id><![CDATA[menu_pillory]]></anchor-id>
-						<anchor-text><![CDATA[Pranger]]></anchor-text>
-						<anchor-title><![CDATA[Zum Pranger]]></anchor-title>
-						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=pillory]]></anchor-href>
-					</anchor>
-				</entry>
 			</entry-list>
 			<block-footer>
 				<footer-id><![CDATA[overview_menu_footer]]></footer-id>
@@ -67,20 +58,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			</block-header>
 			<entry-list entry-count="{?entry_count?}">
 				<entry>
-					<entry-id><![CDATA[imprint_entry]]></entry-id>
+					<entry-id><![CDATA[pillory_entry]]></entry-id>
+					<anchor>
+						<anchor-id><![CDATA[menu_pillory]]></anchor-id>
+						<anchor-text><![CDATA[Pranger]]></anchor-text>
+						<anchor-title><![CDATA[Zum Pranger]]></anchor-title>
+						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=pillory]]></anchor-href>
+					</anchor>
+				</entry>
+				<entry>
+					<entry-id><![CDATA[support_entry]]></entry-id>
 					<anchor>
-						<anchor-id><![CDATA[menu_imprint]]></anchor-id>
-						<anchor-text><![CDATA[Impressum]]></anchor-text>
-						<anchor-title><![CDATA[Impressum]]></anchor-title>
-						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=imprint]]></anchor-href>
+						<anchor-id><![CDATA[menu_support]]></anchor-id>
+						<anchor-text><![CDATA[Support]]></anchor-text>
+						<anchor-title><![CDATA[Zum Support Kontakt aufnehmen]]></anchor-title>
+						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=support]]></anchor-href>
 					</anchor>
 				</entry>
 				<entry>
 					<entry-id><![CDATA[terms_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_terms]]></anchor-id>
-						<anchor-text><![CDATA[ANBs]]></anchor-text>
-						<anchor-title><![CDATA[Allgemeine Nutzungsbedingungen (=ANBs)]]></anchor-title>
+						<anchor-text><![CDATA[Spielregeln]]></anchor-text>
+						<anchor-title><![CDATA[Zu den Spielregeln]]></anchor-title>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;command=terms]]></anchor-href>
 					</anchor>
 				</entry>
diff --git a/core b/core
index e3a4a58..b2f9b3f 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit e3a4a5852a945b740513d6ce9eeedc686a1be017
+Subproject commit b2f9b3f98dad63c32b07b891f3e19135398090ad