From 00452fe541293ef142eaff92eec49598b2a22774 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 Sep 2009 21:59:31 +0000
Subject: [PATCH] Generic menu XML added, XML nodes rewritten: - XML for
 generic menu entries added which extends base_menu.xml - Deprecated 'design'
 node removed - attribute 'href' removed, 'link' added to 'anchor' node - The
 deprecated 'href' attribute is now enclosed in a CDATA

---
 .gitattributes                                |  1 +
 .../ship-simu/templates/de/menu/base_menu.xml | 19 ++++++--------
 .../de/menu/generic_menu_entries.xml          | 25 +++++++++++++++++++
 3 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 application/ship-simu/templates/de/menu/generic_menu_entries.xml

diff --git a/.gitattributes b/.gitattributes
index 08601a2..7674425 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -254,6 +254,7 @@ application/ship-simu/templates/de/image/code_captcha.img -text
 application/ship-simu/templates/de/image/emergency_exit.img -text
 application/ship-simu/templates/de/menu/.htaccess -text
 application/ship-simu/templates/de/menu/base_menu.xml -text
+application/ship-simu/templates/de/menu/generic_menu_entries.xml -text
 /clear-cache.sh -text
 db/.htaccess -text
 db/company/.htaccess -text
diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml
index 5eb5c1e..678703a 100644
--- a/application/ship-simu/templates/de/menu/base_menu.xml
+++ b/application/ship-simu/templates/de/menu/base_menu.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <menu>
 	<header>
-		<title>
+		<title class="{!menu_title_class">
 			{?menu_title?}
 		</title>
 	</header>
 	<entries>
 		<entry id="{?entry_id?}">
-			<anchor id="{?anchor_id?}" href="{?anchor_href?}" target="{?anchor_target?}" rel="{?anchor_rel?}" title="{?anchor_title?}">
-				{?anchor_link_text?}
+			<anchor id="{?anchor_id?}" link="{?anchor_link?}" title="{?anchor_title?}" target="{?anchor_target?}" rel="{?anchor_rel?}">
+				<![CDATA[index.php?app={?short_app_name?}&amp;page=]]>
 			</anchor>
-			<design class="{?entry_design_class?}">
-				{?entry_design_text?}
-			</design>
 		</entry>
+		<advert id="{?advert_id?}">
+			<![CDATA[{?advert_code?}]]>
+		</advert>
 	</entries>
-	<footer>
-		<text>
+	<footer id="{!footer_id?}">
+		<text class="{?footer_design_class?}">
 			{?footer_text?}
 		</text>
-		<design class="{?footer_design_class?}">
-			{?footer_design_text?}
-		</design>
 	</footer>
 </menu>
diff --git a/application/ship-simu/templates/de/menu/generic_menu_entries.xml b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
new file mode 100644
index 0000000..8994b38
--- /dev/null
+++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<entries extends="base_menu">
+	<entry id="home">
+		<anchor id="menu_home" link="Home" title="Home">
+			<![CDATA[index.php?app={!app_short_name!}]]>
+		</anchor>
+	</entry>
+	<entry id="login">
+		<anchor id="menu_login" link="Einloggen" title="Zum Spiel {?app_name?} einloggen">
+			<![CDATA[index.php?app={!app_short_name!}&amp;page=login]]>
+		</anchor>
+	</entry>
+	<entry id="register">
+		<anchor id="menu_register" link="Home" title="Zur Anmeldeseite">
+			<![CDATA[index.php?app={!app_short_name!}&amp;page=register]]>
+		</anchor>
+	</entry>
+	<!--
+	<entry id="">
+		<anchor id="menu_" link="" title="" target="" rel="">
+			<![CDATA[index.php?app={!app_short_name!}&amp;page=]]>
+		</anchor>
+	</entry>
+	//-->
+</entries>
-- 
2.30.2