Large Button Icons enabled (testing)

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 0c67366697c2a9cd5b537ec825955d5fc7bbffae..e7272db5bc8376f5207aa392bac8888c2a63cb1c 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -873,9 +873,13 @@ textarea {
        display: inline;
 }
 
-.largeButtons ul li img {
-       /* Button Icons disabled for now, maybe we get rid oft them */
-       display: none;
+.largeButtons ul li a img {
+       /* ToDo: Button-icons disabled for now, maybe we get rid oft them
+       display: none; */
+       margin: -5px 1px -5px -5px;
+       height: 24px;
+       width: 24px;
+       vertical-align: middle;
 }
 
 /* buttons normal */
@@ -1236,14 +1240,6 @@ input[type='button'][disabled='disabled'],
        border-color: #ccc #bbb #aaa;
 }
 
-/* ToDo: Images deprecated? */
-.largeButtons ul li a img {
-       margin: 0;
-       height: 24px;
-       width: 24px;
-       vertical-align: middle;
-}
-
 
 
 /* -- -- -- -- -- Border -- -- -- -- -- */
@@ -1636,11 +1632,6 @@ tbody tr {
        border-bottom: 1px solid rgba(255, 255, 255, .3);
 }
 
-tbody tr:first-child {
-       /* prevents line-breaks in icon-column */
-       white-space: nowrap;
-}
-
 tbody tr:last-child {
        /* no border for the last table row */
        border-bottom-width: 0;
@@ -1710,6 +1701,7 @@ tr .columnMark,
 tr .columnStatus {
        text-align: center;
        width: 1% !important;
+       white-space: nowrap;
 }
 
 tr .columnStatus .badge {
@@ -1721,11 +1713,13 @@ tr .columnDigits,
 tr .columnID {
        text-align: right;
        width: 1% !important;
+       white-space: nowrap;
 }
 
 tr .columnIcon {
        text-align: left;
-       width: 1% !important
+       width: 1% !important;
+       white-space: nowrap;
 }
 
 tr .columnIcon img:not(.balloonTooltip):hover {
@@ -2267,7 +2261,7 @@ li > .badgeButton {
 #balloonTooltip {
        font-size: .85em;
        color: #fff;
-       border: 1px solid rgba(255, 255, 255, .7) !important;
+       border: 1px solid rgba(255, 255, 255, .7);
        border-radius: 5px;
        background-color: rgba(0, 0, 0, .7);
        padding: 5px 10px 7px;
@@ -2301,8 +2295,11 @@ li > .badgeButton {
 /* Clipboard API - TESTING ONLY / TODO */
 
 .clipboardEditor {
-       padding-top: 5px !important;
+       font-size: .85em;
+       margin: 7px 3px 0;
+       padding: 2px 5px 3px !important;
        position: relative;
+       float: left;
 }
 
 .clipboardEditor p {
@@ -2314,10 +2311,10 @@ li > .badgeButton {
 }
 
 .clipboardEditor ol {
-       border: 1px solid rgba(0, 0, 0, .2);
+       border: 1px solid rgba(255, 255, 255, .7);
        border-radius: 5px;
        background-color: rgba(0, 0, 0, .7);
-       margin-top: 25px;
+       margin-top: 20px;
        position: absolute;
        top: 0;
        left: 0;
@@ -2327,12 +2324,9 @@ li > .badgeButton {
        -ms-box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
        -o-box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
        box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
-       
-       
 }
 
 .clipboardEditor li {
-       font-size: .85em;
        text-shadow: none;
        color: #ccc;
        cursor: pointer; 
@@ -2357,7 +2351,7 @@ li > .badgeButton {
 
 .clipboardEditor li:hover {
        color: #fff;
-       background-color: rgba(0, 0, 0, .1);
+       background-color: rgba(0, 0, 0, .5);
 }
 
 .clipboardEditor li:first-child {
@@ -2368,6 +2362,8 @@ li > .badgeButton {
 
 
 
+/* ToDo: Proxy Loading */
+
 .actionProxyLoading {
        
 }

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index d73db04dfedb23ea613e3cf6fc38e991c5d97140..9db4419f4f521cd28066a5ebe980e69ff369f463 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -51,7 +51,7 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteM.png" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                       <li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
@@ -99,7 +99,7 @@
 <div class="contentFooter">
        <nav class="largeButtons">
                <ul>
-                       <li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteM.png" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                       <li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php?action=CacheClear{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index 9287c9b92293bbf4610e3343f585c6c758e9639e..760ffb75f1e7ef7c17befc095424f4b2b3a6659b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -21,8 +21,8 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?page=CronjobList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.cronjob.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobM.png" alt="" /> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
-                       {if $action == 'edit'}<li><a href="index.php?action=CronjobExecute&amp;cronjobID={@$cronjobID}{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobExecuteM.png" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
+                       <li><a href="index.php?page=CronjobList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.cronjob.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/time1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
+                       {if $action == 'edit'}<li><a href="index.php?action=CronjobExecute&amp;cronjobID={@$cronjobID}{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
                </ul>
        </nav>
 </div>

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 7a5f1fb82678c00e32f192c68ac25a8172fe5538..a9b89781663413359bb5c7b1f09354dbda97b850 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -41,7 +41,7 @@
        
        {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
                <nav class="largeButtons">
-                       <ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
+                       <ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
                </nav>
        {/if}
 </div>
@@ -79,9 +79,9 @@
                                <tr class="cronjobRow">
                                        <td class="columnIcon">
                                                {if $__wcf->session->getPermission('admin.system.cronjob.canEditCronjob')}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/play1.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" data-objectID="{@$cronjob->cronjobID}" class="executeButton balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" data-objectID="{@$cronjob->cronjobID}" class="executeButton balloonTooltip" />
                                                {else}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/play1D.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/run1D.svg" alt="" title="{lang}wcf.acp.cronjob.execute{/lang}" />
                                                {/if}
                                                
                                                {if $cronjob->canBeDisabled()}
@@ -138,7 +138,7 @@
                
                {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
                        <nav class="largeButtons">
-                               <ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/cronjobAddM.png" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
+                               <ul><li><a href="index.php?form=CronjobAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
                        </nav>
                {/if}
        </div>

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 6db5cdcfaf06afa270b55f78c269b96273d038ed..3a7e27e8f7f9285cf68d161aeb6248a167baac5c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -24,7 +24,7 @@
        {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}
                <nav class="largeButtons">
                        <ul>
-                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageInstallM.png" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
+                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                        </ul>
                </nav>
@@ -99,7 +99,7 @@
        {if $__wcf->session->getPermission('admin.system.package.canInstallPackage') || $additionalLargeButtons|isset}
                <nav class="largeButtons">
                        <ul>
-                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageInstallM.png" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
+                               {if $__wcf->session->getPermission('admin.system.package.canInstallPackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=install{@SID_ARG_2ND}" title="{lang}wcf.acp.package.startInstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.package.startInstall{/lang}</span></a></li>{/if}
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                        </ul>
                </nav>

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 45becc92e694e5958384dd4d0a118168b3919187..99352d2aedf67ab385d4b7a33d52b6638a0a9b20 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -21,7 +21,7 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?page=PackageList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageM.png" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+                       <li><a href="index.php?page=PackageList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index 1473140fe98c87fb88d72b6dd8fa41ea6ebdab8a..4a062eff0c3dcbca929c9d6e90b28e4b17a426c0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -9,7 +9,7 @@
 </script>
 
 <header class="mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/packageUninstallL.png" alt="" />
+       <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" />
        <hgroup>
                <h1>{lang}wcf.acp.package.uninstall{/lang}: {$packageObj->getName()}</h1>
                <h2>{$packageObj->packageDescription}</h2>
@@ -93,14 +93,14 @@
                                <tr>
                                        <td class="columnIcon">
                                                {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                                       <a href="index.php?form=PackageStartInstall&amp;action=update&amp;packageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateS.png" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
+                                                       <a href="index.php?form=PackageStartInstall&amp;action=update&amp;packageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
                                                {else}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/packageUpdateDisabledS.png" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/updateD1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
                                                {/if}
                                                {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID}
-                                                       <a onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" href="index.php?page=Package&amp;action=startUninstall&amp;packageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/deleteS.png" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="balloonTooltip" /></a>
+                                                       <a onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" href="index.php?page=Package&amp;action=startUninstall&amp;packageID={@$package.packageID}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="balloonTooltip" /></a>
                                                {else}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/deleteDisabledS.png" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/deleteD1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
                                                {/if}
                                                
                                                {if $package.additionalButtons|isset}{@$package.additionalButtons}{/if}
@@ -108,11 +108,11 @@
                                        <td class="columnID"><p>{@$package.packageID}</p></td>
                                        <td class="columnIcon">
                                                {if $package.standalone}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/packageTypeStandaloneS.png" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
                                                {elseif $package.parentPackageID}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/packageTypePluginS.png" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
                                                {else}
-                                                       <img src="{@RELATIVE_WCF_DIR}icon/packageS.png" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                {/if}
                                        </td>
                                        <td class="columnTitle" title="{$package.packageDescription}"><p><a href="index.php?page=PackageView&amp;packageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
index 6486042e30b8fede61758174473b3729e6d46ace..0391c88c1080770ea22cc2a8b94a42ade3ff6e40 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
 <header class="mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/packageUpdateL.png" alt="" />
+       <img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" />
        <hgroup>
                <h1>{lang}wcf.acp.packageUpdate.auth{/lang}</h1>
        </hgroup>

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 8a8ec218bf77bf7f76225f737a3054e6d1166d25..2b8527f7b77f5807ed0a7913ae2dcbd6048d3937 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -97,10 +97,10 @@
        <nav class="largeButtons">
                <ul>
                        {if PACKAGE_ID != $package->packageID}
-                               {if $package->standalone && $package->package != 'com.woltlab.wcf'}<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageMakeActiveM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>{/if}
-                               {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}<li><a href="index.php?page=Package&amp;action=startUninstall&amp;packageID={@$package->packageID}{@SID_ARG_2ND}" onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.view.button.uninstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageUninstallM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.uninstall{/lang}</span></a></li>{/if}
+                               {if $package->standalone && $package->package != 'com.woltlab.wcf'}<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/switch1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>{/if}
+                               {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}<li><a href="index.php?page=Package&amp;action=startUninstall&amp;packageID={@$package->packageID}{@SID_ARG_2ND}" onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.view.button.uninstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.uninstall{/lang}</span></a></li>{/if}
                        {/if}
-                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=update&amp;packageID={@$package->packageID}{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageUpdateM.png" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}
+                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="index.php?form=PackageStartInstall&amp;action=update&amp;packageID={@$package->packageID}{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
@@ -117,11 +117,11 @@
                <table id="requiredPackages">
                        <thead>
                                <tr class="tableHead">
-                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.id{/lang}</p></th>
-                                       <th colspan="2"><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
-                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.author{/lang}</p></th>
-                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
-                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.date{/lang}</p></th>
+                                       <th colspan="2" class="columnID">{lang}wcf.acp.package.list.id{/lang}</th>
+                                       <th colspan="2" class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
+                                       <th class="columnText">{lang}wcf.acp.package.list.author{/lang}</th>
+                                       <th class="columnText">{lang}wcf.acp.package.list.version{/lang}</th>
+                                       <th class="columnDigits">{lang}wcf.acp.package.list.date{/lang}</th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>
@@ -175,7 +175,7 @@
 
 {if $dependentPackages|count > 0}
        <div class="border boxTitle">
-               <a onclick="openList('dependentPackages')"><img id="dependentPackagesImage" src="{@RELATIVE_WCF_DIR}icon/close.svg" alt="" /></a>
+               <a data-isOpen="1" data-collapsibleContainer="dependentPackages" class="collapsible"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
                <hgroup>
                        <h1><a onclick="openList('dependentPackages')">{lang}wcf.acp.package.view.dependentPackages{/lang}</a></h1>
                        <h2>{lang}wcf.acp.package.view.dependentPackages.description{/lang}</h2>

diff --git a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
index f11cb61f8c41d35e0ae17e21a35c3aadd0629254..f64be565a3ef1945db7cab350d0d3f6ddc80435b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerAdd.tpl
@@ -21,7 +21,7 @@
 
 <div class="contentHeader">
        <nav class="largeButtons">
-               <ul><li><a href="index.php?page=UpdateServerList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.server.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerM.png" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li></ul>
+               <ul><li><a href="index.php?page=UpdateServerList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.package.server.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/server1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li></ul>
        </nav>
 </div>
 

diff --git a/wcfsetup/install/files/acp/templates/updateServerList.tpl b/wcfsetup/install/files/acp/templates/updateServerList.tpl
index e4c0839333c1982078d096a3d49835836db58bc8..1297124989e77c84f7e60e0c0cb9818d1c796554 100644 (file)
--- a/wcfsetup/install/files/acp/templates/updateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/updateServerList.tpl
@@ -22,7 +22,7 @@
 
 <div class="contentHeader">
        <nav class="largeButtons">
-               <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
+               <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
        </nav>
 </div>
 
@@ -77,7 +77,7 @@
        
        <div class="contentFooter">
                <nav class="largeButtons">
-                       <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/updateServerAddM.png" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
+                       <ul><li><a href="index.php?form=UpdateServerAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
                </nav>
        </div>
 {/if}

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index b65fbb0f7fdf69da7a7c739d30cd1cb46f4fd8a2..ac565dbe870a94884a2926e080da0c6fa7eb0a8b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -72,8 +72,8 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 4acdf3cb8cc72047d9d91fe95d3583c14ecd5095..e5ebbed7ae9553048524b0dde6329cb0f6e64456 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -30,7 +30,7 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?page=UserGroupList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.group.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupM.png" alt="" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
+                       <li><a href="index.php?page=UserGroupList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.group.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 74e5aab7a478f71a6350b17a5e226f24aa06118d..465a451f557f68aadd392d3ef372cebb1ac8de1c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -31,7 +31,7 @@
        {pages print=true assign=pagesLinks link="index.php?page=UserGroupList&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED}
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?form=UserGroupAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupAddM.png" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+                       <li><a href="index.php?form=UserGroupAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}                       
                </ul>
        </nav>
@@ -95,7 +95,7 @@
        {@$pagesLinks}
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?form=UserGroupAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupAddM.png" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+                       <li><a href="index.php?form=UserGroupAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 5631f5c05dac0ebf46b339cb8cb9432aa75abfa0..7729d0ed83a5b28a6793c23d2d86c0d8e5f62999 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -25,9 +25,9 @@
        <nav class="largeButtons">
                <ul>
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                               <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                               <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
-                       <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                       <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
@@ -100,9 +100,9 @@
                <nav class="largeButtons">
                        <ul>
                                {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                                       <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                                       <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                                {/if}
-                               <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                               <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                        </ul>
                </nav>

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index 4014fe6d018847c84b4dfc58c449a54eac43a7a1..ff1fc6b8fca19a459bf4e9657b387d1d1451cd79 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -34,8 +34,8 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/searchM.png" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       <li><a href="index.php?form=UserSearch{@SID_ARG_2ND}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index dda6f469d50b391def3c3dff6617abc6faad8a9a..6e7daf4019ea2815ce0209f244c26e16f3875c4d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -29,9 +29,9 @@
        <nav class="largeButtons">
                <ul>
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                               <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userAddM.png" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                               <li><a href="index.php?form=UserAdd{@SID_ARG_2ND}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
-                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/usersM.png" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       <li><a href="index.php?page=UserList{@SID_ARG_2ND}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                </ul>
        </nav>
 </div>