Use icons in content interaction buttons

diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl
index 8406b9f0c66054f41745c8a276facbc2c1989165..654027d861aed7a74c307aa1cd8f6cb12199ee9d 100644 (file)
--- a/com.woltlab.wcf/templates/articleAdd.tpl
+++ b/com.woltlab.wcf/templates/articleAdd.tpl
@@ -28,12 +28,12 @@
 {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}>{lang}wcf.global.button.restore{/lang}</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}>{lang}wcf.global.button.delete{/lang}</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}>{lang}wcf.global.button.trash{/lang}</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}><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>
                {/if}
                {if $languages|count > 1 || $article->isMultilingual}
-                       <a href="#" class="contentInteractionButton button small jsButtonToggleI18n">{lang}wcf.acp.article.button.toggleI18n{/lang}</a>
+                       <a href="#" class="contentInteractionButton button small jsButtonToggleI18n"><span class="icon icon16 fa-language"></span> <span>{lang}wcf.acp.article.button.toggleI18n{/lang}</span></a>
                {/if}
        {/if}
 {/capture}

diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index f5e88a5c4c9ff4099fbc515942ee52c5b995794f..a4c6b670944e5c6b35915b566dd0f2cf67da9f49 100644 (file)
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -63,7 +63,7 @@
 
 {capture assign='contentInteractionButtons'}
        <div class="contentInteractionButton dropdown jsOnly">
-               <a href="#" class="button small dropdownToggle">{lang}wcf.article.button.sort{/lang}</a>
+               <a href="#" class="button small dropdownToggle"><span class="icon icon16 fa-sort-amount-desc"></span> <span>{lang}wcf.article.button.sort{/lang}</span></a>
                <ul class="dropdownMenu">
                        <li><a href="{link controller='ArticleList'}pageNo={@$pageNo}{if $user}&userID={@$user->userID}{/if}&sortField=title&sortOrder={if $sortField == 'title' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.title{/lang}{if $sortField == 'title'} <span class="icon icon16 fa-caret-{if $sortOrder == 'ASC'}up{else}down{/if}"></span>{/if}</a></li>
                        <li><a href="{link controller='ArticleList'}pageNo={@$pageNo}{if $user}&userID={@$user->userID}{/if}&sortField=time&sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.date{/lang}{if $sortField == 'time'} <span class="icon icon16 fa-caret-{if $sortOrder == 'ASC'}up{else}down{/if}"></span>{/if}</a></li>
@@ -72,7 +72,7 @@
                </ul>
        </div>
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 174550195ef78cc6a45433ddb7e4c85cae49667a..e2743f7e2146f87a7370dc8ec110074111bd027a 100644 (file)
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -64,10 +64,10 @@
 
 {capture assign='contentInteractionButtons'}
        {if $__wcf->user->userID}
-               <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}">{lang}wcf.user.objectWatch.button.subscribe{/lang}</a>
+               <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">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/cms.tpl b/com.woltlab.wcf/templates/cms.tpl
index 76bbe2088ee277064fc11648529e60249279f825..313d02ad8ce8cd6b6095d07ba5d6003080ec102e 100644 (file)
--- a/com.woltlab.wcf/templates/cms.tpl
+++ b/com.woltlab.wcf/templates/cms.tpl
@@ -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()}">{lang}wcf.message.share{/lang}</a>
+               <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>
        {/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">{lang}wcf.acp.page.edit{/lang}</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"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.page.edit{/lang}</span></a>{/if}
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index 43a5710e489a87e11bd8a9cfdb757e97077cb649..719c732d7852cf4ed91278d2869c61a05621d07d 100644 (file)
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -45,10 +45,10 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a id="moderationAssignUser" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.assignedUser.change{/lang}</a>
+       <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>
        {if !$queue->isDone()}
-               <a id="enableContent" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.activation.enableContent{/lang}</a>
-               {if $queueManager->canRemoveContent($queue->getDecoratedObject())}<a id="removeContent" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.activation.removeContent{/lang}</a>{/if}
+               <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}
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index a80d8a4339f5eb5c56a82802ec85b0506426c652..9be41867c1b635538b4080acb54fe6031c48d3be 100644 (file)
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -11,7 +11,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+       <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 723842f38e5ce25c04b595c1561b0ded36ea7072..dc1b55cff082d9b949fb2295aa48a44504e567a3 100644 (file)
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -45,15 +45,15 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a id="moderationAssignUser" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.assignedUser.change{/lang}</a>
+       <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>
        {if !$queue->isDone()}
                {if $queueManager->canRemoveContent($queue->getDecoratedObject())}
-                       <a id="removeContent" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.activation.removeContent{/lang}</a>
+                       <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="removeReport" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.report.removeReport{/lang}</a>
+               <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>
        {/if}
        {if $queue->canChangeJustifiedStatus()}
-               <a id="changeJustifiedStatus" class="contentInteractionButton button small jsOnly">{lang}wcf.moderation.report.changeJustifiedStatus{/lang}</a>
+               <a id="changeJustifiedStatus" class="contentInteractionButton button small jsOnly"><span class="icon icon16 fa-refresh"></span> <span>{lang}wcf.moderation.report.changeJustifiedStatus{/lang}</span></a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 187ab6dff25c9c4e40a0862e2df6e0434144e74a..62cd9904a6dbc8d996e714987627974f76ce8b3a 100644 (file)
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -28,7 +28,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if $__wcf->getUserNotificationHandler()->getNotificationCount()}
-               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+               <a href="#" class="jsMarkAllAsConfirmed contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl
index 5a2758b563a0766055096509711ff3263041b738..a87ac92230c05e372414893425aacf40fe8c1335 100644 (file)
--- a/com.woltlab.wcf/templates/tagged.tpl
+++ b/com.woltlab.wcf/templates/tagged.tpl
@@ -41,7 +41,7 @@
 {/capture}
 
 {capture assign='contentInteractionButtons'}
-       <a href="{link controller='TagSearch'}{/link}" class="contentInteractionButton button small">{lang}wcf.search.type.tags{/lang}</a>
+       <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>
 {/capture}
 
 {include file='header'}

diff --git a/com.woltlab.wcf/templates/unreadArticleList.tpl b/com.woltlab.wcf/templates/unreadArticleList.tpl
index f7e61e94bc9a9aea293fcb4c8a777d24a930898b..601ee850f76ddd0420eaafe54246758b0e8c5ebc 100644 (file)
--- a/com.woltlab.wcf/templates/unreadArticleList.tpl
+++ b/com.woltlab.wcf/templates/unreadArticleList.tpl
@@ -45,7 +45,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}
 

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 797fa312a47e1a32a5517e5683b1dfbf35695eed..361d97dc5ff997cf7db0f170de877505cb0835fb 100644 (file)
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -284,7 +284,7 @@
 {capture assign='contentInteractionButtons'}
        {if $__menuSearch}
                <div class="contentInteractionButton dropdown jsOnly">
-                       <a href="#" class="button small dropdownToggle">{lang}wcf.user.searchUserContent{/lang}</a>
+                       <a href="#" class="button small dropdownToggle"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.user.searchUserContent{/lang}</span></a>
                        <ul class="dropdownMenu userProfileButtonMenu" data-menu="search">
                                {@$__menuSearch}
                        </ul>
@@ -292,7 +292,7 @@
        {/if}
        {if $__menuManagement}
                <div class="contentInteractionButton dropdown jsOnly">
-                       <a href="#" class="button small dropdownToggle">{lang}wcf.user.profile.management{/lang}</a>
+                       <a href="#" class="button small dropdownToggle"><span class="icon icon16 fa-cog"></span> <span>{lang}wcf.user.profile.management{/lang}</span></a>
                        <ul class="dropdownMenu userProfileButtonMenu" data-menu="management">
                                {@$__menuManagement}
                        </ul>

diff --git a/com.woltlab.wcf/templates/watchedArticleList.tpl b/com.woltlab.wcf/templates/watchedArticleList.tpl
index c53b7d70056e9c74a18d2fd39ad95774d2cc5a6e..61d616cdb7f818dbb50ed8f3834c293239d8ccf3 100644 (file)
--- a/com.woltlab.wcf/templates/watchedArticleList.tpl
+++ b/com.woltlab.wcf/templates/watchedArticleList.tpl
@@ -43,7 +43,7 @@
 
 {capture assign='contentInteractionButtons'}
        {if ARTICLE_ENABLE_VISIT_TRACKING}
-               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly">{lang}wcf.global.button.markAllAsRead{/lang}</a>
+               <a href="#" class="markAllAsReadButton contentInteractionButton button small jsOnly"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.global.button.markAllAsRead{/lang}</span></a>
        {/if}
 {/capture}