Overhauled page title management

diff --git a/language/de.xml b/language/de.xml
index 6a5176a905f4fc00a713ca3a4c2f7201271087b4..4e73c59a27053d2208ba2f453d2666fb927941af 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -33,7 +33,6 @@
                <item name="wcf.legalNotice.phone"><![CDATA[Telefon]]></item>
                <item name="wcf.legalNotice.register"><![CDATA[Register]]></item>
                <item name="wcf.legalNotice.representative"><![CDATA[Vertretungsberechtigte]]></item>
-               <item name="wcf.legalNotice.title"><![CDATA[Impressum]]></item>
                <item name="wcf.legalNotice.vatID"><![CDATA[Umsatzsteuer-ID]]></item>
        </category>
 </language>
\ No newline at end of file

diff --git a/language/en.xml b/language/en.xml
index 7737fcd8e558031f4186e13e3d1a89c5d15096d1..165d13b1f5daf2d0482afc339c95b1c684fda3d2 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -33,7 +33,6 @@
                <item name="wcf.legalNotice.phone"><![CDATA[Phone]]></item>
                <item name="wcf.legalNotice.register"><![CDATA[Register]]></item>
                <item name="wcf.legalNotice.representative"><![CDATA[Representatives]]></item>
-               <item name="wcf.legalNotice.title"><![CDATA[Legal Notice]]></item>
                <item name="wcf.legalNotice.vatID"><![CDATA[VAT ID]]></item>
        </category>
 </language>
\ No newline at end of file

diff --git a/page.xml b/page.xml
index d912befe007f1e9c21391e1ab6a53e47a003d137..ef3d4b2d21f56a7cb6764e5eba9264337e403e38 100644 (file)
--- a/page.xml
+++ b/page.xml
@@ -6,6 +6,13 @@
                        <controller>wcf\page\LegalNoticePage</controller>
                        <name language="de"><![CDATA[Impressum]]></name>
                        <name language="en"><![CDATA[Legal Notice]]></name>
+                       
+                       <content language="en">
+                               <title>Legal Notice</title>
+                       </content>
+                       <content language="de">
+                               <title>Impressum</title>
+                       </content>
                </page>
        </import>
 </data>

diff --git a/templates/legalNotice.tpl b/templates/legalNotice.tpl
index 4733dd5eb4fc0cae7b2c806f576e0910203b54a6..1cb429a4d367a20579baf63e788448bfcae2ac0b 100644 (file)
--- a/templates/legalNotice.tpl
+++ b/templates/legalNotice.tpl
@@ -1,7 +1,3 @@
-{capture assign='pageTitle'}{lang}wcf.legalNotice.title{/lang}{/capture}
-
-{capture assign='contentTitle'}{lang}wcf.legalNotice.title{/lang}{/capture}
-
 {capture assign='contentDescription'}{lang}wcf.legalNotice.description{/lang}{/capture}
 
 {capture assign='headContent'}