From 295e77ea22ca6f7a51012c7e2e3d743c660dd4fc Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 12 Aug 2022 16:36:14 +0200 Subject: [PATCH] Replace legacy icons in templates --- .../templates/__booleanFormField.tpl | 4 ++-- com.woltlab.wcf/templates/__box.tpl | 2 +- .../templates/accountManagement.tpl | 8 ++++---- com.woltlab.wcf/templates/aclSimple.tpl | 12 ++++++------ com.woltlab.wcf/templates/article.tpl | 18 +++++++++--------- com.woltlab.wcf/templates/articleAdd.tpl | 10 +++++----- com.woltlab.wcf/templates/articleList.tpl | 6 +++--- com.woltlab.wcf/templates/articleListItems.tpl | 2 +- com.woltlab.wcf/templates/attachments.tpl | 6 +++--- .../templates/booleanOptionType.tpl | 4 ++-- .../templates/booleanSearchableOptionType.tpl | 4 ++-- com.woltlab.wcf/templates/boxArticleList.tpl | 4 ++-- .../templates/categoryArticleList.tpl | 6 +++--- com.woltlab.wcf/templates/cms.tpl | 4 ++-- com.woltlab.wcf/templates/commentList.tpl | 6 +++--- .../templates/commentResponseList.tpl | 6 +++--- .../templates/contentInteraction.tpl | 2 +- com.woltlab.wcf/templates/editHistory.tpl | 2 +- com.woltlab.wcf/templates/following.tpl | 2 +- com.woltlab.wcf/templates/ignoredUsers.tpl | 2 +- com.woltlab.wcf/templates/login.tpl | 8 ++++---- com.woltlab.wcf/templates/mediaEditor.tpl | 2 +- com.woltlab.wcf/templates/membersList.tpl | 2 +- com.woltlab.wcf/templates/messageFormTabs.tpl | 8 ++++---- .../templates/messageFormTabsInline.tpl | 8 ++++---- .../templates/moderationActivation.tpl | 8 ++++---- com.woltlab.wcf/templates/moderationList.tpl | 6 +++--- com.woltlab.wcf/templates/moderationReport.tpl | 10 +++++----- com.woltlab.wcf/templates/notificationList.tpl | 4 ++-- .../templates/notificationSettings.tpl | 2 +- com.woltlab.wcf/templates/pageHeaderUser.tpl | 10 +++++----- com.woltlab.wcf/templates/permissionDenied.tpl | 4 ++-- com.woltlab.wcf/templates/searchResultList.tpl | 2 +- com.woltlab.wcf/templates/shareButtons.tpl | 6 +++--- com.woltlab.wcf/templates/tagged.tpl | 2 +- com.woltlab.wcf/templates/trophy.tpl | 2 +- .../templates/unreadArticleList.tpl | 2 +- com.woltlab.wcf/templates/user.tpl | 8 ++++---- .../templates/userInformationButtons.tpl | 8 ++++---- .../templates/watchedArticleList.tpl | 2 +- com.woltlab.wcf/templates/worker.tpl | 2 +- 41 files changed, 108 insertions(+), 108 deletions(-) diff --git a/com.woltlab.wcf/templates/__booleanFormField.tpl b/com.woltlab.wcf/templates/__booleanFormField.tpl index 9acc4daa2e..c3b8421333 100644 --- a/com.woltlab.wcf/templates/__booleanFormField.tpl +++ b/com.woltlab.wcf/templates/__booleanFormField.tpl @@ -12,7 +12,7 @@ *}{if $field->getValue()} checked{/if}{* *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}> - +
  • getValue()} checked{/if}{* *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* *}> - +
    • diff --git a/com.woltlab.wcf/templates/__box.tpl b/com.woltlab.wcf/templates/__box.tpl index 5f08858551..cc544999d8 100644 --- a/com.woltlab.wcf/templates/__box.tpl +++ b/com.woltlab.wcf/templates/__box.tpl @@ -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()} - + {icon size=16 name='pen-to-square'} {/if} {if $box->getImage()}
    diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index c3dafe104c..0d29c70e21 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -227,7 +227,7 @@ {if $__wcf->session->getVar('__3rdPartyProvider') === 'github' && $__wcf->session->getVar('__oauthUser')} {else} - {lang}wcf.user.3rdparty.github.connect{/lang} + {icon size=24 name='github' type='brand'} {lang}wcf.user.3rdparty.github.connect{/lang} {/if} @@ -240,7 +240,7 @@ {if $__wcf->session->getVar('__3rdPartyProvider') === 'twitter' && $__wcf->session->getVar('__oauthUser')} {else} - {lang}wcf.user.3rdparty.twitter.connect{/lang} + {icon size=24 name='twitter' type='brand'} {lang}wcf.user.3rdparty.twitter.connect{/lang} {/if} @@ -253,7 +253,7 @@ {if $__wcf->session->getVar('__3rdPartyProvider') === 'facebook' && $__wcf->session->getVar('__oauthUser')} {else} - {lang}wcf.user.3rdparty.facebook.connect{/lang} + {icon size=24 name='facebook-f' type='brand'} {lang}wcf.user.3rdparty.facebook.connect{/lang} {/if} @@ -266,7 +266,7 @@ {if $__wcf->session->getVar('__3rdPartyProvider') === 'google' && $__wcf->session->getVar('__oauthUser')} {else} - {lang}wcf.user.3rdparty.google.connect{/lang} + {icon size=24 name='google' type='brand'} {lang}wcf.user.3rdparty.google.connect{/lang} {/if} diff --git a/com.woltlab.wcf/templates/aclSimple.tpl b/com.woltlab.wcf/templates/aclSimple.tpl index ca12024b23..8c49e69801 100644 --- a/com.woltlab.wcf/templates/aclSimple.tpl +++ b/com.woltlab.wcf/templates/aclSimple.tpl @@ -9,11 +9,11 @@
    1. - +
    2. - +
    @@ -27,11 +27,11 @@
    1. - +
    2. - +
    {lang}wcf.acl.access.invertPermissions.description{/lang} @@ -55,7 +55,7 @@
    diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl index 786e5e58f2..e3547a994a 100644 --- a/com.woltlab.wcf/templates/articleAdd.tpl +++ b/com.woltlab.wcf/templates/articleAdd.tpl @@ -15,7 +15,7 @@ {if ARTICLE_ENABLE_VISIT_TRACKING} - {lang}wcf.global.button.markAllAsRead{/lang} + {icon size=16 name='check' type='solid'} {lang}wcf.global.button.markAllAsRead{/lang} {/if} {/capture} diff --git a/com.woltlab.wcf/templates/articleListItems.tpl b/com.woltlab.wcf/templates/articleListItems.tpl index ef3c0fa55f..ecf2ee6bad 100644 --- a/com.woltlab.wcf/templates/articleListItems.tpl +++ b/com.woltlab.wcf/templates/articleListItems.tpl @@ -65,7 +65,7 @@ {/if} {if $article->getDiscussionProvider()->getDiscussionCountPhrase()}{* empty phrase indicates that comments are disabled *}
    - + {icon size=16 name='comments' type='solid'} {$article->getDiscussionProvider()->getDiscussionCount()} diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl index b58740a677..5c181f66ef 100644 --- a/com.woltlab.wcf/templates/attachments.tpl +++ b/com.woltlab.wcf/templates/attachments.tpl @@ -43,15 +43,15 @@ diff --git a/com.woltlab.wcf/templates/booleanOptionType.tpl b/com.woltlab.wcf/templates/booleanOptionType.tpl index 4729f86a47..db6b9358a8 100644 --- a/com.woltlab.wcf/templates/booleanOptionType.tpl +++ b/com.woltlab.wcf/templates/booleanOptionType.tpl @@ -1,10 +1,10 @@
    1. - +
    2. - +
    diff --git a/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl b/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl index d84f547a12..d66a1bfff9 100644 --- a/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/booleanSearchableOptionType.tpl @@ -2,11 +2,11 @@
    1. - +
    2. - +
    diff --git a/com.woltlab.wcf/templates/boxArticleList.tpl b/com.woltlab.wcf/templates/boxArticleList.tpl index b60b5fbe9c..cc791c9a26 100644 --- a/com.woltlab.wcf/templates/boxArticleList.tpl +++ b/com.woltlab.wcf/templates/boxArticleList.tpl @@ -42,12 +42,12 @@

    {$boxArticle->getTitle()}

    diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl index e2743f7e21..3e3f43b189 100644 --- a/com.woltlab.wcf/templates/categoryArticleList.tpl +++ b/com.woltlab.wcf/templates/categoryArticleList.tpl @@ -21,9 +21,9 @@ {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')} {capture assign='contentHeaderNavigation'} {if $availableLanguages|count > 1} -
  • {lang}wcf.acp.article.add{/lang}
    • +
  • {icon size=16 name='plus' type='solid'} {lang}wcf.acp.article.add{/lang}
    • {else} -
  • {lang}wcf.acp.article.add{/lang}
    • +
  • {icon size=16 name='plus' type='solid'} {lang}wcf.acp.article.add{/lang}
    • {/if} {/capture} {/if} @@ -67,7 +67,7 @@ {lang}wcf.user.objectWatch.button.subscribe{/lang} {/if} {if ARTICLE_ENABLE_VISIT_TRACKING} - {lang}wcf.global.button.markAllAsRead{/lang} + {icon size=16 name='check' type='solid'} {lang}wcf.global.button.markAllAsRead{/lang} {/if} {/capture} diff --git a/com.woltlab.wcf/templates/cms.tpl b/com.woltlab.wcf/templates/cms.tpl index 313d02ad8c..04a7ffdb11 100644 --- a/com.woltlab.wcf/templates/cms.tpl +++ b/com.woltlab.wcf/templates/cms.tpl @@ -13,7 +13,7 @@ {capture assign='contentInteractionButtons'} {if $page->showShareButtons()} - {lang}wcf.message.share{/lang} + {icon size=16 name='share' type='solid'} {lang}wcf.message.share{/lang} {/if} {if $page->isMultilingual && $__wcf->user->userID && $page->getPageLanguages()|count > 1} @@ -35,7 +35,7 @@
    {/if} - {if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')} {lang}wcf.acp.page.edit{/lang}{/if} + {if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}{icon size=16 name='pencil' type='solid'} {lang}wcf.acp.page.edit{/lang}{/if} {/capture} {include file='header'} diff --git a/com.woltlab.wcf/templates/commentList.tpl b/com.woltlab.wcf/templates/commentList.tpl index 79705f375f..de0b45ebba 100644 --- a/com.woltlab.wcf/templates/commentList.tpl +++ b/com.woltlab.wcf/templates/commentList.tpl @@ -48,14 +48,14 @@