From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 22 May 2016 18:13:14 +0000 (+0200)
Subject: Adjusted parent page tags
X-Git-Tag: 3.0.0_Beta_1~1668
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=11b5e86655c21ed9109d134edd23d9e8104f986a;p=GitHub%2FWoltLab%2FWCF.git

Adjusted parent page tags
---

diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index 81c60f48f0..11a85b5212 100644
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@ -98,6 +98,7 @@
 			<controller>wcf\form\AvatarEditForm</controller>
 			<name language="de"><![CDATA[Avatar-Verwaltung]]></name>
 			<name language="en"><![CDATA[Avatar Management]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Avatar Management</title>
@@ -106,24 +107,12 @@
 				<title>Avatar-Verwaltung</title>
 			</content>
 		</page>
-		<page identifier="com.woltlab.wcf.Disclaimer">
-			<pageType>system</pageType>
-			<controller>wcf\form\DisclaimerForm</controller>
-			<name language="de"><![CDATA[Disclaimer]]></name>
-			<name language="en"><![CDATA[Disclaimer]]></name>
-			
-			<content language="en">
-				<title>Disclaimer</title>
-			</content>
-			<content language="de">
-				<title>Disclaimer</title>
-			</content>
-		</page>
 		<page identifier="com.woltlab.wcf.EmailActivation">
 			<pageType>system</pageType>
 			<controller>wcf\form\EmailActivationForm</controller>
 			<name language="de"><![CDATA[Aktivierung neuer E-Mail-Adresse]]></name>
 			<name language="en"><![CDATA[New Email Address Verification]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>New Email Address Verification</title>
@@ -137,6 +126,7 @@
 			<controller>wcf\form\EmailNewActivationCodeForm</controller>
 			<name language="de"><![CDATA[E-Mail-Aktivierungscode-Anforderung]]></name>
 			<name language="en"><![CDATA[New Email Activation Code Request]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>New Email Activation Code Request</title>
@@ -150,6 +140,7 @@
 			<controller>wcf\form\LoginForm</controller>
 			<name language="de"><![CDATA[Anmeldung]]></name>
 			<name language="en"><![CDATA[Login]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Login</title>
@@ -163,6 +154,7 @@
 			<controller>wcf\form\LostPasswordForm</controller>
 			<name language="de"><![CDATA[Kennwort vergessen]]></name>
 			<name language="en"><![CDATA[Lost Password]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Lost Password</title>
@@ -189,6 +181,7 @@
 			<controller>wcf\form\NewPasswordForm</controller>
 			<name language="de"><![CDATA[Neues Kennwort]]></name>
 			<name language="en"><![CDATA[New Password Request]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>New Password Request</title>
@@ -202,6 +195,7 @@
 			<controller>wcf\form\NotificationSettingsForm</controller>
 			<name language="de"><![CDATA[Benachrichtigungseinstellungen]]></name>
 			<name language="en"><![CDATA[Notification Settings]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Notification Settings</title>
@@ -210,30 +204,45 @@
 				<title>Benachrichtigungseinstellungen</title>
 			</content>
 		</page>
-		<page identifier="com.woltlab.wcf.RegisterActivation">
+		<page identifier="com.woltlab.wcf.Register">
 			<pageType>system</pageType>
-			<controller>wcf\form\RegisterActivationForm</controller>
-			<name language="de"><![CDATA[Registrierung abschließen]]></name>
-			<name language="en"><![CDATA[Complete Registration]]></name>
+			<controller>wcf\form\RegisterForm</controller>
+			<name language="de"><![CDATA[Registrierung]]></name>
+			<name language="en"><![CDATA[Registration]]></name>
 			
 			<content language="en">
-				<title>Complete Registration</title>
+				<title>Registration</title>
 			</content>
 			<content language="de">
-				<title>Registrierung abschließen</title>
+				<title>Registrierung</title>
 			</content>
 		</page>
-		<page identifier="com.woltlab.wcf.Register">
+		<page identifier="com.woltlab.wcf.Disclaimer">
 			<pageType>system</pageType>
-			<controller>wcf\form\RegisterForm</controller>
-			<name language="de"><![CDATA[Registrierung]]></name>
-			<name language="en"><![CDATA[Registration]]></name>
+			<controller>wcf\form\DisclaimerForm</controller>
+			<name language="de"><![CDATA[Disclaimer]]></name>
+			<name language="en"><![CDATA[Disclaimer]]></name>
+			<parent>com.woltlab.wcf.Register</parent>
 			
 			<content language="en">
-				<title>Registration</title>
+				<title>Disclaimer</title>
 			</content>
 			<content language="de">
-				<title>Registrierung</title>
+				<title>Disclaimer</title>
+			</content>
+		</page>
+		<page identifier="com.woltlab.wcf.RegisterActivation">
+			<pageType>system</pageType>
+			<controller>wcf\form\RegisterActivationForm</controller>
+			<name language="de"><![CDATA[Registrierung abschließen]]></name>
+			<name language="en"><![CDATA[Complete Registration]]></name>
+			<parent>com.woltlab.wcf.Register</parent>
+			
+			<content language="en">
+				<title>Complete Registration</title>
+			</content>
+			<content language="de">
+				<title>Registrierung abschließen</title>
 			</content>
 		</page>
 		<page identifier="com.woltlab.wcf.RegisterNewActivationCode">
@@ -241,6 +250,7 @@
 			<controller>wcf\form\RegisterNewActivationCodeForm</controller>
 			<name language="de"><![CDATA[Aktivierungscode-Anforderung]]></name>
 			<name language="en"><![CDATA[New Activation Code Request]]></name>
+			<parent>com.woltlab.wcf.Register</parent>
 			
 			<content language="en">
 				<title>New Activation Code Request</title>
@@ -267,6 +277,7 @@
 			<controller>wcf\form\SettingsForm</controller>
 			<name language="de"><![CDATA[Einstellungen]]></name>
 			<name language="en"><![CDATA[Settings]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Settings</title>
@@ -281,6 +292,7 @@
 			<name language="de"><![CDATA[Signatur-Verwaltung]]></name>
 			<name language="en"><![CDATA[Signature Management]]></name>
 			<options>module_user_signature</options>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Settings</title>
@@ -289,20 +301,6 @@
 				<title>Einstellungen</title>
 			</content>
 		</page>
-		<page identifier="com.woltlab.wcf.DeletedContentList">
-			<pageType>system</pageType>
-			<controller>wcf\page\DeletedContentListPage</controller>
-			<name language="de"><![CDATA[Gelöschte Inhalte]]></name>
-			<name language="en"><![CDATA[Deleted Content]]></name>
-			<permissions>mod.general.canUseModeration</permissions>
-			
-			<content language="en">
-				<title>Deleted Content</title>
-			</content>
-			<content language="de">
-				<title>Gelöschte Inhalte</title>
-			</content>
-		</page>
 		<page identifier="com.woltlab.wcf.EditHistory">
 			<pageType>system</pageType>
 			<controller>wcf\page\EditHistoryPage</controller>
@@ -323,6 +321,7 @@
 			<controller>wcf\page\FollowingPage</controller>
 			<name language="de"><![CDATA[Benutzer, denen Sie folgen]]></name>
 			<name language="en"><![CDATA[Followed Users]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Followed Users</title>
@@ -336,6 +335,7 @@
 			<controller>wcf\page\IgnoredUsersPage</controller>
 			<name language="de"><![CDATA[Blockierte Benutzer]]></name>
 			<name language="en"><![CDATA[Blocked Users]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Blocked Users</title>
@@ -358,6 +358,21 @@
 				<title>Moderation</title>
 			</content>
 		</page>
+		<page identifier="com.woltlab.wcf.DeletedContentList">
+			<pageType>system</pageType>
+			<controller>wcf\page\DeletedContentListPage</controller>
+			<name language="de"><![CDATA[Gelöschte Inhalte]]></name>
+			<name language="en"><![CDATA[Deleted Content]]></name>
+			<permissions>mod.general.canUseModeration</permissions>
+			<parent>com.woltlab.wcf.ModerationList</parent>
+			
+			<content language="en">
+				<title>Deleted Content</title>
+			</content>
+			<content language="de">
+				<title>Gelöschte Inhalte</title>
+			</content>
+		</page>
 		<page identifier="com.woltlab.wcf.ModerationActivation">
 			<pageType>system</pageType>
 			<controller>wcf\form\ModerationActivationForm</controller>
@@ -395,6 +410,7 @@
 			<controller>wcf\page\NotificationListPage</controller>
 			<name language="de"><![CDATA[Benachrichtigungen]]></name>
 			<name language="en"><![CDATA[Notifications]]></name>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Notifications</title>
@@ -409,6 +425,7 @@
 			<name language="de"><![CDATA[Bezahlte Mitgliedschaften]]></name>
 			<name language="en"><![CDATA[Paid Subscriptions]]></name>
 			<options>module_paid_subscription</options>
+			<parent>com.woltlab.wcf.AccountManagement</parent>
 			
 			<content language="en">
 				<title>Paid Subscriptions</title>