Replace legacy icons

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 239a3ba4b0448d2c19fd307c6f5027ee3f8c9d77..190802ee8912f28a0ac7bca1781065904de4f31e 100644 (file)
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -171,7 +171,11 @@
                <div class="contentHeaderTitle">
                        <h1 class="contentTitle">
                                <span class="userProfileUsername">{$user->username}</span>
-                               {if $user->banned}<span class="icon icon24 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/if}
+                               {if $user->banned}
+                                       <span class="jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}">
+                                               {icon size=24 name='lock'}
+                                       </span>
+                               {/if}
                                {if MODULE_USER_RANK}
                                        {if $user->getUserTitle()}
                                                <span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>

diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index 2382c4d7b394407cd31f0224cd5a4d43954d12af..3900056b9bc41a6d625954bcb2b924286a63b3a8 100644 (file)
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -10,7 +10,7 @@
 
 <div class="section">
        <div class="box64 userException">
-               <span class="icon icon64 fa-exclamation-circle userExceptionIcon"></span>
+               {icon size=64 name='circle-exclamation'}
                <p id="errorMessage" class="fullPageErrorMessage userExceptionMessage" data-exception-class-name="{$exceptionClassName}">
                        {@$message}
                </p>

diff --git a/com.woltlab.wcf/templates/userInformationHeadline.tpl b/com.woltlab.wcf/templates/userInformationHeadline.tpl
index bf8832024a61c623c2bc21fbbe664ca20f79aac2..e5b7641d9276716570179033ddbceb71ee8a6b4d 100644 (file)
--- a/com.woltlab.wcf/templates/userInformationHeadline.tpl
+++ b/com.woltlab.wcf/templates/userInformationHeadline.tpl
@@ -1,5 +1,11 @@
 <div class="containerHeadline">
-       <h3>{user object=$user class='username'}{if $user->banned} <span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}"></span>{/if}
+       <h3>
+               {user object=$user class='username'}
+               {if $user->banned}
+                       <span class="jsTooltip jsUserBanned" title="{lang}wcf.user.banned{/lang}">
+                               {icon size=16 name='lock'}
+                       </span>
+               {/if}
                {if MODULE_USER_RANK}
                        {if $user->getUserTitle()}
                                <span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>

diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 75e56bfadba672bb947f57225c0fe4a3171c1503..fc03e1adfe221111e17236794bb3b6bfff7ba231 100644 (file)
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -29,7 +29,9 @@
                        {foreach from=$__wcf->getNoticeHandler()->getVisibleNotices() item='notice'}
                                <div class="{$notice->cssClassName} notice{if $notice->isDismissible} noticeDismissible active{/if}" role="status">
                                        {if $notice->isDismissible}
-                                               <span role="button" tabindex="0" class="icon icon16 fa-times pointer jsDismissNoticeButton jsTooltip" data-object-id="{$notice->noticeID}" title="{lang}wcf.notice.button.dismiss{/lang}"></span>
+                                               <button class="jsDismissNoticeButton jsTooltip" data-object-id="{$notice->noticeID}" title="{lang}wcf.notice.button.dismiss{/lang}">
+                                                       {icon size=16 name='xmark'}
+                                               </button>
                                        {/if}
                                        
                                        {@$notice}

diff --git a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
index 2c35dcf174ab79ddd0aa83fc4039a407f85fbf9d..e5340c19ad55483dc555fd7101cf70bef9b51733 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__bbcodeAttributesFormField.tpl
@@ -1,6 +1,11 @@
 {capture assign='attributeTemplate'}
        <section class="section">
-               <h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang __literal=true}wcf.acp.bbcode.numberedAttribute{/lang}</span></h2>
+               <h2 class="sectionTitle">
+                       <button type="button" class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+                               {icon size=16 name='xmark'}
+                       </button>
+                       <span>{lang __literal=true}wcf.acp.bbcode.numberedAttribute{/lang}</span>
+               </h2>
                
                <dl>
                        <dt>
@@ -95,7 +100,12 @@
                var parentContainer = elById('{@$field->getParent()->getPrefixedId()}Container');
                
                var parentTitle = DomTraverse.childBySel(parentContainer, 'h2.sectionTitle');
-               parentTitle.innerHTML = '<span class="icon icon16 fa-plus pointer jsTooltip" id="{@$field->getPrefixedId()}AddAttribute" title="{lang}wcf.global.button.add{/lang}"></span> ' + parentTitle.innerHTML;
+               parentTitle.innerHTML = `
+                       <button class="jsTooltip" id="{@$field->getPrefixedId()}AddAttribute" title="{lang}wcf.global.button.add{/lang}">
+                               {icon size=16 name='plus'}
+                       </button>
+                       ${parentTitle.innerHTML}
+               `;
                
                DomChangeListener.trigger();
                
@@ -128,7 +138,12 @@
 
 {foreach from=$field->getValue() key=attributeNumber item=attributeData name=bbcodeAttributes}
        <section class="section">
-               <h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.numberedAttribute{/lang}</span></h2>
+               <h2 class="sectionTitle">
+                       <button class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+                               {icon size=16 name='xmark'}
+                       </button>
+                       <span>{lang}wcf.acp.bbcode.numberedAttribute{/lang}</span>
+               </h2>
                
                <dl>
                        <dt>

diff --git a/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl b/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl
index 39ef0cd199bbee7f8a12b6700a39a55b9e50cf5f..bf5d047ce2384c71cc7419ad0c83c8fe4e04c8b7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsMissingLanguageItemStackTrace.tpl
@@ -1,4 +1,6 @@
-<span class="icon icon16 fa-align-justify jsTooltip pointer jsOutputFormatToggle" title="{lang}wcf.acp.devtools.missingLanguageItem.stackTrace.toggleOutputFormat{/lang}" style="margin-bottom: 10px"></span>
+<button type="button" class="jsTooltip jsOutputFormatToggle" title="{lang}wcf.acp.devtools.missingLanguageItem.stackTrace.toggleOutputFormat{/lang}" style="margin-bottom: 10px">
+       {icon size=16 name='align-justify'}
+</button>
 
 <pre>{*
        *}{foreach from=$stackTrace item=stackEntry name=stackEntries}{*

diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
index 8f3fcd7e21844f2adfa0fca313a57d4046436a0d..16c6e767dca1fedc7b956574db6ed1a68db16584 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
@@ -39,8 +39,12 @@
                        <header class="sectionHeader">
                                <h2 class="sectionTitle">
                                        {literal}{if $type === 'update'}{/literal}
-                                               <span class="icon icon16 fa-pencil pointer jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_editButton" title="{lang}wcf.global.button.edit{/lang}"></span>
-                                               <span class="icon icon16 fa-times pointer jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_deleteButton" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                               <button class="jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_editButton" title="{lang}wcf.global.button.edit{/lang}">
+                                                       {icon size=16 name='pencil'}
+                                               </button>
+                                               <button class="jsTooltip" id="{@$field->getPrefixedId()}_instructions{literal}{$instructionsId}{/literal}_deleteButton" title="{lang}wcf.global.button.delete{/lang}">
+                                                       {icon size=16 name='xmark'}
+                                               </button>
                                        {literal}{/if}{/literal}
                                        {literal}<span class="jsInstructionsTitle">{$sectionTitle}</span>{/literal}
                                </h2>

diff --git a/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl b/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl
index 3e9817995ab4713ca07a29a519535dce6871a4bf..66b3c838a6bdcac536801018b6bbf881e06f480a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl
+++ b/wcfsetup/install/files/acp/templates/__objectActionDeleteIcon.tpl
@@ -1,5 +1,7 @@
-<span class="icon icon16 fa-times jsObjectAction jsTooltip pointer" {*
+<button type="button" class="jsObjectAction jsTooltip" {*
     *}title="{lang}wcf.global.button.delete{/lang}"  {*
     *}data-object-action="delete" {*
     *}{if $objectActionConfirmMessage}data-confirm-message="{lang __encode=true}{$objectActionConfirmMessage}{/lang}" {/if}{*
-*}></span>
+*}>
+    {icon size=16 name='xmark'}
+</button>

diff --git a/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl b/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl
index b4c22f983c769d0e80373c77fbaf5c9904dab5d3..7b3f4389cfe050cf494fd3b86c97f6f9589d48b2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl
+++ b/wcfsetup/install/files/acp/templates/__objectActionToogleIcon.tpl
@@ -1,4 +1,10 @@
-<span class="icon icon16 fa-{if !$object->isDisabled}check-{/if}square-o jsObjectAction jsTooltip pointer" {*
+<button type="button" class="jsObjectAction jsTooltip" {*
     *}title="{lang}wcf.global.button.{if !$object->isDisabled}disable{else}enable{/if}{/lang}" {*
     *}data-object-action="toggle"{*
-*}></span>
+*}>
+    {if $object->isDisabled}
+        {icon size=16 name='square-check'}
+    {else}
+        {icon size=16 name='square'}
+    {/if}
+</button>

diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
index 04043a6d2228507816702b2d513fcc0fff6f03dd..e6ce1bdc4f07f928e2b03505071d3a3691e770a8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
@@ -5,13 +5,13 @@
                        <p>{lang}wcf.acp.option.url_omit_index_php.test.running{/lang}</p>
                </div>
                <div id="dialogRewriteTestSuccess" class="box24" style="display: none">
-                       <span class="icon icon24 fa-check green"></span>
+                       {icon size=24 name='check'}
                        <p>{lang}wcf.acp.option.url_omit_index_php.test.success{/lang}</p>
                </div>
                
                <div id="dialogRewriteTestFailure" style="display: none">
                        <div class="box24">
-                               <span class="icon icon24 fa-times red"></span>
+                               {icon size=24 name='triangle-exclamation'}
                                <p>{lang}wcf.acp.option.url_omit_index_php.test.failure{/lang}</p>
                        </div>
                        <p>{lang}wcf.acp.option.url_omit_index_php.test.failure.description{/lang}</p>

diff --git a/wcfsetup/install/files/acp/templates/adList.tpl b/wcfsetup/install/files/acp/templates/adList.tpl
index 4e2c149861e03db4cf58165ad42fa18a3a4ffd24..022c3fdd86f0abfb347d9650b1170c913dd8d7f1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/adList.tpl
+++ b/wcfsetup/install/files/acp/templates/adList.tpl
@@ -39,7 +39,9 @@
                                                <a href="{link controller='AdEdit' object=$ad}{/link}">{$ad->adName}</a>
                                                
                                                <span class="statusDisplay sortableButtonContainer">
-                                                       <span class="icon icon16 fa-arrows sortableNodeHandle"></span>
+                                                       <span class="sortableNodeHandle">
+                                                               {icon size=16 name='arrows-up-down-left-right'}
+                                                       </span>
                                                        {objectAction action="toggle" isDisabled=$ad->isDisabled}
                                                        <a href="{link controller='AdEdit' object=$ad}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                        {objectAction action="delete" objectTitle=$ad->getTitle()}

diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl
index 7e2ed5afb6c03f9c86e938c2812585f5bb4e1993..c49bdf8895fea7071432c7eff5ac111537da2aef 100644 (file)
--- a/wcfsetup/install/files/acp/templates/articleList.tpl
+++ b/wcfsetup/install/files/acp/templates/articleList.tpl
@@ -148,7 +148,9 @@
                                                                <a href="#" class="jsButtonDelete jsTooltip" title="{lang}wcf.global.button.delete{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.delete.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='xmark'}</a>
                                                                <a href="#" class="jsButtonTrash jsTooltip" title="{lang}wcf.global.button.trash{/lang}" data-confirm-message-html="{lang __encode=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}>{icon size=16 name='xmark'}</a>
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        <a href="{$article->getLink()}" title="{lang}wcf.acp.article.button.viewArticle{/lang}" class="jsTooltip">{icon size=16 name='magnifying-glass'}</a>

diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index 50a88f127a98ad3eece7adf32a732a88190a1025..fe339cd6e0d7e132f48d8f12744e170ad94e2412 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -2,7 +2,12 @@
 
 {capture assign='attributeTemplate'}
        <section class="section">
-               <h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {ldelim}#$attributeNo}</span></h2>
+               <h2 class="sectionTitle">
+                       <button type="button" class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+                               {icon size=16 name='xmark'}
+                       </button>
+                       <span>{lang}wcf.acp.bbcode.attribute{/lang} {ldelim}#$attributeNo}</span>
+               </h2>
                
                <dl>
                        <dt><label for="attributes[{ldelim}@$attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
@@ -207,11 +212,21 @@
        </div>
                
        <section class="section" id="attributeFieldset">
-               <h2 class="sectionTitle"><span class="icon icon16 fa-plus pointer jsAddButton jsTooltip" title="{lang}wcf.global.button.add{/lang}"></span> {lang}wcf.acp.bbcode.attributes{/lang}</h2>
+               <h2 class="sectionTitle">
+                       <button type="button" class="jsAddButton jsTooltip" title="{lang}wcf.global.button.add{/lang}">
+                               {icon size=16 name='plus'}
+                       </button>
+                       {lang}wcf.acp.bbcode.attributes{/lang}
+               </h2>
                
                {foreach from=$attributes item='attribute'}
                        <section class="section">
-                               <h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {#$attribute->attributeNo}</span></h2>
+                               <h2 class="sectionTitle">
+                                       <button type="button" class="jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}">
+                                               {icon size=16 name='xmark'}
+                                       </button>
+                                       <span>{lang}wcf.acp.bbcode.attribute{/lang} {#$attribute->attributeNo}</span>
+                               </h2>
                                
                                <dl{if $errorField == 'attributeHtml'|concat:$attribute->attributeNo} class="formError"{/if}>
                                        <dt><label for="attributes[{@$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>

diff --git a/wcfsetup/install/files/acp/templates/bbcodeList.tpl b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
index c5dfd1b27b84ce1dd9dedb1bd4dcbd1d20212539..94491751ecae9ec40eca20380b50581f9e139513 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
@@ -41,7 +41,9 @@
                                                        {if $bbcode->canDelete()}
                                                                {objectAction action="delete" objectTitle=$bbcode->getTitle()}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index 7c71473dd65e980870cce31bfb5facfe1a9e3037..1120a0c3cd7ce8e1cb600df78aa4e636e59a443a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -122,7 +122,9 @@
                                                        {if $box->canDelete()}
                                                                {objectAction action="delete" objectTitle=$box->name}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/contactSettings.tpl b/wcfsetup/install/files/acp/templates/contactSettings.tpl
index 80d0d14e7cf0a76736b36953c769fe3cabaada76..28893ba8af86657ed5102f8457151d092b8cf247 100644 (file)
--- a/wcfsetup/install/files/acp/templates/contactSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/contactSettings.tpl
@@ -55,7 +55,9 @@
                                                        {if $option->canDelete()}
                                                                {objectAction action="delete" objectTitle=$option->getTitle()}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='rowButtons'}
@@ -92,7 +94,9 @@
                                                        {objectAction action="toggle" isDisabled=$recipient->isDisabled}
                                                        <a href="{link controller='ContactRecipientEdit' id=$recipient->recipientID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
                                                        {if $recipient->originIsSystem}
-                                                               <span class="icon icon16 fa-times disabled"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {else}
                                                                {objectAction action="delete" objectTitle=$recipient->getName()}
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index ccd4978b739d470c800f876caefa5bc113fa3387..7ac8708bfb6c89ca0f04f87c24e524c848c08fff 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -65,12 +65,16 @@
                                                                {if $cronjob->isEditable()}
                                                                        <a href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                                {else}
-                                                                       <span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
+                                                                       <span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+                                                                               {icon size=16 name='pencil'}
+                                                                       </span>
                                                                {/if}
                                                                {if $cronjob->isDeletable()}
                                                                        {objectAction action="delete" objectTitle=$cronjob->getDescription()}
                                                                {else}
-                                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                                       <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                               {icon size=16 name='xmark'}
+                                                                       </span>
                                                                {/if}
                                                                
                                                                {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index 0ad3713b8ab34f12855e088496782050e5103a5a..65ffeab659ea6281994c34db40661f1d3ed3f1ef 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -55,7 +55,9 @@
                                                        {if $language->isDeletable()}
                                                                {objectAction action="delete" objectTitle=$language->languageName}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl
index 085b6ee629ccd74a9f7d732c7cbd87afbfbc44a5..129a528c91280c8e2e21875f617562b22df9a804 100644 (file)
--- a/wcfsetup/install/files/acp/templates/menuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl
@@ -50,7 +50,9 @@
                                                                {if $menuItemNode->canDelete()}
                                                                        {objectAction action="delete" objectTitle=$menuItemNode->getTitle()}
                                                                {else}
-                                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                                       <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                               {icon size=16 name='xmark'}
+                                                                       </span>
                                                                {/if}
                                                                
                                                                {event name='itemButtons'}

diff --git a/wcfsetup/install/files/acp/templates/menuList.tpl b/wcfsetup/install/files/acp/templates/menuList.tpl
index 5e4c2124bd5f444220aad5b80db7513454438dc0..b7d45b1789799fff776c41aeba01bfc8bdcd368d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@ -43,7 +43,9 @@
                                                        {if $menu->canDelete()}
                                                                {objectAction action="delete" objectTitle=$menu->getTitle()}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        <a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip">{icon size=16 name='list'}</a>
                                                        <a href="{link controller='MenuItemAdd'}menuID={@$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.add{/lang}" class="jsTooltip">{icon size=16 name='plus'}</a>

diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 446e009cb969f1b1d44930b194ebe39248934ad4..839102ecd37b722a3204301ea0e61c3336d87a16 100644 (file)
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -20,7 +20,7 @@
                        <ul>
                                {content}
                                        {if $package->canUninstall()}
-                                               <li><button class="button jsUninstallButton" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}">{icon size=16 name='xmark'} <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
+                                               <li><button class="button jsUninstallButton" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}">{icon size=16 name='times' type='solid'} <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></button></li>
                                        {/if}
 
                                        {event name='contentHeaderNavigation'}
@@ -132,7 +132,9 @@
                                                                                        {if $requiredPackage->canUninstall()}
                                                                                                <span class="icon icon16 fa-times pointer jsTooltip jsUninstallButton" title="{lang}wcf.acp.package.button.uninstall{/lang}" data-object-id="{@$requiredPackage->packageID}" data-confirm-message="{lang __encode=true package=$requiredPackage}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $requiredPackage->isRequired()}true{else}false{/if}" data-is-application="{if $requiredPackage->isApplication}true{else}false{/if}"></span>
                                                                                        {else}
-                                                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}"></span>
+                                                                                               <span class="disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}">
+                                                                                                       {icon size=16 name='xmark'}
+                                                                                               </span>
                                                                                        {/if}
                                                                                </td>
                                                                                <td class="columnID">{@$requiredPackage->packageID}</td>
@@ -173,7 +175,9 @@
                                                                                        {if $dependentPackage->canUninstall()}
                                                                                                <span class="icon icon16 fa-times pointer jsTooltip jsUninstallButton" title="{lang}wcf.acp.package.button.uninstall{/lang}" data-object-id="{@$dependentPackage->packageID}" data-confirm-message="{lang __encode=true package=$dependentPackage}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $dependentPackage->isRequired()}true{else}false{/if}" data-is-application="{if $dependentPackage->isApplication}true{else}false{/if}"></span>
                                                                                        {else}
-                                                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}"></span>
+                                                                                               <span class="disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}">
+                                                                                                       {icon size=16 name='xmark'}
+                                                                                               </span>
                                                                                        {/if}
                                                                                </td>
                                                                                <td class="columnID">{@$dependentPackage->packageID}</td>
@@ -201,7 +205,7 @@
 <footer class="contentFooter">
        <nav class="contentFooterNavigation">
                <ul>
-                       <li><a href="{link controller='PackageList'}{/link}" class="button">{icon size=16 name='list'} <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+                       <li><a href="{link controller='PackageList'}{/link}" class="button">{icon size=16 name='list' type='solid'} <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
                        
                        {event name='contentFooterNavigation'}
                </ul>

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 21cffdd35266582430d611d3f1e2fb644b9f0163..3c2929b5b97eed23da7fb01a0e2989804689e2de 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -99,7 +99,9 @@
                                                        {if $package->canUninstall()}
                                                                <span class="icon icon16 fa-times pointer jsUninstallButton jsTooltip" title="{lang}wcf.acp.package.button.uninstall{/lang}" data-object-id="{@$package->packageID}" data-confirm-message="{lang __encode=true}wcf.acp.package.uninstallation.confirm{/lang}" data-is-required="{if $package->isRequired()}true{else}false{/if}" data-is-application="{if $package->isApplication}true{else}false{/if}"></span>
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.acp.package.button.uninstall{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
index 8f1f561d19c101f5787e2d31ad70304afc8a7815..7472214894570627c51cd0d413aa69c5cfcc0620 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
@@ -50,7 +50,9 @@
                                                        {if $updateServer->canDelete()}
                                                                {objectAction action="delete" objectTitle=$updateServer->serverURL}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='itemButtons'}

diff --git a/wcfsetup/install/files/acp/templates/pageList.tpl b/wcfsetup/install/files/acp/templates/pageList.tpl
index 8306cef53e6f0e1d91156e3adbe40214ad977607..321df39d0f62d6aa0443540ec331c440bfad5eb9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageList.tpl
@@ -128,7 +128,9 @@
                                                        {if $page->canDelete()}
                                                                {objectAction action="delete" objectTitle=$page->name}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        {if !$page->requireObjectID}
                                                                <a href="{$page->getLink()}" title="{lang}wcf.acp.page.button.viewPage{/lang}" class="jsTooltip">{icon size=16 name='magnifying-glass'}</a>

diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
index 0e7994da667f5ce92990eb9acc787ea241901f91..0858e789ae9622e97c0617b5ba8f836a1e53f0ed 100644 (file)
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
@@ -87,7 +87,9 @@
                                                        {if $subscriptionUser->endDate}
                                                                <a href="{link controller='PaidSubscriptionUserEdit' id=$subscriptionUser->subscriptionUserID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                        {else}
-                                                               <span class="icon icon16 fa-pencil disabled"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+                                                                       {icon size=16 name='pencil'}
+                                                               </span>
                                                        {/if}
                                                        {objectAction action="delete" confirmMessage='wcf.acp.paidSubscription.user.delete.confirmMessage'}
                                                        

diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index 76a91970d634c0d32657b47e4e297f137005568b..ae2707f8422cb410c2ba4d6217b3592eafa5dbd7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -40,7 +40,9 @@
                                        <tr class="jsTemplateGroupRow jsObjectActionObject" data-object-id="{@$templateGroup->getObjectID()}">
                                                <td class="columnIcon">
                                                        {if $templateGroup->isImmutable()}
-                                                               <span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+                                                                       {icon size=16 name='pencil'}
+                                                               </span>
                                                        {else}
                                                                <a href="{link controller='TemplateGroupEdit' id=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                        {/if}
@@ -48,7 +50,9 @@
                                                        <a href="{link controller='TemplateList' templateGroupID=$templateGroup->templateGroupID}{/link}" title="{lang}wcf.acp.template.list{/lang}" class="jsTooltip">{icon size=16 name='list'}</a>
                                                        
                                                        {if $templateGroup->isImmutable()}
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {else}
                                                                {objectAction action="delete" objectTitle=$templateGroup->getName()}
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index 79695a890dc1d64278cb738358cd476e794e8a92..1e3b5e4d3a4122e87f86003e1acd1ccabb748779 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -102,9 +102,15 @@
                                                                        <a href="{link controller='TemplateEdit' id=$template->templateID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                                        {objectAction action="delete" objectTitle=$template->templateName}
                                                                {else}
-                                                                       <span class="icon icon16 fa-exchange disabled" title="{lang}wcf.acp.template.diff{/lang}"></span>
-                                                                       <span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
-                                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                                       <span class="disabled" title="{lang}wcf.acp.template.diff{/lang}">
+                                                                               {icon size=16 name='arrow-right-arrow-left'}
+                                                                       </span>
+                                                                       <span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+                                                                               {icon size=16 name='pencil'}
+                                                                       </span>
+                                                                       <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                               {icon size=16 name='xmark'}
+                                                                       </span>
                                                                {/if}
                                                                
                                                                {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 52db0db969711753bf90eb5ddbf08013259b6602..42958139ea5f72ca0ca9dc5908a99ed2b2f341c6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -46,12 +46,16 @@
                                                {if $group->isEditable()}
                                                        <a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                {else}
-                                                       <span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
+                                                       <span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+                                                               {icon size=16 name='pencil'}
+                                                       </span>
                                                {/if}
                                                {if $group->isDeletable()}
                                                        {objectAction action="delete" objectTitle=$group->getTitle()}
                                                {else}
-                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                       <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                               {icon size=16 name='xmark'}
+                                                       </span>
                                                {/if}
                                                
                                                {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
index 02ef5af2adeca4258ad2fcc9241fe01b45b0f802..661b24ac2192f00e1da68ae50967da27f0172ad6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -41,7 +41,9 @@
                                                <td class="columnIcon">
                                                        <a href="{link controller='UserOptionCategoryEdit' id=$category->categoryID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon size=16 name='pencil'}</a>
                                                        {if $category->userOptions > 0}
-                                                               <span class="icon icon16 fa-times disabled"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {else}
                                                                {objectAction action="delete" objectTitle=$category->getTitle()}
                                                        {/if}

diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
index c2e90d993f46f40c628003e0aff0eada4c9531eb..40a0a720b4393c9978c96fb31b6f84ebbf5df1c7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -44,7 +44,9 @@
                                                        {if $option->canDelete()}
                                                                {objectAction action="delete" objectTitle=$option->getTitle()}
                                                        {else}
-                                                               <span class="icon icon16 fa-times disabled"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {/if}
                                                        
                                                        {event name='rowButtons'}

diff --git a/wcfsetup/install/files/acp/templates/userTrophyList.tpl b/wcfsetup/install/files/acp/templates/userTrophyList.tpl
index 9b19cf9534dee911ac394917873ba57375c544d3..7d52e1ed67a1499d56213c7fcaaa0d869611ca2a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userTrophyList.tpl
+++ b/wcfsetup/install/files/acp/templates/userTrophyList.tpl
@@ -92,8 +92,12 @@
                                        <tr class="userTrophyRow jsObjectActionObject" data-object-id="{@$userTrophy->getObjectID()}">
                                                <td class="columnIcon">
                                                        {if $userTrophy->getTrophy()->awardAutomatically}
-                                                               <span class="icon icon16 fa-pencil disabled" title="{lang}wcf.global.button.edit{/lang}"></span>
-                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.edit{/lang}">
+                                                                       {icon size=16 name='pencil'}
+                                                               </span>
+                                                               <span class="disabled" title="{lang}wcf.global.button.delete{/lang}">
+                                                                       {icon size=16 name='xmark'}
+                                                               </span>
                                                        {else}
                                                                <a href="{link controller='UserTrophyEdit' id=$userTrophy->userTrophyID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil{if $userTrophy->getTrophy()->awardAutomatically} disabled{/if}"></span></a>
                                                                {objectAction action="delete" confirmMessage='wcf.acp.trophy.userTrophy.delete.confirmMessage'}