Added language variables and missing button

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index cbb3aa3cce219af2ce8c903edf900c76b9701dd8..38321763fa5059b7094bf873ceac2ec11a4b0db7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -56,7 +56,7 @@
                                                                <dd>{$package->package}</dd>
                                                        </dl>
                                                        <dl>
-                                                               <dt>{lang}wcf.acp.package.installedVersion{/lang}</dt>
+                                                               <dt>{lang}wcf.acp.package.version{/lang}</dt>
                                                                <dd>{$package->packageVersion}</dd>
                                                        </dl>
                                                        <dl>

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index ad785f006884a6d777240ce2186322f00bdd0dea..32846cac57cd4d5c0b63cd413f694245a1f7c606 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -32,10 +32,10 @@
        <div class="wcf-border wcf-content">
                
                <fieldset>
-                       <legend>{lang}wcf.acp.package.startInstall.source{/lang}</legend>
+                       <legend>{lang}wcf.acp.package.source{/lang}</legend>
                
                        <dl{if $errorField == 'uploadPackage'} class="wcf-formError"{/if}>
-                               <dt><label for="uploadPackage">{lang}wcf.acp.package.startInstall.source.upload{/lang}</label></dt>
+                               <dt><label for="uploadPackage">{lang}wcf.acp.package.source.upload{/lang}</label></dt>
                                <dd>
                                        <input type="file" id="uploadPackage" name="uploadPackage" value="" />
                                        {if $errorField == 'uploadPackage'}
@@ -46,24 +46,24 @@
                                                                {* todo: use language variable (-> else) *}
                                                                <pre>{$phpRequirements|print_r}</pre>
                                                        {else}
-                                                               {lang}wcf.acp.package.startInstall.error.{@$errorType}{/lang}
+                                                               {lang}wcf.acp.package.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
-                                       <small>{lang}wcf.acp.package.startInstall.source.upload.description{/lang}</small>
+                                       <small>{lang}wcf.acp.package.source.upload.description{/lang}</small>
                                </dd>
                        </dl>
                        
                        <dl{if $errorField == 'downloadPackage'} class="wcf-formError"{/if}>
-                               <dt><label for="downloadPackage">{lang}wcf.acp.package.startInstall.source.download{/lang}</label></dt>
+                               <dt><label for="downloadPackage">{lang}wcf.acp.package.source.download{/lang}</label></dt>
                                <dd>
                                        <input type="text" id="downloadPackage" name="downloadPackage" value="" class="long" />
                                        {if $errorField == 'downloadPackage'}
                                                <small class="wcf-innerError">
-                                                       {lang}wcf.acp.package.startInstall.error.{@$errorType}{/lang}
+                                                       {lang}wcf.acp.package.error.{@$errorType}{/lang}
                                                </small>
                                        {/if}
-                                       <small>{lang}wcf.acp.package.startInstall.source.download.description{/lang}</small>
+                                       <small>{lang}wcf.acp.package.source.download.description{/lang}</small>
                                </dd>
                        </dl>
                        

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 3742e209c7b304994cdac59549bfba0d3a5cc629..d10e4ee7659b0f6e5c3d4d4e529ca38fa8449db0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -20,7 +20,7 @@
        <nav class="wcf-tabMenu">
                <ul>
                        <li><a href="#information">{lang}wcf.acp.package.information.title{/lang}</a></li>
-                       {if $requiredPackages|count || $dependentPackages|count}<li><a href="#dependencies">{lang}wcf.acp.package.dependencies{/lang}</a></li>{/if}
+                       {if $requiredPackages|count || $dependentPackages|count}<li><a href="#dependencies">{lang}wcf.acp.package.dependencies.title{/lang}</a></li>{/if}
                </ul>
        </nav>
 
@@ -232,28 +232,26 @@
        {/if}
 {/foreach}
 
-{hascontent}
-       <div class="wcf-contentFooter">
-               <nav>
-                       <ul class="wcf-largeButtons">
-                               {content}
-                                       {if PACKAGE_ID != $package->packageID}
-                                               {if $package->isApplication && $package->package != 'com.woltlab.wcf'}
-                                                       <li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.button.switch{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.button.switch{/lang}</span></a></li>
-                                               {/if}
-                                               {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}
-                                                       <li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></a></li>
-                                               {/if}
-                                       {/if}
-                                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                               <li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.button.update{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.button.update{/lang}</span></a></li>
-                                       {/if}
-                                       
-                                       {event name='largeButtons'}
-                               {/content}
-                       </ul>
-               </nav>
-       </div>
-{/hascontent}
+<div class="wcf-contentFooter">
+       <nav>
+               <ul class="wcf-largeButtons">
+                       {if PACKAGE_ID != $package->packageID}
+                               {if $package->isApplication && $package->package != 'com.woltlab.wcf'}
+                                       <li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.button.switch{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.button.switch{/lang}</span></a></li>
+                               {/if}
+                               {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}
+                                       <li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></a></li>
+                               {/if}
+                       {/if}
+                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
+                               <li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.button.update{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.button.update{/lang}</span></a></li>
+                       {/if}
+                       
+                       {event name='largeButtons'}
+                       
+                       <li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+               </ul>
+       </nav>
+</div>
 
 {include file='footer'}

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 556ae518279ee52ee3f914e0de15b9cbe7535f87..9417383b4be350d7e44cf247d55d3351fb0538a7 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -267,10 +267,42 @@
        </category>
 
        <category name="wcf.acp.package">
+               <item name="wcf.acp.package.application.installed"><![CDATA[Installierte Anwendungen]]></item>
+               <item name="wcf.acp.package.application.title"><![CDATA[Anwendungen]]></item>
+               <item name="wcf.acp.package.author"><![CDATA[Entwickler]]></item>
+               <item name="wcf.acp.package.button.info"><![CDATA[Informationen]]></item>
+               <item name="wcf.acp.package.button.uninstall"><![CDATA[Deinstallieren]]></item>
+               <item name="wcf.acp.package.button.update"><![CDATA[Aktualisieren]]></item>
+               <item name="wcf.acp.package.dependencies.dependent"><![CDATA[Abhängige Pakete]]></item>
+               <item name="wcf.acp.package.dependencies.dependent.description"><![CDATA[Pakete die dieses Paket zwingend für den Betrieb benötigen]]></item>
+               <item name="wcf.acp.package.dependencies.required"><![CDATA[Notwendige Pakete]]></item>
+               <item name="wcf.acp.package.dependencies.required.description"><![CDATA[Pakete die zwingend für den Betrieb dieses Paketes benötigt werden]]></item>
+               <item name="wcf.acp.package.dependencies.title"><![CDATA[Abhängigkeiten]]></item>
+               <item name="wcf.acp.package.description"><![CDATA[Beschreibung]]></item>
+               <item name="wcf.acp.package.identifier"><![CDATA[Bezeichner]]></item>
+               <item name="wcf.acp.package.information.properties"><![CDATA[Eigenschaften]]></item>
+               <item name="wcf.acp.package.information.title"><![CDATA[Informationen]]></item>
+               <item name="wcf.acp.package.installDate"><![CDATA[Installationsdatum]]></item>
                <item name="wcf.acp.package.installation.step.install"><![CDATA[&bdquo;{$packageName}&ldquo; wird installiert &hellip;]]></item>
                <item name="wcf.acp.package.installation.step.install.success"><![CDATA[Installation abgeschlossen]]></item>
                <item name="wcf.acp.package.installation.step.prepare"><![CDATA[Installation wird vorbereitet &hellip;]]></item>
                <item name="wcf.acp.package.installation.title"><![CDATA[Installation]]></item>
+               <item name="wcf.acp.package.list"><![CDATA[Paketliste]]></item>
+               <item name="wcf.acp.package.list.detailed"><![CDATA[Detaillierte Paketliste]]></item>
+               <item name="wcf.acp.package.name"><![CDATA[Paket]]></item>
+               <item name="wcf.acp.package.packageDate"><![CDATA[Erstellungsdatum]]></item>
+               <item name="wcf.acp.package.plugin.installed"><![CDATA[Installierte Pakete]]></item>
+               <item name="wcf.acp.package.plugin.title"><![CDATA[Erweiterungen]]></item>
+               <item name="wcf.acp.package.source"><![CDATA[Datenquelle]]></item>
+               <item name="wcf.acp.package.source.download"><![CDATA[Paket herunterladen]]></item>
+               <item name="wcf.acp.package.source.upload"><![CDATA[Paket hochladen]]></item>
+               <item name="wcf.acp.package.startInstall"><![CDATA[Paket installieren]]></item>
+               <item name="wcf.acp.package.startUpdate"><![CDATA[Paket aktualisieren]]></item>
+               <item name="wcf.acp.package.type.application"><![CDATA[Anwendung]]></item>
+               <item name="wcf.acp.package.type.other"><![CDATA[Basispaket]]></item>
+               <item name="wcf.acp.package.type.plugin"><![CDATA[Erweiterung]]></item>
+               <item name="wcf.acp.package.updateDate"><![CDATA[Aktualisierungsdatum]]></item>
+               <item name="wcf.acp.package.version"><![CDATA[Version]]></item>
        </category>
        
        <category name="wcf.acp.updateServer">

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 3341dd6004527a5dba0b3a61477a5a427db50ff0..fa1ed57de714d9fdb40cf3632805e60fc5846b70 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -267,10 +267,42 @@
        </category>
 
        <category name="wcf.acp.package">
+               <item name="wcf.acp.package.application.installed"><![CDATA[Installed applications]]></item>
+               <item name="wcf.acp.package.application.title"><![CDATA[Applications]]></item>
+               <item name="wcf.acp.package.author"><![CDATA[Developer]]></item>
+               <item name="wcf.acp.package.button.info"><![CDATA[Informations]]></item>
+               <item name="wcf.acp.package.button.uninstall"><![CDATA[Uninstall]]></item>
+               <item name="wcf.acp.package.button.update"><![CDATA[Update]]></item>
+               <item name="wcf.acp.package.dependencies.dependent"><![CDATA[Dependent packages]]></item>
+               <item name="wcf.acp.package.dependencies.dependent.description"><![CDATA[Packages dependent on this package to work]]></item>
+               <item name="wcf.acp.package.dependencies.required"><![CDATA[Required packages]]></item>
+               <item name="wcf.acp.package.dependencies.required.description"><![CDATA[Packages required for this package to work]]></item>
+               <item name="wcf.acp.package.dependencies.title"><![CDATA[Dependencies]]></item>
+               <item name="wcf.acp.package.description"><![CDATA[Description]]></item>
+               <item name="wcf.acp.package.identifier"><![CDATA[Identifier]]></item>
+               <item name="wcf.acp.package.information.properties"><![CDATA[Properties]]></item>
+               <item name="wcf.acp.package.information.title"><![CDATA[Informations]]></item>
+               <item name="wcf.acp.package.installDate"><![CDATA[Installation date]]></item>
                <item name="wcf.acp.package.installation.step.install"><![CDATA[Installing &ldquo;{$packageName}&rdquo; &hellip;]]></item>
                <item name="wcf.acp.package.installation.step.install.success"><![CDATA[Installation completed]]></item>
                <item name="wcf.acp.package.installation.step.prepare"><![CDATA[Prepairing installation &hellip;]]></item>
                <item name="wcf.acp.package.installation.title"><![CDATA[Installation]]></item>
+               <item name="wcf.acp.package.list"><![CDATA[Package list]]></item>
+               <item name="wcf.acp.package.list.detailed"><![CDATA[Detailed package list]]></item>
+               <item name="wcf.acp.package.name"><![CDATA[Package]]></item>
+               <item name="wcf.acp.package.packageDate"><![CDATA[Creation date]]></item>
+               <item name="wcf.acp.package.plugin.installed"><![CDATA[Installed packages]]></item>
+               <item name="wcf.acp.package.plugin.title"><![CDATA[Extensions]]></item>
+               <item name="wcf.acp.package.source"><![CDATA[Data source]]></item>
+               <item name="wcf.acp.package.source.download"><![CDATA[Download package]]></item>
+               <item name="wcf.acp.package.source.upload"><![CDATA[Upload package]]></item>
+               <item name="wcf.acp.package.startInstall"><![CDATA[Install package]]></item>
+               <item name="wcf.acp.package.startUpdate"><![CDATA[Update package]]></item>
+               <item name="wcf.acp.package.type.application"><![CDATA[Application]]></item>
+               <item name="wcf.acp.package.type.other"><![CDATA[Base package]]></item>
+               <item name="wcf.acp.package.type.plugin"><![CDATA[Extension]]></item>
+               <item name="wcf.acp.package.updateDate"><![CDATA[Update date]]></item>
+               <item name="wcf.acp.package.version"><![CDATA[Version]]></item>
        </category>
        
        <category name="wcf.acp.updateServer">