From: Marcel Werk Date: Fri, 11 May 2012 16:57:21 +0000 (+0200) Subject: Icon overhaul / new icon naming scheme X-Git-Tag: 2.0.0_Beta_1~1114 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1fdaa516cc043f2c495ea926f984e627a1855c72;p=GitHub%2FWoltLab%2FWCF.git Icon overhaul / new icon naming scheme --- diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl index 3562530d9e..e49c87a27b 100644 --- a/com.woltlab.wcf/template/footer.tpl +++ b/com.woltlab.wcf/template/footer.tpl @@ -13,9 +13,9 @@ {include file='footerMenu'} diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl index edd944ff89..e5070bb11a 100644 --- a/com.woltlab.wcf/template/headInclude.tpl +++ b/com.woltlab.wcf/template/headInclude.tpl @@ -68,15 +68,15 @@ }); WCF.Icon.addObject({ - 'wcf.icon.loading': '{icon size='S'}spinner1{/icon}', - 'wcf.icon.opened': '{icon size='S'}opened2{/icon}', - 'wcf.icon.closed': '{icon size='S'}closed2{/icon}', + 'wcf.icon.loading': '{icon size='S'}spinner{/icon}', + 'wcf.icon.opened': '{icon size='S'}arrowDownInverse{/icon}', + 'wcf.icon.closed': '{icon size='S'}arrowRightInverse{/icon}', 'wcf.icon.previous': '{icon size='S'}previous1{/icon}', 'wcf.icon.previous.disabled': '{icon size='S'}previous1D{/icon}', 'wcf.icon.next': '{icon size='S'}next1{/icon}', 'wcf.icon.next.disabled': '{icon size='S'}next1D{/icon}', - 'wcf.icon.dropdown': '{icon size='S'}dropdown1{/icon}', - 'wcf.icon.edit': '{icon size='S'}edit1{/icon}' + 'wcf.icon.dropdown': '{icon size='S'}dropdown{/icon}', + 'wcf.icon.edit': '{icon size='S'}edit{/icon}' {event name='javascriptIconImport'} }); diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl index 0cca1ffa06..3cf7e8985d 100644 --- a/com.woltlab.wcf/template/header.tpl +++ b/com.woltlab.wcf/template/header.tpl @@ -39,7 +39,7 @@ {include file='mainMenuSubMenu'} diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index 82f6fa149f..c1b7ed07db 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -36,7 +36,7 @@ {foreach from=$objects item=sessionLog}

{@$sessionLog->sessionLogID}

-

{if $__wcf->user->userID == $sessionLog->userID}{/if} {$sessionLog->username}

+

{if $__wcf->user->userID == $sessionLog->userID}{/if} {$sessionLog->username}

{$sessionLog->ipAddress}{if $sessionLog->hostname != $sessionLog->ipAddress}
{$sessionLog->hostname}{/if}

{$sessionLog->userAgent}

{@$sessionLog->time|time}

diff --git a/wcfsetup/install/files/acp/templates/ajaxException.tpl b/wcfsetup/install/files/acp/templates/ajaxException.tpl index 6e5750ba93..b63ae1f64f 100644 --- a/wcfsetup/install/files/acp/templates/ajaxException.tpl +++ b/wcfsetup/install/files/acp/templates/ajaxException.tpl @@ -1,3 +1,3 @@ -

{$message}

+

{$message}

{$stacktrace}
\ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 83082ecd24..26dbebc33d 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -3,13 +3,10 @@
@@ -52,7 +49,7 @@