Changeset 87

Timestamp:

11/17/07 16:56:41 (6 years ago)

Author:

d0nut

Message:

lack of writing just "options"? yes.. lets start writing acp plugins

Location:

donation

Files:

• acpmenu.xml (added)
• acptemplates/donationAdd.pl (added)
• acptemplates/donationBank.pl (added)
• acptemplates/donationList.tpl (moved) (moved from donation/acptemplates/donations.tpl) (1 diff)
• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.googlecheckout/acpmenu.xml (added)
• optionals/de.easy-coding.wcf.donation.googlecheckout/acptemplates (added)
• optionals/de.easy-coding.wcf.donation.googlecheckout/acptemplates/donationGoogleCheckout.pl (added)
• optionals/de.easy-coding.wcf.donation.googlecheckout/de.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.googlecheckout/en.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.googlecheckout/options.xml (deleted)
• optionals/de.easy-coding.wcf.donation.googlecheckout/package.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.paypal/acpmenu.xml (added)
• optionals/de.easy-coding.wcf.donation.paypal/acptemplates (added)
• optionals/de.easy-coding.wcf.donation.paypal/acptemplates/donationPayPal.pl (added)
• optionals/de.easy-coding.wcf.donation.paypal/de.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.paypal/en.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.paypal/options.xml (deleted)
• optionals/de.easy-coding.wcf.donation.paypal/package.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.phone/de.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.phone/en.xml (modified) (1 diff)
• optionals/de.easy-coding.wcf.donation.phone/options.xml (deleted)
• optionals/de.easy-coding.wcf.donation.phone/package.xml (modified) (1 diff)
• options.xml (deleted)
• package.xml (modified) (2 diffs)

donation/acptemplates/donationList.tpl

@@ -1 @@
-<scrip type="text/javascript">
-//<![CDATA[
-//var root = document.getElementById('donation_donationsDiv').parentNode;
-//var div = document.createElement('div');
-//
-//root.insertBefore(div, document.getElementById('donation_donationsDiv'));
-//]]>
-</script>
+{include file='header'}
+<script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
+
+<div class="mainHeadline">
+        <img src="{@RELATIVE_WCF_DIR}icon/donation48.png" alt="" />
+        <div class="headlineContainer">
+                <h2>{lang}wcf.acp.donation.list{/lang}</h2>
+        </div>
+</div>
+<div class="contentHeader">
+        <div class="largeButtons">
+                <ul><li><a href="index.php?form=DonationAdd&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/donationAdd24.png" alt="" title="{lang}wcf.acp.donation.add{/lang}" /> <span>{lang}wcf.acp.donation.add{/lang}</span></a></li></ul>
+        </div>
+</div>
+
+{if $donations|count}
+<form method="post" action="index.php?action=DonationSort">
+        <div class="contentHeader">
+                {pages print=true assign=pagesLinks link="index.php?page=DonationList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder&packageID="|concat:PACKAGE_ID:SID_ARG_2ND_NOT_ENCODED}
+        </div>
+
+        <div class="border">
+                <div class="containerHead"><h3>{lang}wcf.acp.donation.donation.count{/lang}</h3></div>
+
+                <table class="tableList">
+                        <thead>
+                                <tr class="tableHead">
+                                        <th class="columnboxActivation{if $sortField == 'position'} active{/if}">
+                                                <div><a href="index.php?page=DonationList&amp;pageNo={@$pageNo}&amp;sortField=position&amp;sortOrder={if $sortField == 'position' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}">{lang}wcf.acp.donation.position{/lang}{if $sortField == 'position'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                        <th class="columnBoxname{if $sortField == 'name'} active{/if}">
+                                                <div><a href="index.php?page=DonationList&amp;pageNo={@$pageNo}&amp;sortField=name&amp;sortOrder={if $sortField == 'name' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}">{lang}wcf.acp.donation.name{/lang}{if $sortField == 'name'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                        <th class="columnBoxname{if $sortField == 'hit'} active{/if}">
+                                                <div><a href="index.php?page=DonationList&amp;pageNo={@$pageNo}&amp;sortField=hit&amp;sortOrder={if $sortField == 'hit' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}">{lang}wcf.acp.donation.hit{/lang}{if $sortField == 'hit'}<img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                        <th class="columnboxActivation{if $sortField == 'active'} active{/if}">
+                                                <div><a href="index.php?page=DonationList&amp;pageNo={@$pageNo}&amp;sortField=active&amp;sortOrder={if $sortField == 'active' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}">{lang}wcf.acp.donation.active{/lang}{if $sortField == 'active'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></div></th>
+                                </tr>
+                        </thead>
+                        <tbody>
+                        {foreach from=$donations item=donation}
+                                <tr class="{cycle values="container-1,container-2" advance=false}" id="donationRow{@$donations.position}">
+                                        <td class="columnIcon">
+                                                <input name="positions[]" type="checkbox" value="{$donation.id}" />
+                                        </td>
+                                        <td class="columnname columnText">
+                                                <a href="index.php?form=DonationEdit&amp;donation_id={$donation.id}&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/editS.png" alt="" title="{lang}wcf.acp.donation.edit{/lang}" /></a>
+                                                
+                                                <a onclick="return confirm('{lang}wcf.acp.donation.delete.sure{/lang}')" href="index.php?action=DonationDelete&amp;donation_id={$donation.id}&amp;packageID={@PACKAGE_ID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteS.png" alt="" title="{lang}wcf.acp.donation.delete{/lang}" /></a>
+                                        </td>
+                                        <td class="columnIcon">
+                                                {$donation.system}
+                                        </td>
+                                        <td class="columnText">
+                                                {$donation.user}
+                                        </td>
+                                        <td class="columnText">
+                                                {$donation.amount}
+                                        </td>
+                                        <td class="columnText">
+                                                {$donation.timestamp}
+                                        </td>
+                                </tr>
+                        {/foreach}
+                        </tbody>
+                </table>
+        </div>
+                <div class="formSubmit">
+                        <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
+                        <input type="reset" accesskey="r" value="{lang}wcf.global.button.reset{/lang}" />
+                        <input type="hidden" name="packageID" value="{@PACKAGE_ID}" />
+                        {@SID_INPUT_TAG}
+                </div>
+        </form>
+        <div class="contentFooter">
+                {@$pagesLinks}
+        </div>
+{/if}
+
+{include file='footer'}

donation/de.xml

@@ -6 +6 @@
                 <item name="wcf.header.menu.donation.description"><![CDATA[]]></item>
         </category>
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation"><![CDATA[Spenden]]></item>
-                <item name="wcf.acp.option.category.donation.description"><![CDATA[]]></item>
+        <category name="wcf.acp.menu">
+                <item name="wcf.acp.menu.link.content.donation"><![CDATA[Spenden]]></item>
+                <item name="wcf.acp.menu.category.donation.description"><![CDATA[]]></item>
+                <item name="wcf.acp.menu.link.content.donation.list"><![CDATA[Spendenliste]]></item>
+                <item name="wcf.acp.menu.category.donation.list.description"><![CDATA[]]></item>
+                <item name="wcf.acp.menu.link.content.donation.bank"><![CDATA[Bankinformationen]]></item>
+                <item name="wcf.acp.menu.category.donation.bank.description"><![CDATA[]]></item>
+        </category>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation"><![CDATA[Donation]]></item>
+                <item name="wcf.donation.category.donation.description"><![CDATA[]]></item>
 
-                <item name="wcf.acp.option.category.donation.general"><![CDATA[Allgemein]]></item>
-                <item name="wcf.acp.option.category.donation.general.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.category.donation.plugins"><![CDATA[Plugins]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.category.donation.donations"><![CDATA[Transaktionen]]></item>
-                <item name="wcf.acp.option.category.donation.donations.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.bank"><![CDATA[Bank]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.bank.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.general"><![CDATA[Allgemein]]></item>
+                <item name="wcf.donation.category.donation.general.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.plugins"><![CDATA[Plugins]]></item>
+                <item name="wcf.donation.category.donation.plugins.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.donations"><![CDATA[Transaktionen]]></item>
+                <item name="wcf.donation.category.donation.donations.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.plugins.bank"><![CDATA[Bank]]></item>
+                <item name="wcf.donation.category.donation.plugins.bank.description"><![CDATA[]]></item>
                 
-                <item name="wcf.acp.option.donation_groupjoin"><![CDATA[Gruppenwechsel]]></item>
-                <item name="wcf.acp.option.donation_groupjoin.description"><![CDATA[Geben Sie hier einen Gruppennamen ein, falls die Spender automatisch in eine Gruppe aufgenommen werden sollen.]]></item>
-                <item name="wcf.acp.option.donation_balance"><![CDATA[Kontostand zeigen]]></item>
-                <item name="wcf.acp.option.donation_balance.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_donations"><![CDATA[Spenden zeigen]]></item>
-                <item name="wcf.acp.option.donation_donations.description"><![CDATA[]]></item>
-                
-                <item name="wcf.acp.option.donation_bank_enable"><![CDATA[Aktivieren]]></item>
-                <item name="wcf.acp.option.donation_bank_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_accountholder"><![CDATA[Kontoinhaber]]></item>
-                <item name="wcf.acp.option.donation_bank_accountholder.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_accountnr"><![CDATA[Kontonummer]]></item>
-                <item name="wcf.acp.option.donation_bank_accountnr.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_bankcode"><![CDATA[BLZ]]></item>
-                <item name="wcf.acp.option.donation_bank_bankcode.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_financialinstitution"><![CDATA[Kreditinstitut]]></item>
-                <item name="wcf.acp.option.donation_bank_financialinstitution.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_iban"><![CDATA[IBAN]]></item>
-                <item name="wcf.acp.option.donation_bank_iban.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_swift"><![CDATA[BIC-/SWIFT-Code]]></item>
-                <item name="wcf.acp.option.donation_bank_swift.description"><![CDATA[]]></item>
+                <item name="wcf.donation.groupjoin"><![CDATA[Gruppenwechsel]]></item>
+                <item name="wcf.donation.groupjoin.description"><![CDATA[Geben Sie hier einen Gruppennamen ein, falls die Spender automatisch in eine Gruppe aufgenommen werden sollen.]]></item>
+                <item name="wcf.donation.balance"><![CDATA[Kontostand zeigen]]></item>
+                <item name="wcf.donation.balance.description"><![CDATA[]]></item>
+                <item name="wcf.donation.donations"><![CDATA[Spenden zeigen]]></item>
+                <item name="wcf.donation.donations.description"><![CDATA[]]></item>
+
+                <item name="wcf.donation.bank.enable"><![CDATA[Aktivieren]]></item>
+                <item name="wcf.donation.bank.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.accountholder"><![CDATA[Kontoinhaber]]></item>
+                <item name="wcf.donation.bank.accountholder.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.accountnr"><![CDATA[Kontonummer]]></item>
+                <item name="wcf.donation.bank.accountnr.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.bankcode"><![CDATA[BLZ]]></item>
+                <item name="wcf.donation.bank.bankcode.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.financialinstitution"><![CDATA[Kreditinstitut]]></item>
+                <item name="wcf.donation.bank.financialinstitution.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.iban"><![CDATA[IBAN]]></item>
+                <item name="wcf.donation.bank.iban.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.swift"><![CDATA[BIC-/SWIFT-Code]]></item>
+                <item name="wcf.donation.bank.swift.description"><![CDATA[]]></item>
         </category>
 </language>

donation/en.xml

@@ -6 +6 @@
                 <item name="wcf.header.menu.donation.description"><![CDATA[]]></item>
         </category>
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation"><![CDATA[Donation]]></item>
-                <item name="wcf.acp.option.category.donation.description"><![CDATA[]]></item>
+        <category name="wcf.acp.menu">
+                <item name="wcf.acp.menu.link.content.donation"><![CDATA[Donation]]></item>
+                <item name="wcf.acp.menu.category.donation.description"><![CDATA[]]></item>
+                <item name="wcf.acp.menu.link.content.donation.list"><![CDATA[List of donations]]></item>
+                <item name="wcf.acp.menu.category.donation.list.description"><![CDATA[]]></item>
+                <item name="wcf.acp.menu.link.content.donation.bank"><![CDATA[Bankaccount]]></item>
+                <item name="wcf.acp.menu.category.donation.bank.description"><![CDATA[]]></item>
+        </category>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation"><![CDATA[Donation]]></item>
+                <item name="wcf.donation.category.donation.description"><![CDATA[]]></item>
 
-                <item name="wcf.acp.option.category.donation.general"><![CDATA[General]]></item>
-                <item name="wcf.acp.option.category.donation.general.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.category.donation.plugins"><![CDATA[Plugins]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.category.donation.donations"><![CDATA[Transactions]]></item>
-                <item name="wcf.acp.option.category.donation.donations.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.bank"><![CDATA[Bank]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.bank.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.general"><![CDATA[General]]></item>
+                <item name="wcf.donation.category.donation.general.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.plugins"><![CDATA[Plugins]]></item>
+                <item name="wcf.donation.category.donation.plugins.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.donations"><![CDATA[Transactions]]></item>
+                <item name="wcf.donation.category.donation.donations.description"><![CDATA[]]></item>
+                <item name="wcf.donation.category.donation.plugins.bank"><![CDATA[Bank]]></item>
+                <item name="wcf.donation.category.donation.plugins.bank.description"><![CDATA[]]></item>
                 
-                <item name="wcf.acp.option.donation_groupjoin"><![CDATA[Groupjoin]]></item>
-                <item name="wcf.acp.option.donation_groupjoin.description"><![CDATA[Type in a groupname to automatically add users to this group.]]></item>
-                <item name="wcf.acp.option.donation_balance"><![CDATA[Show balance]]></item>
-                <item name="wcf.acp.option.donation_balance.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_donations"><![CDATA[Show donations]]></item>
-                <item name="wcf.acp.option.donation_donations.description"><![CDATA[]]></item>
+                <item name="wcf.donation.groupjoin"><![CDATA[Groupjoin]]></item>
+                <item name="wcf.donation.groupjoin.description"><![CDATA[Type in a groupname to automatically add users to this group.]]></item>
+                <item name="wcf.donation.balance"><![CDATA[Show balance]]></item>
+                <item name="wcf.donation.balance.description"><![CDATA[]]></item>
+                <item name="wcf.donation.donations"><![CDATA[Show donations]]></item>
+                <item name="wcf.donation.donations.description"><![CDATA[]]></item>
                 
-                <item name="wcf.acp.option.donation_bank_enable"><![CDATA[activate]]></item>
-                <item name="wcf.acp.option.donation_bank_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_accountholder"><![CDATA[account holder]]></item>
-                <item name="wcf.acp.option.donation_bank_accountholder.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_accountnr"><![CDATA[account number]]></item>
-                <item name="wcf.acp.option.donation_bank_accountnr.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_bankcode"><![CDATA[bank code]]></item>
-                <item name="wcf.acp.option.donation_bank_bankcode.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_financialinstitution"><![CDATA[financial institution]]></item>
-                <item name="wcf.acp.option.donation_bank_financialinstitution.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_iban"><![CDATA[IBAN]]></item>
-                <item name="wcf.acp.option.donation_bank_iban.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_bank_swift"><![CDATA[BIC-/SWIFT-Code]]></item>
-                <item name="wcf.acp.option.donation_bank_swift.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.enable"><![CDATA[activate]]></item>
+                <item name="wcf.donation.bank.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.accountholder"><![CDATA[account holder]]></item>
+                <item name="wcf.donation.bank.accountholder.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.accountnr"><![CDATA[account number]]></item>
+                <item name="wcf.donation.bank.accountnr.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.bankcode"><![CDATA[bank code]]></item>
+                <item name="wcf.donation.bank.bankcode.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.financialinstitution"><![CDATA[financial institution]]></item>
+                <item name="wcf.donation.bank.financialinstitution.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.iban"><![CDATA[IBAN]]></item>
+                <item name="wcf.donation.bank.iban.description"><![CDATA[]]></item>
+                <item name="wcf.donation.bank.swift"><![CDATA[BIC-/SWIFT-Code]]></item>
+                <item name="wcf.donation.bank.swift.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.googlecheckout/de.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
 <language languagecode="de">
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout"><![CDATA[Google Checkout]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable"><![CDATA[Aktivieren]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user"><![CDATA[Benutzername]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password"><![CDATA[Passwort]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password.description"><![CDATA[]]></item>
+        <category name="wcf.acp.menu">
+                <item name="wcf.acp.menu.link.content.donation.googlecheckout"><![CDATA[Google Checkout]]></item>
+                <item name="wcf.acp.menu.category.donation.googlecheckout.description"><![CDATA[]]></item>
+        </category>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation.plugins.googlecheckout"><![CDATA[Google Checkout]]></item>
+                <item name="wcf.donation.category.donation.plugins.googlecheckout.description"><![CDATA[]]></item>
+                <item name="wcf.donation.googlecheckout.enable"><![CDATA[Aktivieren]]></item>
+                <item name="wcf.donation.googlecheckout.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.googlecheckout.user"><![CDATA[Benutzername]]></item>
+                <item name="wcf.donation.googlecheckout.user.description"><![CDATA[]]></item>
+                <item name="wcf.donation.googlecheckout.password"><![CDATA[Passwort]]></item>
+                <item name="wcf.donation.googlecheckout.password.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.googlecheckout/en.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
 <language languagecode="en">
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout"><![CDATA[Google Checkout]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable"><![CDATA[Activate]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user"><![CDATA[Username]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password"><![CDATA[Password]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password.description"><![CDATA[]]></item>
+        <category name="wcf.acp.menu">
+                <item name="wcf.acp.menu.link.content.donation.googlecheckout"><![CDATA[Google Checkout]]></item>
+                <item name="wcf.acp.menu.category.donation.googlecheckout.description"><![CDATA[]]></item>
+        </category>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation.plugins.googlecheckout"><![CDATA[Google Checkout]]></item>
+                <item name="wcf.donation.category.donation.plugins.googlecheckout.description"><![CDATA[]]></item>
+                <item name="wcf.donation.googlecheckout.enable"><![CDATA[Activate]]></item>
+                <item name="wcf.donation.googlecheckout.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.googlecheckout.user"><![CDATA[Username]]></item>
+                <item name="wcf.donation.googlecheckout.user.description"><![CDATA[]]></item>
+                <item name="wcf.donation.googlecheckout.password"><![CDATA[Password]]></item>
+                <item name="wcf.donation.googlecheckout.password.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.googlecheckout/package.xml

@@ -22 +22 @@
         <instructions type="install">
                 <files>files.tar</files>
+                <acptemplates>acptemplates.tar</acptemplates>
+                <acpmenu>acpmenu.xml</acpmenu>
                 <languages languagecode="de">de.xml</languages>
                 <languages languagecode="en">en.xml</languages>
-                <options>options.xml</options>
                 <eventlistener>eventlistener.xml</eventlistener>
         </instructions>

donation/optionals/de.easy-coding.wcf.donation.paypal/de.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
 <language languagecode="de">
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout"><![CDATA[PayPal]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable"><![CDATA[Aktivieren]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user"><![CDATA[Benutzername]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password"><![CDATA[Passwort]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password.description"><![CDATA[]]></item>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation.plugins.paypal"><![CDATA[PayPal]]></item>
+                <item name="wcf.donation.category.donation.plugins.paypal.description"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.enable"><![CDATA[Aktivieren]]></item>
+                <item name="wcf.donation.paypal.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.user"><![CDATA[Benutzername]]></item>
+                <item name="wcf.donation.paypal.user.description"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.password"><![CDATA[Passwort]]></item>
+                <item name="wcf.donation.paypal.password.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.paypal/en.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
 <language languagecode="en">
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout"><![CDATA[PayPal]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.googlecheckout.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable"><![CDATA[Activate]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user"><![CDATA[Username]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_user.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password"><![CDATA[Password]]></item>
-                <item name="wcf.acp.option.donation_googlecheckout_password.description"><![CDATA[]]></item>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation.plugins.paypal"><![CDATA[PayPal]]></item>
+                <item name="wcf.donation.category.donation.plugins.paypal.description"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.enable"><![CDATA[Activate]]></item>
+                <item name="wcf.donation.paypal.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.user"><![CDATA[Username]]></item>
+                <item name="wcf.donation.paypal.user.description"><![CDATA[]]></item>
+                <item name="wcf.donation.paypal.password"><![CDATA[Password]]></item>
+                <item name="wcf.donation.paypal.password.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.paypal/package.xml

@@ -22 +22 @@
         <instructions type="install">
                 <files>files.tar</files>
+                <acptemplates>acptemplates.tar</acptemplates>
+                <acpmenu>acpmenu.xml</acpmenu>
                 <languages languagecode="de">de.xml</languages>
                 <languages languagecode="en">en.xml</languages>
-                <options>options.xml</options>
                 <eventlistener>eventlistener.xml</eventlistener>
         </instructions>

donation/optionals/de.easy-coding.wcf.donation.phone/de.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
 <language languagecode="de">
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation.plugins.phone"><![CDATA[Telefon]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.phone.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_enable"><![CDATA[Aktivieren]]></item>
-                <item name="wcf.acp.option.donation_phone_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_icon"><![CDATA[Bild]]></item>
-                <item name="wcf.acp.option.donation_phone_icon.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_number"><![CDATA[Nummer]]></item>
-                <item name="wcf.acp.option.donation_phone_number.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_price"><![CDATA[Preis]]></item>
-                <item name="wcf.acp.option.donation_phone_price.description"><![CDATA[]]></item>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation.plugins.phone"><![CDATA[Telefon]]></item>
+                <item name="wcf.donation.category.donation.plugins.phone.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.enable"><![CDATA[Aktivieren]]></item>
+                <item name="wcf.donation.phone.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.icon"><![CDATA[Bild]]></item>
+                <item name="wcf.donation.phone.icon.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.number"><![CDATA[Nummer]]></item>
+                <item name="wcf.donation.phone.number.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.price"><![CDATA[Preis]]></item>
+                <item name="wcf.donation.phone.price.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.phone/en.xml

@@ -2 +2 @@
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
 <language languagecode="en">
-        <category name="wcf.acp.option">
-                <item name="wcf.acp.option.category.donation.plugins.phone"><![CDATA[Phone]]></item>
-                <item name="wcf.acp.option.category.donation.plugins.phone.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_enable"><![CDATA[activate]]></item>
-                <item name="wcf.acp.option.donation_phone_enable.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_icon"><![CDATA[icon]]></item>
-                <item name="wcf.acp.option.donation_phone_icon.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_number"><![CDATA[number]]></item>
-                <item name="wcf.acp.option.donation_phone_number.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.donation_phone_price"><![CDATA[price]]></item>
-                <item name="wcf.acp.option.donation_phone_price.description"><![CDATA[]]></item>
+        <category name="wcf.donation">
+                <item name="wcf.donation.category.donation.plugins.phone"><![CDATA[Phone]]></item>
+                <item name="wcf.donation.category.donation.plugins.phone.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.enable"><![CDATA[activate]]></item>
+                <item name="wcf.donation.phone.enable.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.icon"><![CDATA[icon]]></item>
+                <item name="wcf.donation.phone.icon.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.number"><![CDATA[number]]></item>
+                <item name="wcf.donation.phone.number.description"><![CDATA[]]></item>
+                <item name="wcf.donation.phone.price"><![CDATA[price]]></item>
+                <item name="wcf.donation.phone.price.description"><![CDATA[]]></item>
         </category>
 </language>

donation/optionals/de.easy-coding.wcf.donation.phone/package.xml

@@ -22 +22 @@
         <instructions type="install">
                 <files>files.tar</files>
+                <acptemplates>acptemplates.tar</acptemplates>
+                <acpmenu>acpmenu.xml</acpmenu>
                 <languages languagecode="de">de.xml</languages>
                 <languages languagecode="en">en.xml</languages>
-                <options>options.xml</options>
                 <eventlistener>eventlistener.xml</eventlistener>
         </instructions>

donation/package.xml

@@ -28 +28 @@
                 <templates>templates.tar</templates>
                 <acptemplates>acptemplates.tar</acptemplates>
-                <options>options.xml</options>
                 <eventlistener>eventlistener.xml</eventlistener>
                 <sql>install.sql</sql>
@@ -34 +33 @@
                 <languages languagecode="en">en.xml</languages>
                 <headermenu>headermenu.xml</headermenu>
+                <acpmenu>acpmenu.xml</acpmenu>
         </instructions>
 </package>