Added 2.2 version

diff --git a/language/de.xml b/language/de.xml
index 687b6efe5598a7343366be6d96d0a651901e8524..6a5176a905f4fc00a713ca3a4c2f7201271087b4 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -23,10 +23,6 @@
                <item name="wcf.acp.option.legal_notice_vat_id.description"><![CDATA[Falls Sie über eine Umsatzsteuer-Identifikationsnummer verfügen, tragen Sie diese bitte hier ein.]]></item>
        </category>
        
-       <category name="wcf.footer.menu">
-               <item name="wcf.footer.menu.legalNotice"><![CDATA[Impressum]]></item>
-       </category>
-       
        <category name="wcf.legalNotice">
                <item name="wcf.legalNotice.additionalText"><![CDATA[Weitere Informationen]]></item>
                <item name="wcf.legalNotice.address"><![CDATA[Name und Anschrift]]></item>
@@ -40,8 +36,4 @@
                <item name="wcf.legalNotice.title"><![CDATA[Impressum]]></item>
                <item name="wcf.legalNotice.vatID"><![CDATA[Umsatzsteuer-ID]]></item>
        </category>
-       
-       <category name="wcf.page">
-               <item name="wcf.page.com.woltlab.wcf.legalNotice.LegalNoticePage"><![CDATA[Impressum]]></item>
-       </category>
 </language>
\ No newline at end of file

diff --git a/language/en.xml b/language/en.xml
index 6e435d18f18daa0fc3fc432c375215a20b5c1940..7737fcd8e558031f4186e13e3d1a89c5d15096d1 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -23,10 +23,6 @@
                <item name="wcf.acp.option.legal_notice_vat_id.description"><![CDATA[]]></item>
        </category>
        
-       <category name="wcf.footer.menu">
-               <item name="wcf.footer.menu.legalNotice"><![CDATA[Legal Notice]]></item>
-       </category>
-       
        <category name="wcf.legalNotice">
                <item name="wcf.legalNotice.additionalText"><![CDATA[Additional Information]]></item>
                <item name="wcf.legalNotice.address"><![CDATA[Name and Address]]></item>
@@ -40,8 +36,4 @@
                <item name="wcf.legalNotice.title"><![CDATA[Legal Notice]]></item>
                <item name="wcf.legalNotice.vatID"><![CDATA[VAT ID]]></item>
        </category>
-       
-       <category name="wcf.page">
-               <item name="wcf.page.com.woltlab.wcf.legalNotice.LegalNoticePage"><![CDATA[Legal Notice]]></item>
-       </category>
 </language>
\ No newline at end of file

diff --git a/menuItem.xml b/menuItem.xml
new file mode 100644 (file)
index 0000000..a215805
--- /dev/null
+++ b/menuItem.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/vortex/menuItem.xsd">
+       <import>
+               <item identifier="com.woltlab.wcf.LegalNotice">
+                       <menu>com.woltlab.wcf.FooterMenu</menu>
+                       <title language="de"><![CDATA[Impressum]]></title>
+                       <title language="en"><![CDATA[Legal Notice]]></title>
+                       <page>com.woltlab.wcf.LegalNotice</page>
+               </item>
+       </import>
+</data>

diff --git a/objectType.xml b/objectType.xml
deleted file mode 100644 (file)
index 054cc5d..0000000
--- a/objectType.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/object-type.xsd">
-       <import>
-               <!-- pages -->
-               <type>
-                       <name>com.woltlab.wcf.legalNotice.LegalNoticePage</name>
-                       <definitionname>com.woltlab.wcf.page</definitionname>
-                       <classname><![CDATA[wcf\page\LegalNoticePage]]></classname>
-                       <categoryname>com.woltlab.wcf.other</categoryname>
-               </type>
-               <!-- /pages -->
-       </import>
-</data>
\ No newline at end of file

diff --git a/package.xml b/package.xml
index ae8094e668b67580052eab8e4f0fe0b13d1f9857..2fd72e83461a6d47e3c2bbb0afb12c3315eabc35 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -5,7 +5,7 @@
                <packagename language="de">Impressum</packagename>
                <packagedescription>Adds a new page to your website with information about the site owner. (This is required for German websites.)</packagedescription>
                <packagedescription language="de">Kommerzielle deutsche Internetseiten müssen nach § 5 Telemediengesetz über ein Impressum verfügen.</packagedescription>
-               <version>2.1.0</version>
+               <version>2.2.0 Alpha 1</version>
                <date>2015-03-01</date>
        </packageinformation>
        
@@ -15,32 +15,19 @@
        </authorinformation>
        
        <requiredpackages>
-               <requiredpackage minversion="2.1.0">com.woltlab.wcf</requiredpackage>
+               <requiredpackage minversion="2.2.0 Alpha 1">com.woltlab.wcf</requiredpackage>
        </requiredpackages>
        
        <excludedpackages>
-               <excludedpackage version="2.2.0 Alpha 1">com.woltlab.wcf</excludedpackage>
+               <excludedpackage version="2.3.0 Alpha 1">com.woltlab.wcf</excludedpackage>
        </excludedpackages>
        
        <instructions type="install">
-               <instruction type="file">files.tar</instruction>
-               <instruction type="template">templates.tar</instruction>
-               <instruction type="pageMenu">pageMenu.xml</instruction>
-               <instruction type="objectType">objectType.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               <instruction type="language">language/*.xml</instruction>
-       </instructions>
-       
-       <instructions type="update" fromversion="2.0.1">
-               <instruction type="file">files.tar</instruction>
-               <instruction type="template">templates.tar</instruction>
-               
-               <instruction type="language">language/*.xml</instruction>
-               
-               <instruction type="objectType">objectType.xml</instruction>
-       </instructions>
-       
-       <instructions type="update" fromversion="2.1.0 RC 1">
-               <instruction type="file">files_update.tar</instruction>
+               <instruction type="file" />
+               <instruction type="template" />
+               <instruction type="page" />
+               <instruction type="option" />
+               <instruction type="language" />
+               <instruction type="menuItem" />
        </instructions>
 </package>

diff --git a/page.xml b/page.xml
new file mode 100644 (file)
index 0000000..1d131a4
--- /dev/null
+++ b/page.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/page.xsd">
+       <import>
+               <page identifier="com.woltlab.wcf.LegalNotice">
+                       <pagetype>system</pagetype>
+                       <controller>wcf\page\LegalNoticePage</controller>
+                       <name language="de"><![CDATA[Impressum]]></name>
+                       <name language="en"><![CDATA[Legal Notice]]></name>
+               </page>
+       </import>
+</data>

diff --git a/pageMenu.xml b/pageMenu.xml
deleted file mode 100644 (file)
index eb50caf..0000000
--- a/pageMenu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/pagemnu.xsd">
-       <import>
-               <pagemenuitem name="wcf.footer.menu.legalNotice">
-                       <controller><![CDATA[wcf\page\LegalNoticePage]]></controller>
-                       <position>footer</position>
-               </pagemenuitem>
-       </import>
-</data>
\ No newline at end of file