From 5f54a4cb745e0e71c942876571877fe421f4dd10 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 Dec 2009 11:55:39 +0000
Subject: [PATCH] Menu XML rewritten to not have attributes

---
 .../ship-simu/templates/de/menu/base_menu.xml | 34 ++++++----
 .../de/menu/generic_menu_entries.xml          | 64 +++++++++++--------
 2 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml
index 1f1ce73..150484e 100644
--- a/application/ship-simu/templates/de/menu/base_menu.xml
+++ b/application/ship-simu/templates/de/menu/base_menu.xml
@@ -24,19 +24,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <menu>
 	<block-list>
 		<block>
-			<header>
-				<title id="{?menu_title_id?}" class="{!menu_title_class?}">
-					{?menu_title?}
+			<block-header>
+				<title>
+					<title-id>{?menu_title_id?}</title-id>
+					<title-class>{!menu_title_class?}</title-class>
+					<title-text>{?menu_title?}</title-text>
 				</title>
-			</header>
-			<entries-content>
-				{?menu_entry-list?}
-			</entries-content>
-			<footer id="{!footer_id?}">
-				<text class="{?footer_design_class?}">
-					{?menu_footer?}
-				</text>
-			</footer>
+			</block-header>
+			<entry-list>
+				<entry>
+					<entry-id>{?entry_id?}</entry-id>
+					<anchor>
+						<anchor-id>{?anchor_id?}</anchor-id>
+						<anchor-text>{?anchor_text?}</anchor-text>
+						<anchor-title>{?anchor_title?}</anchor-title>
+						<anchor-href>{?anchor_href?}</anchor-href>
+					</anchor>
+				</entry>
+			</entry-list>
+			<block-footer>
+				<footer-id>{!footer_id?}</footer>
+				<footer-class>{?footer_design_class?}</footer-class>
+				<footer-text>{?menu_footer?}</footer-text>
+			</block-footer>
 		</block>
 	</block-list>
 </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
index ea41ef5..be74a9d 100644
--- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml
+++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
@@ -24,21 +24,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <menu>
 	<block-list>
 		<block>
-			<header>
-				<title id="home" class="menu_title_home">
-					<![CDATA[Home:]]>
+			<block-header>
+				<title>
+					<title-id><![CDATA[home_menu_title]]></title-id>
+					<title-class><![CDATA[menu_title]]></title-class>
+					<title-text><![CDATA[Home:]]></title-text>
 				</title>
-			</header>
+			</block-header>
 			<entry-list>
-				<entry id="home">
+				<entry>
+					<entry-id><![CDATA[home]]></entry-id>
 					<anchor>
-						<anchor-id><![CDATA[menu_home:]]></anchor-id>
-						<anchor-text><![CDATA[Home:]]></anchor-text>
-						<anchor-title><![CDATA[Zur Startseite:]]></anchor-title>
+						<anchor-id><![CDATA[menu_home]]></anchor-id>
+						<anchor-text><![CDATA[Home]]></anchor-text>
+						<anchor-title><![CDATA[Zur Startseite]]></anchor-title>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}]]></anchor-href>
 					</anchor>
 				</entry>
-				<entry id="login">
+				<entry>
+					<entry-id><![CDATA[login]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_login]]></anchor-id>
 						<anchor-text><![CDATA[Einloggen]]></anchor-text>
@@ -46,7 +50,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=login]]></anchor-href>
 					</anchor>
 				</entry>
-				<entry id="register">
+				<entry>
+					<entry-id><![CDATA[register]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_register]]></anchor-id>
 						<anchor-text><![CDATA[Anmeldung]]></anchor-text>
@@ -54,7 +59,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=register]]></anchor-href>
 					</anchor>
 				</entry>
-				<entry id="pillory">
+				<entry>
+					<entry-id><![CDATA[pillory]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_pillory]]></anchor-id>
 						<anchor-text><![CDATA[Pranger]]></anchor-text>
@@ -63,20 +69,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					</anchor>
 				</entry>
 			</entry-list>
-			<footer id="home_menu_footer">
-				<text class="menu_footer">
-					<![CDATA[Leer]]>
-				</text>
-			</footer>
+			<block-footer>
+				<footer-id><![CDATA[home_menu_footer]]></footer-id>
+				<footer-class><![CDATA[menu_footer]]></footer-class>
+				<footer-text><![CDATA[Leer]]></footer-text>
+			</block-footer>
 		</block>
 		<block>
-			<header>
-				<title id="law" class="menu_title_law">
-					<![CDATA[Rechtliches:]]>
+			<block-header>
+				<title>
+					<title-id><![CDATA[law_menu_title]]></title-id>
+					<title-class><![CDATA[menu_title]]></title-class>
+					<title-text><![CDATA[Rechtliches:]]></title-text>
 				</title>
-			</header>
+			</block-header>
 			<entry-list>
-				<entry id="imprint">
+				<entry>
+					<entry-id><![CDATA[imprint]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_imprint]]></anchor-id>
 						<anchor-text><![CDATA[Impressum]]></anchor-text>
@@ -84,7 +93,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<anchor-href><![CDATA[index.php?app={?app_short_name?}&amp;page=imprint]]></anchor-href>
 					</anchor>
 				</entry>
-				<entry id="terms">
+				<entry>
+					<entry-id><![CDATA[terms]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_terms]]></anchor-id>
 						<anchor-text><![CDATA[ANBs]]></anchor-text>
@@ -93,11 +103,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					</anchor>
 				</entry>
 			</entry-list>
-			<footer id="law_menu_footer">
-				<text class="menu_footer">
-					<![CDATA[Leer]]>
-				</text>
-			</footer>
+			<block-footer>
+				<footer-id><![CDATA[law_menu_footer]]></footer-id>
+				<footer-class><![CDATA[menu_footer]]></footer-class>
+				<footer-text><![CDATA[Leer]]></footer-text>
+			</block-footer>
 		</block>
 	</block-list>
 </menu>
-- 
2.39.2