Replace legacy icons in templates
authorAlexander Ebert <ebert@woltlab.com>
Fri, 12 Aug 2022 14:36:14 +0000 (16:36 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 12 Aug 2022 19:26:13 +0000 (21:26 +0200)
41 files changed:
com.woltlab.wcf/templates/__booleanFormField.tpl
com.woltlab.wcf/templates/__box.tpl
com.woltlab.wcf/templates/accountManagement.tpl
com.woltlab.wcf/templates/aclSimple.tpl
com.woltlab.wcf/templates/article.tpl
com.woltlab.wcf/templates/articleAdd.tpl
com.woltlab.wcf/templates/articleList.tpl
com.woltlab.wcf/templates/articleListItems.tpl
com.woltlab.wcf/templates/attachments.tpl
com.woltlab.wcf/templates/booleanOptionType.tpl
com.woltlab.wcf/templates/booleanSearchableOptionType.tpl
com.woltlab.wcf/templates/boxArticleList.tpl
com.woltlab.wcf/templates/categoryArticleList.tpl
com.woltlab.wcf/templates/cms.tpl
com.woltlab.wcf/templates/commentList.tpl
com.woltlab.wcf/templates/commentResponseList.tpl
com.woltlab.wcf/templates/contentInteraction.tpl
com.woltlab.wcf/templates/editHistory.tpl
com.woltlab.wcf/templates/following.tpl
com.woltlab.wcf/templates/ignoredUsers.tpl
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/mediaEditor.tpl
com.woltlab.wcf/templates/membersList.tpl
com.woltlab.wcf/templates/messageFormTabs.tpl
com.woltlab.wcf/templates/messageFormTabsInline.tpl
com.woltlab.wcf/templates/moderationActivation.tpl
com.woltlab.wcf/templates/moderationList.tpl
com.woltlab.wcf/templates/moderationReport.tpl
com.woltlab.wcf/templates/notificationList.tpl
com.woltlab.wcf/templates/notificationSettings.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/permissionDenied.tpl
com.woltlab.wcf/templates/searchResultList.tpl
com.woltlab.wcf/templates/shareButtons.tpl
com.woltlab.wcf/templates/tagged.tpl
com.woltlab.wcf/templates/trophy.tpl
com.woltlab.wcf/templates/unreadArticleList.tpl
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/userInformationButtons.tpl
com.woltlab.wcf/templates/watchedArticleList.tpl
com.woltlab.wcf/templates/worker.tpl

index 9acc4daa2e801ecbfc03a38226187dd2a8967fda..c3b842133331319120a5435468316a9d9b1e4954 100644 (file)
@@ -12,7 +12,7 @@
                        *}{if $field->getValue()} checked{/if}{*
                        *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
                *}>
-               <label for="{@$field->getPrefixedId()}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.global.form.boolean.yes{/lang}</label>
+               <label for="{@$field->getPrefixedId()}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.global.form.boolean.yes{/lang}</label>
        </li>
        <li>
                <input type="radio" {*
@@ -24,6 +24,6 @@
                        *}{if !$field->getValue()} checked{/if}{*
                        *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
                *}>
-               <label for="{@$field->getPrefixedId()}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.global.form.boolean.no{/lang}</label>
+               <label for="{@$field->getPrefixedId()}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.global.form.boolean.no{/lang}</label>
        </li>
 </ol>
index 5f08858551ac67b6a49d868e634c06ab33258264..cc544999d8793034135ab67ab0ce053fec42fcf4 100644 (file)
@@ -1,6 +1,6 @@
 <{if $box->showHeader}section{else}div{/if} class="box{if $box->getImage()} boxWithImage{/if}{if $box->showEditButton()} boxWithEditButton{/if}{if $box->cssClassName} {$box->cssClassName}{/if}" data-box-identifier="{@$box->identifier}">
        {if $box->showEditButton()}
-               <a href="{link controller='BoxEdit' id=$box->boxID isACP=true}{/link}" class="boxEditButton jsTooltip" title="{lang}wcf.page.box.edit{/lang}"><span class="icon icon16 fa-pencil-square-o"></span></a>
+               <a href="{link controller='BoxEdit' id=$box->boxID isACP=true}{/link}" class="boxEditButton jsTooltip" title="{lang}wcf.page.box.edit{/lang}">{icon size=16 name='pen-to-square'}</a>
        {/if}
        {if $box->getImage()}
                <div class="boxImage">
index c3dafe104cbd1843df0298f8a3a34a33b5e83099..0d29c70e21c252e357fcc7781eada6908aded2c7 100644 (file)
                                                                {if $__wcf->session->getVar('__3rdPartyProvider') === 'github' && $__wcf->session->getVar('__oauthUser')}
                                                                        <label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked{/if}> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
                                                                {else}
-                                                                       <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton button"><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.connect{/lang}</span></a>
+                                                                       <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton button">{icon size=24 name='github' type='brand'} <span>{lang}wcf.user.3rdparty.github.connect{/lang}</span></a>
                                                                {/if}
                                                        </dd>
                                                </dl>
                                                                {if $__wcf->session->getVar('__3rdPartyProvider') === 'twitter' && $__wcf->session->getVar('__oauthUser')}
                                                                        <label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked{/if}> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
                                                                {else}
-                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton button"><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
+                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton button">{icon size=24 name='twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
                                                                {/if}
                                                        </dd>
                                                </dl>
                                                                {if $__wcf->session->getVar('__3rdPartyProvider') === 'facebook' && $__wcf->session->getVar('__oauthUser')}
                                                                        <label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked{/if}> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
                                                                {else}
-                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton button"><span class="icon icon24 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.connect{/lang}</span></a>
+                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton button">{icon size=24 name='facebook-f' type='brand'} <span>{lang}wcf.user.3rdparty.facebook.connect{/lang}</span></a>
                                                                {/if}
                                                        </dd>
                                                </dl>
                                                                {if $__wcf->session->getVar('__3rdPartyProvider') === 'google' && $__wcf->session->getVar('__oauthUser')}
                                                                        <label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked{/if}> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
                                                                {else}
-                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton button"><span class="icon icon24 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.connect{/lang}</span></a>
+                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton button">{icon size=24 name='google' type='brand'} <span>{lang}wcf.user.3rdparty.google.connect{/lang}</span></a>
                                                                {/if}
                                                        </dd>
                                                </dl>
index ca12024b2305a6fdac21fee59ea473c8e9a0188c..8c49e698016800b0378123bde6362a7b3483dc47 100644 (file)
@@ -9,11 +9,11 @@
                        <ol role="group" aria-label="{lang}wcf.acl.allowAll{/lang}" class="flexibleButtonGroup">
                                <li>
                                        <input type="radio" id="{@$__aclSimplePrefix}aclAllowAll" name="{@$__aclInputName}[allowAll]" value="1"{if $aclValues[allowAll]} checked{/if}>
-                                       <label for="{@$__aclSimplePrefix}aclAllowAll" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+                                       <label for="{@$__aclSimplePrefix}aclAllowAll" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
                                </li>
                                <li>
                                        <input type="radio" id="{@$__aclSimplePrefix}aclAllowAll_no" name="{@$__aclInputName}[allowAll]" value="0"{if !$aclValues[allowAll]} checked{/if}>
-                                       <label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+                                       <label for="{@$__aclSimplePrefix}aclAllowAll_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
                                </li>
                        </ol>
                </dd>
                                <ol class="flexibleButtonGroup">
                                        <li>
                                                <input type="radio" id="{@$__aclSimplePrefix}invertPermissions" name="{@$__aclSimplePrefix}invertPermissions" value="1"{if $invertPermissions} checked{/if}>
-                                               <label for="{@$__aclSimplePrefix}invertPermissions" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+                                               <label for="{@$__aclSimplePrefix}invertPermissions" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
                                        </li>
                                        <li>
                                                <input type="radio" id="{@$__aclSimplePrefix}invertPermissions_no" name="{@$__aclSimplePrefix}invertPermissions" value="0"{if !$invertPermissions} checked{/if}>
-                                               <label for="{@$__aclSimplePrefix}invertPermissions_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+                                               <label for="{@$__aclSimplePrefix}invertPermissions_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
                                        </li>
                                </ol>
                                <small>{lang}wcf.acl.access.invertPermissions.description{/lang}</small>
@@ -55,7 +55,7 @@
                        <ul id="{@$__aclSimplePrefix}aclAccessList" class="aclList containerList">
                                {foreach from=$aclValues[group] item=aclGroup}
                                        <li>
-                                               <span class="icon icon16 fa-users"></span>
+                                               {icon size=16 name='users' type='solid'}
                                                <span class="aclLabel">{$aclGroup}</span>
                                                <span class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span>
                                                <input type="hidden" name="{@$__aclInputName}[group][]" value="{@$aclGroup->groupID}">
@@ -63,7 +63,7 @@
                                {/foreach}
                                {foreach from=$aclValues[user] item=aclUser}
                                        <li>
-                                               <span class="icon icon16 fa-user"></span>
+                                               {icon size=16 name='user' type='solid'}
                                                <span class="aclLabel">{$aclUser}</span>
                                                <span class="icon icon16 fa-times pointer jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span>
                                                <input type="hidden" name="{@$__aclInputName}[user][]" value="{@$aclUser->userID}">
index bacd08cdaa4adfa8c505a80383eb307ad0e2290d..7dd49aba3c765df200cfbd9f571d47f0c98177ad 100644 (file)
@@ -9,7 +9,7 @@
                        <ul class="inlineList contentHeaderMetaData articleMetaData">
                                {if $article->hasLabels()}
                                        <li>
-                                               <span class="icon icon16 fa-tags"></span>
+                                               {icon size=16 name='tags' type='solid'}
                                                <ul class="labelList">
                                                        {foreach from=$article->getLabels() item=label}
                                                                <li>{@$label->render()}</li>
@@ -19,7 +19,7 @@
                                {/if}
                                
                                <li itemprop="author" itemscope itemtype="http://schema.org/Person">
-                                       <span class="icon icon16 fa-user"></span>
+                                       {icon size=16 name='user' type='solid'}
                                        {if $article->userID}
                                                <a href="{$article->getUserProfile()->getLink()}" class="userLink" data-object-id="{@$article->userID}" itemprop="url">
                                                        <span itemprop="name">{@$article->getUserProfile()->getFormattedUsername()}</span>
@@ -30,7 +30,7 @@
                                </li>
                                
                                <li>
-                                       <span class="icon icon16 fa-clock-o"></span>
+                                       {icon size=16 name='clock'}
                                        <a href="{$article->getLink()}">{@$article->time|time}</a>
                                        <meta itemprop="datePublished" content="{@$article->time|date:'c'}">
                                        <meta itemprop="dateModified" content="{@$article->time|date:'c'}">
@@ -38,7 +38,7 @@
                                
                                {if $article->getDiscussionProvider()->getDiscussionCountPhrase()}
                                        <li itemprop="interactionStatistic" itemscope itemtype="http://schema.org/InteractionCounter">
-                                               <span class="icon icon16 fa-comments"></span>
+                                               {icon size=16 name='comments' type='solid'}
                                                {if $article->getDiscussionProvider()->getDiscussionLink()}<a href="{$article->getDiscussionProvider()->getDiscussionLink()}">{else}<span>{/if}
                                                {$article->getDiscussionProvider()->getDiscussionCountPhrase()}
                                                {if $article->getDiscussionProvider()->getDiscussionLink()}</a>{else}</span>{/if}
@@ -48,7 +48,7 @@
                                {/if}
                                
                                <li>
-                                       <span class="icon icon16 fa-eye"></span>
+                                       {icon size=16 name='eye'}
                                        {lang}wcf.article.articleViews{/lang}
                                </li>
                                
@@ -72,7 +72,7 @@
                        <nav class="contentHeaderNavigation">
                                <ul>
                                        {content}
-                                               {if $article->canEdit()}<li><a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" class="button buttonPrimary"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
+                                               {if $article->canEdit()}<li><a href="{link controller='ArticleEdit' id=$article->articleID}{/link}" class="button buttonPrimary">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
                                                {event name='contentHeaderNavigation'}
                                        {/content}
                                </ul>
                                <ul class="articleLikeButtons buttonGroup buttonList smallButtons">
                                        <li>
                                                <a href="{$articleContent->getLink()}" class="button wsShareButton jsOnly" data-link-title="{$articleContent->getTitle()}">
-                                                       <span class="icon icon16 fa-share-alt"></span> <span>{lang}wcf.message.share{/lang}</span>
+                                                       {icon size=16 name='share-alt' type='solid'} <span>{lang}wcf.message.share{/lang}</span>
                                                </a>
                                        </li>
                                        {if $__wcf->session->getPermission('user.profile.canReportContent')}
-                                               <li class="jsReportArticle jsOnly" data-object-id="{@$articleContent->articleID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip"><span class="icon icon16 fa-exclamation-triangle"></span> <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
+                                               <li class="jsReportArticle jsOnly" data-object-id="{@$articleContent->articleID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="button jsTooltip">{icon size=16 name='exclamation-triangle' type='solid'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
                                        {/if}
                                        {if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canLike') && $article->userID != $__wcf->user->userID}
-                                               <li class="jsOnly"><span class="button reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}"><span class="icon icon16 fa-smile-o"></span> <span class="invisible">{lang}wcf.reactions.react{/lang}</span></span></li>
+                                               <li class="jsOnly"><span class="button reactButton{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $articleLikeData[$article->articleID]|isset && $articleLikeData[$article->articleID]->reactionTypeID}{$articleLikeData[$article->articleID]->reactionTypeID}{else}0{/if}">{icon size=16 name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></span></li>
                                        {/if}
                                </ul>
                        </div>
index 786e5e58f29eff543f3e5772807663bbf37c89c5..e3547a994a818874cb34c7ea04d4a4b26c224748 100644 (file)
@@ -15,7 +15,7 @@
                                <ul>
                                        {content}
                                                {if $action == 'edit'}
-                                                       <li><a href="{$article->getLink()}" class="button buttonPrimary"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
+                                                       <li><a href="{$article->getLink()}" class="button buttonPrimary">{icon size=16 name='search' type='solid'} <span>{lang}wcf.acp.article.button.viewArticle{/lang}</span></a></li>
                                                {/if}
                                                {event name='contentHeaderNavigation'}
                                        {/content}
 {capture assign='contentInteractionButtons'}
        {if $action == 'edit'}
                {if $article->canDelete()}
-                       <a href="#" class="contentInteractionButton button small jsButtonRestore" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.restore.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-undo"></span> <span>{lang}wcf.global.button.restore{/lang}</span></a>
-                       <a href="#" class="contentInteractionButton button small jsButtonDelete" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.delete.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-times"></span> <span>{lang}wcf.global.button.delete{/lang}</span></a>
-                       <a href="#" class="contentInteractionButton button small jsButtonTrash" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}><span class="icon icon16 fa-times"></span> <span>{lang}wcf.global.button.trash{/lang}</span></a>
+                       <a href="#" class="contentInteractionButton button small jsButtonRestore" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.restore.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='undo' type='solid'} <span>{lang}wcf.global.button.restore{/lang}</span></a>
+                       <a href="#" class="contentInteractionButton button small jsButtonDelete" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.delete.confirmMessage{/lang}"{if !$article->isDeleted} style="display: none"{/if}>{icon size=16 name='times' type='solid'} <span>{lang}wcf.global.button.delete{/lang}</span></a>
+                       <a href="#" class="contentInteractionButton button small jsButtonTrash" data-confirm-message-html="{lang __encode=true isArticleEdit=true}wcf.acp.article.trash.confirmMessage{/lang}"{if $article->isDeleted} style="display: none"{/if}>{icon size=16 name='times' type='solid'} <span>{lang}wcf.global.button.trash{/lang}</span></a>
                {/if}
                {if $languages|count > 1 || $article->isMultilingual}
-                       <a href="#" class="contentInteractionButton button small jsButtonToggleI18n"><span class="icon icon16 fa-language"></span> <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a>
+                       <a href="#" class="contentInteractionButton button small jsButtonToggleI18n">{icon size=16 name='language' type='solid'} <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a>
                {/if}
        {/if}
 {/capture}
index cc98f414878ad0b74e0b2939137e0afba846c6b3..b0231025347f844a56324b2d0cc2fa18652d24ba 100644 (file)
@@ -16,9 +16,9 @@
 {capture assign='contentHeaderNavigation'}
        {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle') || $__wcf->getSession()->getPermission('admin.content.article.canContributeArticle')}
                {if $availableLanguages|count > 1}
-                       <li><a href="#" class="button buttonPrimary jsButtonArticleAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+                       <li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
                {else}
-                       <li><a href="{link controller='ArticleAdd'}{/link}" class="button buttonPrimary"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+                       <li><a href="{link controller='ArticleAdd'}{/link}" class="button buttonPrimary">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
                {/if}
        {/if}
 {/capture}
@@ -72,7 +72,7 @@
                </ul>
        </div>
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 
index ef3c0fa55f883ca959c8507fe37410b71d09d8ad..ecf2ee6badee71b0e57a65cd3429f4763cc5da4e 100644 (file)
@@ -65,7 +65,7 @@
                                        {/if}
                                        {if $article->getDiscussionProvider()->getDiscussionCountPhrase()}{* empty phrase indicates that comments are disabled *}
                                                <div class="contentItemMetaIcon">
-                                                       <span class="icon icon16 fa-comments"></span>
+                                                       {icon size=16 name='comments' type='solid'}
                                                        <span aria-label="{$article->getDiscussionProvider()->getDiscussionCountPhrase()}">
                                                                {$article->getDiscussionProvider()->getDiscussionCount()}
                                                        </span>
index b58740a677f51de5a08cc22814ebd02e3da1380e..5c181f66ef00617cad9f7cdc6d28e88d6d574988 100644 (file)
                                                                        
                                                                        <ul class="attachmentMetaData inlineList">
                                                                                <li>
-                                                                                       <span class="icon icon16 fa-file-text-o"></span>
+                                                                                       {icon size=16 name='file-lines'}
                                                                                        {@$attachment->filesize|filesize}
                                                                                </li>
                                                                                <li>
-                                                                                       <span class="icon icon16 fa-expand"></span>
+                                                                                       {icon size=16 name='up-right-and-down-left-from-center' type='solid'}
                                                                                        {#$attachment->width}×{#$attachment->height}
                                                                                </li>
                                                                                <li>
-                                                                                       <span class="icon icon16 fa-eye"></span>
+                                                                                       {icon size=16 name='eye'}
                                                                                        {#$attachment->downloads}
                                                                                </li>
                                                                        </ul>
index 4729f86a47bc72665ec578f3df1b5fa1109450ed..db6b9358a8ed42c89c28d566eb44c5be8c0cf9c8 100644 (file)
@@ -1,10 +1,10 @@
 <ol class="flexibleButtonGroup optionTypeBoolean">
        <li>
                <input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-               <label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+               <label for="{$option->optionName}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
        </li>
        <li>
                <input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}>
-               <label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+               <label for="{$option->optionName}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
        </li>
 </ol>
index d84f547a1213f5cd1d9351089c6bf7de3c281d4a..d66a1bfff96b782cd4fde233928d03132a2b85f2 100644 (file)
@@ -2,11 +2,11 @@
 <ol class="flexibleButtonGroup optionTypeBoolean">
        <li>
                <input type="radio" id="{$option->optionName}"{if $value == 1} checked{/if} name="values[{$option->optionName}]" value="1"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}{if !$searchOption} disabled{/if}>
-               <label for="{$option->optionName}" class="green"><span class="icon icon16 fa-check"></span> {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
+               <label for="{$option->optionName}" class="green">{icon size=16 name='check' type='solid'} {lang}wcf.acp.option.type.boolean.yes{/lang}</label>
        </li>
        <li>
                <input type="radio" id="{$option->optionName}_no"{if $value == 0} checked{/if} name="values[{$option->optionName}]" value="0"{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {@$disableOptions}]" data-enable-options="[ {@$enableOptions}]"{/if}{if !$searchOption} disabled{/if}>
-               <label for="{$option->optionName}_no" class="red"><span class="icon icon16 fa-times"></span> {lang}wcf.acp.option.type.boolean.no{/lang}</label>
+               <label for="{$option->optionName}_no" class="red">{icon size=16 name='times' type='solid'} {lang}wcf.acp.option.type.boolean.no{/lang}</label>
        </li>
 </ol>
 
index b60b5fbe9ce2ac56bad651a417123bf4d32bea86..cc791c9a264398047f7a95a75318baf972d8e231 100644 (file)
                                        <h3 class="articleListTitle">{$boxArticle->getTitle()}</h3>
                                        <ul class="inlineList articleListMetaData">
                                                <li>
-                                                       <span class="icon icon16 fa-clock-o"></span>
+                                                       {icon size=16 name='clock'}
                                                        {@$boxArticle->time|time}
                                                </li>
                                                
                                                <li>
-                                                       <span class="icon icon16 fa-comments"></span>
+                                                       {icon size=16 name='comments' type='solid'}
                                                        {$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
                                                </li>
                                        </ul>
index e2743f7e2146f87a7370dc8ec110074111bd027a..3e3f43b189cb52332b0dcd4d79295da0904cacb2 100644 (file)
@@ -21,9 +21,9 @@
 {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}
        {capture assign='contentHeaderNavigation'}
                {if $availableLanguages|count > 1}
-                       <li><a href="#" class="button buttonPrimary jsButtonArticleAdd"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+                       <li><a href="#" class="button buttonPrimary jsButtonArticleAdd">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
                {else}
-                       <li><a href="{link controller='ArticleAdd'}categoryID={@$category->categoryID}{/link}" class="button buttonPrimary"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+                       <li><a href="{link controller='ArticleAdd'}categoryID={@$category->categoryID}{/link}" class="button buttonPrimary">{icon size=16 name='plus' type='solid'} <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
                {/if}
        {/capture}
 {/if}
@@ -67,7 +67,7 @@
                <a href="#" class="contentInteractionButton jsSubscribeButton jsOnly button small{if $category->isSubscribed()} active{/if}" data-object-type="com.woltlab.wcf.article.category" data-object-id="{@$category->categoryID}"><span class="icon icon16 fa-bookmark{if !$category->isSubscribed()}-o{/if}"></span> <span>{lang}wcf.user.objectWatch.button.subscribe{/lang}</span></a>
        {/if}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 
index 313d02ad8ce8cd6b6095d07ba5d6003080ec102e..04a7ffdb11456cf5dde2d40e9da3f749b3141860 100644 (file)
@@ -13,7 +13,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if $page->showShareButtons()}
-               <a href="{$content->getLink()}" class="contentInteractionButton button small wsShareButton jsOnly" data-link-title="{$content->getTitle()}"><span class="icon icon16 fa-share"></span> <span>{lang}wcf.message.share{/lang}</span></a>
+               <a href="{$content->getLink()}" class="contentInteractionButton button small wsShareButton jsOnly" data-link-title="{$content->getTitle()}">{icon size=16 name='share' type='solid'} <span>{lang}wcf.message.share{/lang}</span></a>
        {/if}
 
        {if $page->isMultilingual && $__wcf->user->userID && $page->getPageLanguages()|count > 1}
@@ -35,7 +35,7 @@
                </div>
        {/if}
 
-       {if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}<a href="{link controller='PageEdit' id=$page->pageID isACP=true}{/link}" class="contentInteractionButton button small"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.page.edit{/lang}</span></a>{/if}
+       {if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}<a href="{link controller='PageEdit' id=$page->pageID isACP=true}{/link}" class="contentInteractionButton button small">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.acp.page.edit{/lang}</span></a>{/if}
 {/capture}
 
 {include file='header'}
index 79705f375fb9f52d07855eb78172788fbae5537d..de0b45ebba2fb4a076112e7f215abf5935ed9f4c 100644 (file)
                                                <nav class="jsMobileNavigation buttonGroupNavigation">
                                                        <ul class="buttonList iconList">
                                                                {if $comment->isDisabled && $commentCanModerate}
-                                                                       <li class="jsOnly"><a href="#" class="jsEnableComment"><span class="icon icon16 fa-check"></span> <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
+                                                                       <li class="jsOnly"><a href="#" class="jsEnableComment">{icon size=16 name='check' type='solid'} <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
                                                                {/if}
                                                                {if $commentManager->supportsReport() && $__wcf->session->getPermission('user.profile.canReportContent')}
-                                                                       <li class="jsReportCommentComment jsOnly" data-object-id="{@$comment->commentID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip"><span class="icon icon16 fa-exclamation-triangle"></span> <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
+                                                                       <li class="jsReportCommentComment jsOnly" data-object-id="{@$comment->commentID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip">{icon size=16 name='exclamation-triangle' type='solid'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
                                                                {/if}
                                                                
                                                                {if MODULE_LIKE && $commentManager->supportsLike() && $__wcf->session->getPermission('user.like.canLike') && $comment->userID != $__wcf->user->userID}
-                                                                       <li class="jsOnly"><a href="#" class="reactButton jsTooltip {if $likeData[comment][$comment->commentID]|isset && $likeData[comment][$comment->commentID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $likeData[comment][$comment->commentID]|isset && $likeData[comment][$comment->commentID]->reactionTypeID}{$likeData[comment][$comment->commentID]->reactionTypeID}{else}0{/if}"><span class="icon icon16 fa-smile-o"></span> <span class="invisible">{lang}wcf.reactions.react{/lang}</span></a></li>
+                                                                       <li class="jsOnly"><a href="#" class="reactButton jsTooltip {if $likeData[comment][$comment->commentID]|isset && $likeData[comment][$comment->commentID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $likeData[comment][$comment->commentID]|isset && $likeData[comment][$comment->commentID]->reactionTypeID}{$likeData[comment][$comment->commentID]->reactionTypeID}{else}0{/if}">{icon size=16 name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></a></li>
                                                                {/if}
                                                                
                                                                {event name='commentOptions'}
index 472daf4e36e8696a7bd0e75378e431645fa167f6..607b9694b2bf9de4decef7d5d1f5112a4ea482ed 100644 (file)
                                        <nav class="jsMobileNavigation buttonGroupNavigation">
                                                <ul class="buttonList iconList">
                                                        {if $response->isDisabled && $commentCanModerate}
-                                                               <li class="jsOnly"><a href="#" class="jsEnableResponse"><span class="icon icon16 fa-check"></span> <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
+                                                               <li class="jsOnly"><a href="#" class="jsEnableResponse">{icon size=16 name='check' type='solid'} <span class="invisible">{lang}wcf.comment.approve{/lang}</span></a></li>
                                                        {/if}
                                                        {if $commentManager->supportsReport() && $__wcf->session->getPermission('user.profile.canReportContent')}
-                                                               <li class="jsReportCommentResponse jsOnly" data-object-id="{@$response->responseID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip"><span class="icon icon16 fa-exclamation-triangle"></span> <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
+                                                               <li class="jsReportCommentResponse jsOnly" data-object-id="{@$response->responseID}"><a href="#" title="{lang}wcf.moderation.report.reportContent{/lang}" class="jsTooltip">{icon size=16 name='exclamation-triangle' type='solid'} <span class="invisible">{lang}wcf.moderation.report.reportContent{/lang}</span></a></li>
                                                        {/if}
                                                        
-                                                       {if MODULE_LIKE && $commentManager->supportsLike() && $__wcf->session->getPermission('user.like.canLike') && $response->userID != $__wcf->user->userID}<li class="jsOnly"><a href="#" class="reactButtonCommentResponse jsTooltip {if $likeData[response][$response->responseID]|isset && $likeData[response][$response->responseID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $likeData[response][$response->responseID]|isset && $likeData[response][$response->responseID]->reactionTypeID}{$likeData[response][$response->responseID]->reactionTypeID}{else}0{/if}"><span class="icon icon16 fa-smile-o"></span> <span class="invisible">{lang}wcf.reactions.react{/lang}</span></a></li>{/if}
+                                                       {if MODULE_LIKE && $commentManager->supportsLike() && $__wcf->session->getPermission('user.like.canLike') && $response->userID != $__wcf->user->userID}<li class="jsOnly"><a href="#" class="reactButtonCommentResponse jsTooltip {if $likeData[response][$response->responseID]|isset && $likeData[response][$response->responseID]->reactionTypeID} active{/if}" title="{lang}wcf.reactions.react{/lang}" data-reaction-type-id="{if $likeData[response][$response->responseID]|isset && $likeData[response][$response->responseID]->reactionTypeID}{$likeData[response][$response->responseID]->reactionTypeID}{else}0{/if}">{icon size=16 name='face-smile'} <span class="invisible">{lang}wcf.reactions.react{/lang}</span></a></li>{/if}
                                                        
                                                        {event name='commentOptions'}
                                                </ul>
index 17070b97e5c3400da5080daf5c4df1d8237cf212..7639ee11dc0cb4bbd7855dbd2f9ec354594a80b8 100644 (file)
@@ -39,7 +39,7 @@
 
                 {if $__contentInteractionDropdownItems}
                     <div class="contentInteractionDropdown dropdown jsOnly">
-                        <a href="#" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}"><span class="icon icon16 fa-ellipsis-v"></span></a>
+                        <a href="#" class="button small dropdownToggle" aria-label="{lang}wcf.global.button.more{/lang}">{icon size=16 name='ellipsis-v' type='solid'}</a>
 
                         <ul class="contentInteractionDropdownItems dropdownMenu">
                             {@$__contentInteractionDropdownItems}
index da5142094ca5c9b6f45eff923231f52ee68b0414..a0b97def66d153a03b41d560cbd64c2ef9f21121 100644 (file)
@@ -2,7 +2,7 @@
 
 {capture assign='contentTitle'}{lang}wcf.edit.versions{/lang}: {$object->getTitle()}{/capture}
 
-{capture assign='contentHeaderNavigation'}<li><a href="{$object->getLink()}" class="button buttonPrimary"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.edit.button.goToContent{/lang}</span></a></li>{/capture}
+{capture assign='contentHeaderNavigation'}<li><a href="{$object->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.edit.button.goToContent{/lang}</span></a></li>{/capture}
 
 {include file='header'}
 
index f304c538541a70a2a2a2a25b0edaa09abd59cf54..87f0d2d21c7d4735156587cd0793ebd9b53f2eb0 100644 (file)
@@ -21,7 +21,7 @@
                                                        
                                                        <nav class="jsMobileNavigation buttonGroupNavigation">
                                                                <ul class="buttonList iconList jsOnly">
-                                                                       <li><a class="pointer jsTooltip jsObjectAction" data-object-action="delete" title="{lang}wcf.user.button.unfollow{/lang}" data-object-id="{@$user->followID}"><span class="icon icon16 fa-times"></span> <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
+                                                                       <li><a class="pointer jsTooltip jsObjectAction" data-object-action="delete" title="{lang}wcf.user.button.unfollow{/lang}" data-object-id="{@$user->followID}">{icon size=16 name='times' type='solid'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
                                                                        {event name='userButtons'}
                                                                </ul>
                                                        </nav>
index 0d40af6a4f48fd9f66d239a097e413871d4cc839..1bb6c4986d3af77ff656ba1be084387cda0ba962 100644 (file)
@@ -23,7 +23,7 @@
                                                                <ul class="buttonList iconList jsOnly">
                                                                        <li>
                                                                                <a class="pointer jsTooltip jsEditIgnoreButton" title="{lang}wcf.global.button.edit{/lang}">
-                                                                                       <span class="icon icon16 fa-pencil"></span>
+                                                                                       {icon size=16 name='pencil' type='solid'}
                                                                                        <span class="invisible">{lang}wcf.global.button.edit{/lang}</span>
                                                                                </a>
                                                                        </li>
index c7a31e4e3ebd63fa2e75e2dd89d347b53378d4c1..c7f8868171d974addaa55c6ca4d624df5e9b9d73 100644 (file)
                                                        {content}
                                                                {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
                                                                        <li id="facebookAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon24 fa-facebook-official"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton">{icon size=24 name='facebook' type='brand'} <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
                                                                
                                                                {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
                                                                        <li id="googleAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon24 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton">{icon size=24 name='google' type='brand'} <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
                                                        
                                                                {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
                                                                        <li id="twitterAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
+                                                                               <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton">{icon size=24 name='twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
                                                                
                                                                {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
                                                                        <li id="githubAuth" class="thirdPartyLogin">
-                                                                               <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+                                                                               <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton">{icon size=24 name='github' type='brand'} <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
                                                                        </li>
                                                                {/if}
                                                                
index 3a8982234801ad958e162994c133efc8e7381da1..2a5114e55b621ecd74efabe9f0f2d158f72e0a4c 100644 (file)
@@ -10,7 +10,7 @@
 
 <div class="box48">
        {if $media->isImage}
-               <span class="icon icon48 fa-file-image-o"></span>
+               {icon size=48 name='file-image'}
        {else}
                {@$media->getElementTag(48)}
        {/if}
index d66d558259142a1bfe2b2f72e06d9eb25f8a9b34..af785bab6bc674914421a927f3184b39896161d4 100644 (file)
@@ -72,7 +72,7 @@
                        {/hascontent}
                        
                        <div class="containerListFilterOptions jsOnly">
-                               <button class="button small jsStaticDialog" data-dialog-id="membersListSortFilter"><span class="icon icon16 fa-filter"></span> {lang}wcf.global.filter{/lang}</button>
+                               <button class="button small jsStaticDialog" data-dialog-id="membersListSortFilter">{icon size=16 name='filter' type='solid'} {lang}wcf.global.filter{/lang}</button>
                        </div>
                </div>
                <ol class="containerList userList">
index 618d2bc649b01ba134b93da6813bb052542fe8a1..d7f3c768dc901969a4c1c6083f278c90d7e11dac 100644 (file)
@@ -4,12 +4,12 @@
 <div class="messageTabMenu" data-preselect="{if $preselectTabMenu|isset}{$preselectTabMenu}{else}true{/if}" data-wysiwyg-container-id="{if $wysiwygContainerID|isset}{$wysiwygContainerID}{else}text{/if}">
        <nav class="messageTabMenuNavigation jsOnly">
                <ul>
-                       {if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a><span class="icon icon16 fa-smile-o"></span> <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
+                       {if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a>{icon size=16 name='face-smile'} <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
                        {if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
-                               <li data-name="attachments"><a><span class="icon icon16 fa-paperclip"></span> <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
+                               <li data-name="attachments"><a>{icon size=16 name='paperclip' type='solid'} <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
                        {/if}
-                       {if $__messageFormSettings}<li data-name="settings"><a><span class="icon icon16 fa-cog"></span> <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
-                       {if $__showPoll|isset && $__showPoll}<li data-name="poll"><a><span class="icon icon16 fa-bar-chart"></span> <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
+                       {if $__messageFormSettings}<li data-name="settings"><a>{icon size=16 name='cog' type='solid'} <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
+                       {if $__showPoll|isset && $__showPoll}<li data-name="poll"><a>{icon size=16 name='chart-column' type='solid'} <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
                        {event name='tabMenuTabs'}
                </ul>
        </nav>
index 4e3b62250a62a0aeda5f90d46baac6eb70eb21d3..1edf169b49155a2d824e82f70f730bcc8e257c2b 100644 (file)
@@ -8,12 +8,12 @@
 <div class="messageTabMenu"{if $preselectTabMenu|isset} data-preselect="{$preselectTabMenu}"{/if} data-wysiwyg-container-id="{$wysiwygSelector}">
        <nav class="messageTabMenuNavigation jsOnly">
                <ul>
-                       {if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a><span class="icon icon16 fa-smile-o"></span> <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
+                       {if MODULE_SMILEY && !$smileyCategories|empty}<li data-name="smilies"><a>{icon size=16 name='face-smile'} <span>{lang}wcf.message.smilies{/lang}</span></a></li>{/if}
                        {if !$attachmentHandler|empty && $attachmentHandler->canUpload()}
-                               <li data-name="attachments"><a><span class="icon icon16 fa-paperclip"></span> <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
+                               <li data-name="attachments"><a>{icon size=16 name='paperclip' type='solid'} <span>{lang}wcf.attachment.attachments{/lang}</span></a></li>
                        {/if}
-                       {if $__messageFormSettingsInlineContent}<li data-name="settings"><a><span class="icon icon16 fa-cog"></span> <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
-                       {if $__showPoll|isset && $__showPoll}<li data-name="poll"><a><span class="icon icon16 fa-bar-chart"></span> <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
+                       {if $__messageFormSettingsInlineContent}<li data-name="settings"><a>{icon size=16 name='cog' type='solid'} <span>{lang}wcf.message.settings{/lang}</span></a></li>{/if}
+                       {if $__showPoll|isset && $__showPoll}<li data-name="poll"><a>{icon size=16 name='chart-column' type='solid'} <span>{lang}wcf.poll.management{/lang}</span></a></li>{/if}
                        {event name='tabMenuTabs'}
                </ul>
        </nav>
index 719c732d7852cf4ed91278d2869c61a05621d07d..c5754518974930cbf65e7d5d1deb791c641673bc 100644 (file)
@@ -35,7 +35,7 @@
                        <nav class="contentHeaderNavigation">
                                <ul>
                                        {content}
-                                               {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
+                                               {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
                                                {event name='contentHeaderNavigation'}
                                        {/content}
                                </ul>
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a id="moderationAssignUser" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-user-plus"></span> <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a>
+       <a id="moderationAssignUser" class="contentInteractionButton button small jsOnly">{icon size=16 name='user-plus' type='solid'} <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a>
        {if !$queue->isDone()}
-               <a id="enableContent" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a>
-               {if $queueManager->canRemoveContent($queue->getDecoratedObject())}<a id="removeContent" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>{/if}
+               <a id="enableContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a>
+               {if $queueManager->canRemoveContent($queue->getDecoratedObject())}<a id="removeContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='times' type='solid'} <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>{/if}
        {/if}
 {/capture}
 
index 1519df495f2f95010c80d9607f90d137e9970dd6..4ecf22872c97ed195f5aef38894ec9b2ef65e588 100644 (file)
@@ -11,8 +11,8 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
-       <a href="{link controller='DeletedContentList'}{/link}" class="contentInteractionButton button small"><span class="icon icon16 fa-trash"></span> <span>{lang}wcf.moderation.showDeletedContent{/lang}</span></a>
+       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+       <a href="{link controller='DeletedContentList'}{/link}" class="contentInteractionButton button small">{icon size=16 name='trash-can' type='solid'} <span>{lang}wcf.moderation.showDeletedContent{/lang}</span></a>
 {/capture}
 
 {include file='header'}
@@ -82,7 +82,7 @@
                                                </li>
                                        {/hascontent}
                                        <li class="columnApplyFilter jsOnly">
-                                               <button class="button small jsStaticDialog" data-dialog-id="moderationListSortFilter"><span class="icon icon16 fa-filter"></span> {lang}wcf.global.filter{/lang}</button>
+                                               <button class="button small jsStaticDialog" data-dialog-id="moderationListSortFilter">{icon size=16 name='filter' type='solid'} {lang}wcf.global.filter{/lang}</button>
                                        </li>
                                </ol>
                        </li>
index dc1b55cff082d9b949fb2295aa48a44504e567a3..196a9bbd75b7a98f0695cdc9fdfdd8c265d4b36f 100644 (file)
@@ -35,7 +35,7 @@
                        <nav class="contentHeaderNavigation">
                                <ul>
                                        {content}
-                                               {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
+                                               {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button buttonPrimary">{icon size=16 name='arrow-right' type='solid'} <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
                                                {event name='contentHeaderNavigation'}
                                        {/content}
                                </ul>
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a id="moderationAssignUser" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-user-plus"></span> <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a>
+       <a id="moderationAssignUser" class="contentInteractionButton button small jsOnly">{icon size=16 name='user-plus' type='solid'} <span>{lang}wcf.moderation.assignedUser.change{/lang}</span></a>
        {if !$queue->isDone()}
                {if $queueManager->canRemoveContent($queue->getDecoratedObject())}
-                       <a id="removeContent" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>
+                       <a id="removeContent" class="contentInteractionButton button small jsOnly">{icon size=16 name='times' type='solid'} <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a>
                {/if}
-               <a id="removeReport" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check-square-o"></span> <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a>
+               <a id="removeReport" class="contentInteractionButton button small jsOnly">{icon size=16 name='square-check'} <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a>
        {/if}
        {if $queue->canChangeJustifiedStatus()}
-               <a id="changeJustifiedStatus" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.moderation.report.changeJustifiedStatus{/lang}</span></a>
+               <a id="changeJustifiedStatus" class="contentInteractionButton button small jsOnly">{icon size=16 name='arrows-rotate' type='solid'} <span>{lang}wcf.moderation.report.changeJustifiedStatus{/lang}</span></a>
        {/if}
 {/capture}
 
index 8d170328ec7dab556316dbb96d5aba9091d747f1..3ee98f92ee7afba7c13017acf1c306c1d0ce3c5b 100644 (file)
@@ -10,7 +10,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if $__wcf->getUserNotificationHandler()->getNotificationCount()}
-               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 
@@ -53,7 +53,7 @@
                                                        </div>
                                                {else}
                                                        <div>
-                                                               <span class="icon icon32 fa-users"></span>
+                                                               {icon size=32 name='users' type='solid'}
                                                        </div>
                                                        
                                                        <div class="details">
index e19dc0538b14875d53df8f8cd5eab9acda45b787..433e344f009da6079343e574468d6a591ff8b0af 100644 (file)
@@ -42,7 +42,7 @@
                                                                        {else}
                                                                                <span class="icon icon24 {if $settings[$event->eventID][mailNotificationType] === 'instant'}fa-flash{else}fa-clock-o{/if} green jsIconNotificationSettingsEmailType"></span>
                                                                        {/if}
-                                                                       <span class="icon icon16 fa-caret-down"></span>
+                                                                       {icon size=16 name='caret-down' type='solid'}
                                                                </a>
                                                        {/if}
                                                </div>
index cd2c59ec9510c4b9e89c3006f5adc4eda139133a..ede5fd358171370650ecad03e589d2847a714358 100644 (file)
@@ -52,7 +52,7 @@
                                        <div class="userMenuContent">
                                                <div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine">
                                                        <div class="userMenuItemImage">
-                                                               <span class="icon icon32 fa-pencil"></span>
+                                                               {icon size=32 name='pencil' type='solid'}
                                                        </div>
                                                        <div class="userMenuItemContent">
                                                                <a href="{link controller='User' object=$__wcf->user editOnInit=true}{/link}" class="userMenuItemLink">{lang}wcf.user.editProfile{/lang}</a>
@@ -61,7 +61,7 @@
                                                {if $__wcf->session->getPermission('admin.general.canUseAcp')}
                                                <div class="userMenuItem userMenuItemNarrow userMenuItemSingleLine">
                                                        <div class="userMenuItemImage">
-                                                               <span class="icon icon32 fa-wrench"></span>
+                                                               {icon size=32 name='wrench' type='solid'}
                                                        </div>
                                                        <div class="userMenuItemContent">
                                                                <a href="{link isACP=true}{/link}" class="userMenuItemLink">{lang}wcf.global.acp{/lang}</a>
                                                aria-haspopup="true"
                                                aria-expanded="false"
                                        >
-                                               <span class="icon icon32 fa-bell-o"></span> <span>{lang}wcf.user.notification.notifications{/lang}</span>{if $__wcf->getUserNotificationHandler()->getNotificationCount()} <span class="badge badgeUpdate">{#$__wcf->getUserNotificationHandler()->getNotificationCount()}</span>{/if}
+                                               {icon size=32 name='bell'} <span>{lang}wcf.user.notification.notifications{/lang}</span>{if $__wcf->getUserNotificationHandler()->getNotificationCount()} <span class="badge badgeUpdate">{#$__wcf->getUserNotificationHandler()->getNotificationCount()}</span>{/if}
                                        </a>
                                        {if !OFFLINE || $__wcf->session->getPermission('admin.general.canViewPageDuringOfflineMode')}
                                                <script data-relocate="true">
                                                aria-haspopup="true"
                                                aria-expanded="false"
                                        >
-                                               <span class="icon icon32 fa-exclamation-triangle"></span>
+                                               {icon size=32 name='exclamation-triangle' type='solid'}
                                                <span>{lang}wcf.moderation.moderation{/lang}</span>
                                                {if $__wcf->getModerationQueueManager()->getUnreadModerationCount()}<span class="badge badgeUpdate">{#$__wcf->getModerationQueueManager()->getUnreadModerationCount()}</span>{/if}
                                        </a>
                
                <!-- page search -->
                <li>
-                       <a href="{link controller='Search'}{/link}" id="userPanelSearchButton" class="jsTooltip" title="{lang}wcf.global.search{/lang}"><span class="icon icon32 fa-search"></span> <span>{lang}wcf.global.search{/lang}</span></a>
+                       <a href="{link controller='Search'}{/link}" id="userPanelSearchButton" class="jsTooltip" title="{lang}wcf.global.search{/lang}">{icon size=32 name='search' type='solid'} <span>{lang}wcf.global.search{/lang}</span></a>
                </li>
        </ul>
 </nav>
index d80d994b8b968c3a58e407bf580e6467db156350..77884fe4dd860cb8fab8e5b6ce7c344a2a793d7b 100644 (file)
@@ -2,7 +2,7 @@
 {capture assign='contentTitle'}{lang}wcf.page.error.permissionDenied.title{/lang}{/capture}
 {if !$isFirstVisit}
        {capture assign='contentHeaderNavigation'}
-               <li id="backToReferrer" style="display: none"><a href="#" class="button" rel="noopener"><span class="icon icon16 fa-arrow-left"></span> {lang}wcf.page.error.backward{/lang}</a></li>
+               <li id="backToReferrer" style="display: none"><a href="#" class="button" rel="noopener">{icon size=16 name='arrow-left' type='solid'} {lang}wcf.page.error.backward{/lang}</a></li>
        {/capture}
        
        <script data-relocate="true">
@@ -35,7 +35,7 @@
                <h2 class="sectionTitle">{lang}wcf.user.login{/lang}</h2>
                
                <p>{lang}wcf.page.error.loginAvailable{/lang}</p>
-               <p style="margin-top: 20px"><a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="button"><span class="icon icon16 fa-key"></span> {lang}wcf.user.loginOrRegister{/lang}</a></p>
+               <p style="margin-top: 20px"><a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="button">{icon size=16 name='key' type='solid'} {lang}wcf.user.loginOrRegister{/lang}</a></p>
        </section>
 {/if}
 
index 8265a7bcac0707934d0b062506067947bf6f1101..43007535c94212acf1d12482afa2ebdfc7de496d 100644 (file)
@@ -8,7 +8,7 @@
                                                {if $message->getUserProfile()}
                                                        {user object=$message->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
                                                {else}
-                                                       <span class="icon icon48 fa-file-o"></span>
+                                                       {icon size=48 name='file'}
                                                {/if}
                                        {elseif $_messageCustomIcon|strpos:'fa-' === 0}
                                                <span class="icon icon48 {$_messageCustomIcon}"></span>
index 8e20392c3c4db3a51034147c41f16490d242743f..a7b5293e198d44029318fbc2e23602684cd7c67b 100644 (file)
@@ -5,7 +5,7 @@
                {if 'Facebook'|in_array:$__share_buttons_providers}
                        <li>
                                <a href="#" role="button" class="button jsShareFacebook" title="{lang}wcf.message.share.facebook{/lang}" aria-label="{lang}wcf.message.share.facebook{/lang}">
-                                       <span class="icon icon24 fa-facebook-official"></span>
+                                       {icon size=24 name='facebook' type='brand'}
                                        <span>{lang}wcf.message.share.facebook{/lang}</span>
                                </a>
                        </li>
@@ -13,7 +13,7 @@
                {if 'Twitter'|in_array:$__share_buttons_providers}
                        <li>
                                <a href="#" role="button" class="button jsShareTwitter" title="{lang}wcf.message.share.twitter{/lang}" aria-label="{lang}wcf.message.share.twitter{/lang}">
-                                       <span class="icon icon24 fa-twitter"></span>
+                                       {icon size=24 name='twitter' type='brand'}
                                        <span>{lang}wcf.message.share.twitter{/lang}</span>
                                </a>
                        </li>
@@ -21,7 +21,7 @@
                {if 'Reddit'|in_array:$__share_buttons_providers}
                        <li>
                                <a href="#" role="button" class="button jsShareReddit" title="{lang}wcf.message.share.reddit{/lang}" aria-label="{lang}wcf.message.share.reddit{/lang}">
-                                       <span class="icon icon24 fa-reddit"></span>
+                                       {icon size=24 name='reddit' type='brand'}
                                        <span>{lang}wcf.message.share.reddit{/lang}</span>
                                </a>
                        </li>
index a87ac92230c05e372414893425aacf40fe8c1335..6332320555b7a69a7dbf23e467ee4aeb1a011dde 100644 (file)
@@ -41,7 +41,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a href="{link controller='TagSearch'}{/link}" class="contentInteractionButton button small"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.search.type.tags{/lang}</span></a>
+       <a href="{link controller='TagSearch'}{/link}" class="contentInteractionButton button small">{icon size=16 name='search' type='solid'} <span>{lang}wcf.search.type.tags{/lang}</span></a>
 {/capture}
 
 {include file='header'}
index fcef5c7642241f30d85d4e143d9a5ce3aa379ef6..5b2e92aed964b88b35349bb3854900a4f57ef319 100644 (file)
@@ -20,7 +20,7 @@
                        <ul class="inlineList contentHeaderMetaData">
                                {if !$trophy->getDescription()|empty}<li>{@$trophy->getDescription()}</li>{/if}
                                <li>
-                                       <span class="icon icon16 fa-users"></span>
+                                       {icon size=16 name='users' type='solid'}
                                        <span>{lang}wcf.user.trophy.trophyAwarded{/lang}</span>
                                </li>
                        </ul>
index 601ee850f76ddd0420eaafe54246758b0e8c5ebc..b282ccb58b33681481aba87cd2dd808169853e47 100644 (file)
@@ -45,7 +45,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 
index b8faa9988909580ab28dc82b5fceb60fa8856c2d..4ffc7870e5502108cb6c79047be0226346f1a7e6 100644 (file)
                <div class="userProfileCoverPhoto" style="background-image: url({$user->getCoverPhoto()->getURL()})">
                        {if ($user->userID == $__wcf->user->userID || $user->canEdit()) && ($__wcf->getSession()->getPermission('user.profile.coverPhoto.canUploadCoverPhoto') || $user->coverPhotoHash)}
                                <div class="userProfileManageCoverPhoto dropdown jsOnly">
-                                       <a href="#" class="button small dropdownToggle"><span class="icon icon16 fa-pencil"></span> {lang}wcf.user.coverPhoto.edit{/lang}</a>
+                                       <a href="#" class="button small dropdownToggle">{icon size=16 name='pencil' type='solid'} {lang}wcf.user.coverPhoto.edit{/lang}</a>
                                        <ul class="dropdownMenu">
                                                {if $__wcf->getSession()->getPermission('user.profile.coverPhoto.canUploadCoverPhoto')}
                                                        <li><a href="#" class="jsButtonUploadCoverPhoto jsStaticDialog" data-dialog-id="userProfileCoverPhotoUpload">{lang}wcf.user.coverPhoto.upload{/lang}</a></li>
                                <ul class="userProfileButtonContainer">
                                        {content}
                                                {if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())}
-                                                       <li><a href="#" class="jsButtonEditProfile button buttonPrimary"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.user.editProfile{/lang}</span></a></li>
+                                                       <li><a href="#" class="jsButtonEditProfile button buttonPrimary">{icon size=16 name='pencil' type='solid'} <span>{lang}wcf.user.editProfile{/lang}</span></a></li>
                                                {/if}
                                                
                                                {event name='contentHeaderNavigation'}
 {capture assign='contentInteractionButtons'}
        {if $__menuSearch}
                <div class="contentInteractionButton dropdown jsOnly">
-                       <a href="#" class="button small dropdownToggle"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.user.searchUserContent{/lang}</span></a>
+                       <a href="#" class="button small dropdownToggle">{icon size=16 name='search' type='solid'} <span>{lang}wcf.user.searchUserContent{/lang}</span></a>
                        <ul class="dropdownMenu userProfileButtonMenu" data-menu="search">
                                {@$__menuSearch}
                        </ul>
        {/if}
        {if $__menuManagement}
                <div class="contentInteractionButton dropdown jsOnly">
-                       <a href="#" class="button small dropdownToggle"><span class="icon icon16 fa-cog"></span> <span>{lang}wcf.user.profile.management{/lang}</span></a>
+                       <a href="#" class="button small dropdownToggle">{icon size=16 name='cog' type='solid'} <span>{lang}wcf.user.profile.management{/lang}</span></a>
                        <ul class="dropdownMenu userProfileButtonMenu" data-menu="management">
                                {@$__menuManagement}
                        </ul>
index 63bdbfd20585c61f6365d0b022d5e1d47a3a9819..50c5675ec654e39eba51694fa2b440afeb335bbb 100644 (file)
@@ -3,21 +3,21 @@
                <ul class="buttonList iconList">
                        {content}
                                {if $user->homepage && $user->homepage != 'http://'}
-                                       <li><a class="jsTooltip" title="{lang}wcf.user.option.homepage{/lang}" {anchorAttributes url=$user->homepage appendClassname=false isUgc=true}><span class="icon icon16 fa-home"></span> <span class="invisible">{lang}wcf.user.option.homepage{/lang}</span></a></li>
+                                       <li><a class="jsTooltip" title="{lang}wcf.user.option.homepage{/lang}" {anchorAttributes url=$user->homepage appendClassname=false isUgc=true}>{icon size=16 name='house' type='solid'} <span class="invisible">{lang}wcf.user.option.homepage{/lang}</span></a></li>
                                {/if}
                                
                                {if $user->userID != $__wcf->user->userID}
                                        {if $user->isAccessible('canViewEmailAddress')}
-                                               <li><a class="jsTooltip" href="mailto:{@$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}"><span class="icon icon16 fa-envelope-o"></span> <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
+                                               <li><a class="jsTooltip" href="mailto:{@$user->getEncodedEmail()}" title="{lang}wcf.user.button.mail{/lang}">{icon size=16 name='envelope'} <span class="invisible">{lang}wcf.user.button.mail{/lang}</span></a></li>
                                        {/if}
                                {/if}
                                
                                {if $__wcf->user->userID && $user->userID != $__wcf->user->userID}
                                        {if !$__wcf->getUserProfileHandler()->isIgnoredByUser($user->userID)}
                                                {if $__wcf->getUserProfileHandler()->isFollowing($user->userID)}
-                                                       <li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}"><span class="icon icon16 fa-minus"></span> <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
+                                                       <li class="jsOnly"><a href="#" data-following="1" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.unfollow{/lang}">{icon size=16 name='minus' type='solid'} <span class="invisible">{lang}wcf.user.button.unfollow{/lang}</span></a></li>
                                                {else}
-                                                       <li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}"><span class="icon icon16 fa-plus"></span> <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
+                                                       <li class="jsOnly"><a href="#" data-following="0" data-object-id="{@$user->userID}" class="jsFollowButton jsTooltip" title="{lang}wcf.user.button.follow{/lang}">{icon size=16 name='plus' type='solid'} <span class="invisible">{lang}wcf.user.button.follow{/lang}</span></a></li>
                                                {/if}
                                        {/if}
                                {/if}
index 61d616cdb7f818dbb50ed8f3834c293239d8ccf3..589613ef50dddb3080f05016f224f279506a8439 100644 (file)
@@ -43,7 +43,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{icon size=16 name='check' type='solid'} <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 
index 27e816a5340b37ccd20135c15f19d79cc4f9bc65..d7d7fda16a236f0c0690fd67b685b887ece74ccf 100644 (file)
@@ -1,6 +1,6 @@
 <div id="workerContainer">
        <header class="box48 contentHeader">
-               <span class="icon icon48 fa-spinner"></span>
+               {icon size=48 name='spinner' type='solid'}
                
                <div>
                        <h1 class="contentTitle">{lang}wcf.global.worker.executing{/lang}</h1>