Removed links to PNG icons, fixed tabbed view without form elements, indented view...

Also restored my changes in UserGroupAdd.tpl, which were lost after
Alex's last commit. ;-)

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 6cbbc002ecd7efe122121f010706ca9c38e7b0ac..808cd7cbfcd4c2c39f55c16c2ab89e116b2c9bd6 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -533,10 +533,6 @@ dl {
        position: relative;
 }
 
-dl.disabled > dt {
-       color: #777;
-}
-
 dl > dt {
        color: #69c;
        float: left;
@@ -545,8 +541,18 @@ dl > dt {
        margin-top: 5px; /* not so nice */
 }
 
+dl > dt > label {
+       margin-top: 5px;
+       display: block;
+}
+
+dl.disabled > dt {
+       color: #777;
+}
+
 dl > dd {
        margin-left: 250px;
+       padding-top: 5px;
 }
 
 dl > dd > small {
@@ -559,7 +565,8 @@ dl > dd > small {
 /* Nested */
 
 dl > dd > fieldset {
-       
+       margin-top: 0;
+       margin-bottom: 0;
 }
 
 dl > dd > fieldset > legend {
@@ -613,46 +620,17 @@ label {
 
 /* Structure */
 
-/* Form Element (deprecated) */
-
-.formElement {
-       clear: both;
-       margin-bottom: 14px;
-}
-
-/* Form Group (deprecated) */
-
-.formGroup {
-       margin-top: 10px;
-}
-
-.formGroup .formGroupLabel {
-       text-align: right;
-       margin-top: 7px;
-       float: left;
-       width: 233px;
-}
-
-.formGroup .formGroupField {
-       display: block;
-       margin-left: 250px;
-}
-
-.formGroup .formGroupField div.formField label {
-       display: block;
-}
-
-.formGroup .formGroupField fieldset legend {
-       display: none;
-}
-
-/* Form Group (deprecated) */
-
 .formSubmit {
        text-align: center;
        margin-top: 15px;
 }
 
+input[type='checkbox'] ~ small,
+input[type='radio'] ~ small {
+       margin-top: 0;
+       margin-left: 21px;
+}
+
 /* Form Elements */
 
 input[type='reset'],
@@ -1615,6 +1593,8 @@ div.ui-widget-overlay {
        color: #666;
        border: 1px solid #999;
        background-color: #fff;
+       margin-right: 0;
+       margin-left: 0;
        padding: 3px 10px 5px;
        
        background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 827cb98de5df80d0d11cc2b0eaac55b83e34102d..a2fa5a0dfc54dfca91f08f6a2c61304aa81a6a63 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -15,21 +15,21 @@
        <legend>{lang}wcf.acp.cache.data{/lang}</legend>
        
        <dl>
-               <dt><label>{lang}wcf.acp.cache.data.source{/lang}</label></dt>
+               <dt>{lang}wcf.acp.cache.data.source{/lang}</dt>
                <dd>{$cacheData.source}</dd>
        </dl>
        {if $cacheData.version}
                <dl>
-                       <dt><label>{lang}wcf.acp.cache.data.version{/lang}</label></dt>
+                       <dt>{lang}wcf.acp.cache.data.version{/lang}</dt>
                        <dd>{$cacheData.version}</dd>
                </dl>
        {/if}
        <dl>
-               <dt><label>{lang}wcf.acp.cache.data.size{/lang}</label></dt>
+               <dt>{lang}wcf.acp.cache.data.size{/lang}</dt>
                <dd>{@$cacheData.size|filesize}</dd>
        </dl>
        <dl>
-               <dt><label>{lang}wcf.acp.cache.data.files{/lang}</label></dt>
+               <dt>{lang}wcf.acp.cache.data.files{/lang}</dt>
                <dd>{#$cacheData.files}</dd>
        </dl>
        

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index e4d3869ac2c84ee78542a62a4fb35b2c32c29a46..5762e1828435036df6bcf42dba5c848ea5a93f46 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -67,7 +67,7 @@
        {/if}
        <dl>
                <dt>{lang}wcf.acp.package.view.author{/lang}</dt>
-               <dd>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</dd>
+               <dd>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="badge badgeButton externalURL">{$package->author}</a>{else}{$package->author}{/if}</dd>
        </dl>
        
        {if $additionalFields|isset}{@$additionalFields}{/if}
@@ -96,7 +96,7 @@
 
 {if $requiredPackages|count > 0}
        <div class="border boxTitle">
-               <a onclick="openList('requiredPackages')"><img id="requiredPackagesImage" src="{@RELATIVE_WCF_DIR}icon/minusS.png" alt="" /></a>
+               <a onclick="openList('requiredPackages')"><img id="requiredPackagesImage" src="{@RELATIVE_WCF_DIR}icon/close.svg" alt="" /></a>
                <hgroup>
                        <h1><a onclick="openList('requiredPackages')">{lang}wcf.acp.package.view.requiredPackages{/lang}</a></h1>
                        <h2>{lang}wcf.acp.package.view.requiredPackages.description{/lang}</h2>
@@ -120,14 +120,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}" /></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/update1D.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}" /></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/delete1D.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
                                                {/if}
                                                
                                                {if $package.additionalButtons|isset}{@$package.additionalButtons}{/if}
@@ -135,11 +135,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}" />
+                                                       <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}" />
+                                                       <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}" />
+                                                       <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                {/if}
                                        </td>
                                        <td class="columnText" 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>
@@ -163,7 +163,7 @@
 
 {if $dependentPackages|count > 0}
        <div class="border boxTitle">
-               <a onclick="openList('dependentPackages')"><img id="dependentPackagesImage" src="{@RELATIVE_WCF_DIR}icon/minusS.png" alt="" /></a>
+               <a onclick="openList('dependentPackages')"><img id="dependentPackagesImage" src="{@RELATIVE_WCF_DIR}icon/close.svg" alt="" /></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>
@@ -187,14 +187,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/update1D.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/delete1D.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
                                                {/if}
                                                
                                                {if $package.additionalButtons|isset}{@$package.additionalButtons}{/if}
@@ -202,11 +202,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="columnText" 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/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 28dae03181bbd8163b9cf1fac4342c91ec0fe26c..eae70f5cf08a5d1c97dc7c035fbda3be9f4ae16c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -9,7 +9,7 @@
 </script>
 
 <header class="mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/userGroup{@$action|ucfirst}L.png" alt="" />
+       <img src="{@RELATIVE_WCF_DIR}icon/{@$action}1.svg" alt="" />
        <hgroup>
                <h1>{lang}wcf.acp.group.{@$action}{/lang}</h1>
        </hgroup>
@@ -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.view{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/userGroupM.png" alt="" /> <span>{lang}wcf.acp.menu.link.group.view{/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/userGroupM.png" alt="" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
@@ -38,6 +38,7 @@
 
 <form method="post" action="index.php?form=UserGroup{@$action|ucfirst}">
        <div class="border content">
+               
                <fieldset>
                        <legend>{lang}wcf.acp.group.data{/lang}</legend>