From 2ce6c59cf4205e8db7df72f1b66734b694a3e692 Mon Sep 17 00:00:00 2001 From: spiderr Date: Sat, 30 Jul 2022 17:01:55 -0400 Subject: migrate from font-awesome 3.2.1 icon- to 6.1.2 fa- --- includes/classes/BitBoardTopic.php | 14 +++++++------- templates/board_assign.tpl | 6 +++--- templates/board_table.tpl | 4 ++-- templates/boards_service_icons.tpl | 2 +- templates/flipswitch.tpl | 6 +++--- templates/legend_inc.tpl | 6 +++--- templates/list_posts.tpl | 8 ++++---- templates/list_topics.tpl | 18 +++++++++--------- templates/menu_boards.tpl | 6 +++--- templates/post_display.tpl | 16 ++++++++-------- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/includes/classes/BitBoardTopic.php b/includes/classes/BitBoardTopic.php index 8983089..1f12a89 100644 --- a/includes/classes/BitBoardTopic.php +++ b/includes/classes/BitBoardTopic.php @@ -610,9 +610,9 @@ class BitBoardTopic extends LibertyMime { $flip['is_locked']['req']=2; $flip['is_locked']['id']=$arr['th_thread_id']; $flip['is_locked']['idname']='t'; - $flip['is_locked']['up']='icon-lock'; + $flip['is_locked']['up']='fa-lock'; $flip['is_locked']['upname']=tra('Thread Locked'); - $flip['is_locked']['down']='icon-unlock'; + $flip['is_locked']['down']='fa-unlock'; $flip['is_locked']['downname']=tra('Thread Unlocked'); $flip['is_locked']['perm']='p_boards_update'; @@ -620,9 +620,9 @@ class BitBoardTopic extends LibertyMime { $flip['is_sticky']['req'] = 3; $flip['is_sticky']['id']=$arr['th_thread_id']; $flip['is_sticky']['idname']='t'; - $flip['is_sticky']['up']='icon-exclamation-sign'; + $flip['is_sticky']['up']='fa-circle-exclamation'; $flip['is_sticky']['upname']=tra('Sticky Thread'); - $flip['is_sticky']['down']='icon-list'; + $flip['is_sticky']['down']='fa-list-ul'; $flip['is_sticky']['downname']=tra('Non Sticky Thread'); $flip['is_sticky']['perm']='p_boards_update'; @@ -631,7 +631,7 @@ class BitBoardTopic extends LibertyMime { $flip['notify']['req']=5; $flip['notify']['id']=$arr['th_thread_id']; $flip['notify']['idname']='t'; - $flip['notify']['up']='icon-bell-alt'; + $flip['notify']['up']='fa-bell'; $flip['notify']['upname']=tra('Reply Notification'); $flip['notify']['down']='icon-bell'; $flip['notify']['downname']=tra('Reply Notification Disabled'); @@ -642,9 +642,9 @@ class BitBoardTopic extends LibertyMime { $flip['new']['req']=4; $flip['new']['id']=$arr['th_thread_id']; $flip['new']['idname']='t'; - $flip['new']['up']='icon-asterisk'; + $flip['new']['up']='fa-asterisk'; $flip['new']['upname']=tra('New Posts'); -// $flip['new']['down']='icon-comment-alt'; +// $flip['new']['down']='fa-comment'; // $flip['new']['downname']=tra('No new posts'); $flip['new']['perm']='p_boards_read'; } diff --git a/templates/board_assign.tpl b/templates/board_assign.tpl index cacd5f1..4867e38 100644 --- a/templates/board_assign.tpl +++ b/templates/board_assign.tpl @@ -47,7 +47,7 @@ {if $board.map} {capture assign=title} {if ! $board.integrity} - {booticon iname="icon-warning-sign" iexplain="Integrity Check Failed"} + {booticon iname="fa-triangle-exclamation" iexplain="Integrity Check Failed"} {/if} {$board.title|escape} {/capture} @@ -56,7 +56,7 @@ {if ! $board.integrity}
- {booticon iname="icon-warning-sign" ipackage="icons" ipath="large" iexplain="Fix Integrity"} + {booticon iname="fa-triangle-exclamation" iexplain="Fix Integrity"}
{formfeedback warning="Integrity Check Failed"} @@ -78,7 +78,7 @@ {$mapping.thread_count} - {booticon iname="icon-trash" ipackage="icons" iexplain="Remove from board"} + {booticon iname="fa-trash" iexplain="Remove from board"} {/foreach} diff --git a/templates/board_table.tpl b/templates/board_table.tpl index 29e559c..6f425a6 100644 --- a/templates/board_table.tpl +++ b/templates/board_table.tpl @@ -18,9 +18,9 @@ {* topic tracking icons *} {if $board.track.on && $board.track.mod} - {booticon iname="icon-asterisk" ipackage="icons" ipath="large" iexplain="New Posts" iforce="icon"} + {booticon iname="fa-asterisk" iexplain="New Posts"} {else} - {booticon iname="icon-asterisk" ipackage="icons" ipath="large" iexplain="New Posts" iforce="icon"} + {booticon iname="fa-asterisk" iexplain="New Posts"} {/if} {$board_title}
{$board.parsed_data} diff --git a/templates/boards_service_icons.tpl b/templates/boards_service_icons.tpl index 0c6d9a3..de8c7b0 100644 --- a/templates/boards_service_icons.tpl +++ b/templates/boards_service_icons.tpl @@ -1,3 +1,3 @@ {if $boardInfo.board_id} - {booticon ipackage="boards" iname="icon-comments" iexplain="Discuss"} [{$boardInfo.post_count}] + {booticon ipackage="boards" iname="fa-comments" iexplain="Discuss"} [{$boardInfo.post_count}] {/if} diff --git a/templates/flipswitch.tpl b/templates/flipswitch.tpl index 922eab2..2331fcc 100644 --- a/templates/flipswitch.tpl +++ b/templates/flipswitch.tpl @@ -14,13 +14,13 @@ $flip_downname=>$flip.$flip_name.downname {if $gContent->hasUserPermission( $flip.$flip_name.perm )} {if $flip.$flip_name.state==1} - {booticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"} + {booticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname} {else} - {booticon ipackage=icons iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname iforce="icon"} + {booticon ipackage=icons iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname} {/if} {elseif $flip.$flip_name.state==1} - {booticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"} + {booticon iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname} {/if} {/strip} diff --git a/templates/legend_inc.tpl b/templates/legend_inc.tpl index be1d11a..9d90f71 100644 --- a/templates/legend_inc.tpl +++ b/templates/legend_inc.tpl @@ -2,9 +2,9 @@ {if $topicicons}
    -
  • {booticon iname="icon-lock" ipackage="icons" ipath=large iexplain="Thread Closed" iforce="icon"} {tr}Thread Closed{/tr}
    • -
  • {booticon iname="icon-exclamation-sign" ipackage="icons" ipath=large iexplain="Sticky" iforce="icon"} {tr}Sticky{/tr}
    • -
  • {booticon iname="icon-asterisk" ipackage="icons" ipath=large iexplain="New Posts" iforce="icon"} {tr}New Posts{/tr}
    • +
  • {booticon iname="fa-lock" iexplain="Thread Closed"} {tr}Thread Closed{/tr}
    • +
  • {booticon iname="fa-circle-exclamation" iexplain="Sticky"} {tr}Sticky{/tr}
    • +
  • {booticon iname="fa-asterisk" iexplain="New Posts"} {tr}New Posts{/tr}
{/if} diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl index 3d3cedd..e65857c 100644 --- a/templates/list_posts.tpl +++ b/templates/list_posts.tpl @@ -15,7 +15,7 @@ {* always go back to page 1 since changing any of these values repaginates and makes the current page number meaningless *} - @@ -36,7 +36,7 @@ {/form} {if $gBitSystem->isPackageActive( 'rss' )} - {booticon iname="icon-rss" ipackage=rss iexplain="Get RSS Feed"} + {booticon iname="fa-rss" iexplain="Get RSS Feed"} {/if} {assign var=flip value=$thread->getFlipFlop()} {foreach from=$flip item=flip_s key=flip_name} @@ -54,7 +54,7 @@
{if !$topic_locked && $board->hasPostCommentsPermission()}
- {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr} + {booticon iname="fa-comment" iexplain="Post Reply"} {tr}Post Reply{/tr}
{/if} @@ -82,7 +82,7 @@ {if !$topic_locked && $board->hasPostCommentsPermission()}
- {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr} + {booticon iname="fa-comment" iexplain="Post Reply"} {tr}Post Reply{/tr}
{/if} diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl index efb6e45..ea0e151 100644 --- a/templates/list_topics.tpl +++ b/templates/list_topics.tpl @@ -11,16 +11,16 @@ {if $print_page ne 'y'} {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$board->mInfo} {if $board->getPreference('boards_mailing_list') || $board->hasAdminPermission()} - {booticon ipackage="icons" iname="icon-envelope" iexplain="Edit Board Mailing List"} + {booticon iname="fa-envelope" iexplain="Edit Board Mailing List"} {/if} {if $gBitSystem->isPackageActive( 'rss' )} - {booticon iname="icon-rss" ipackage=rss iexplain="Get RSS Feed"} + {booticon iname="fa-rss" iexplain="Get RSS Feed"} {/if} {if $board->hasUpdatePermission()} - {booticon iname="icon-edit" ipackage="icons" iexplain="Edit Message Board"} + {booticon iname="fa-pen-to-square" iexplain="Edit Message Board"} {/if} {if $board->hasUserPermission( 'p_boards_remove', TRUE, TRUE )} - {booticon iname="icon-trash" ipackage="icons" iexplain="Remove Message Board"} + {booticon iname="fa-trash" iexplain="Remove Message Board"} {/if} {/if} {*if $board->hasPostCommentsPermission()} @@ -66,7 +66,7 @@ {* topic status icons *} {if $thread.th_moved>0} - {booticon ipackage="icons" iname="icon-share" iexplain="Moved Topic"} + {booticon ipackage="icons" iname="fa-share" iexplain="Moved Topic"} {else} {assign var=flip value=$thread.flip} {foreach from=$flip item=flip_s key=flip_name} @@ -96,18 +96,18 @@ {* modcomments handles this *} {if $thread.flc_user_id<0 && $thread.first_approved==0 && !$gBitSystem->isPackageActive('modcomments')} - {booticon iname="icon-plus-sign" ipackage="icons" iexplain="Approve First Post" iforce="icon"} + {booticon iname="fa-circle-plus" iexplain="Approve First Post"} - {booticon iname="icon-minus-sign" ipackage="icons" iexplain="Reject First Post" iforce="icon"} + {booticon iname="fa-circle-minus" iexplain="Reject First Post"} {/if} {if $thread.th_moved==0 && $board->hasAdminPermission()} {*smartlink ititle="Edit" ifile="edit.php" ibiticon="liberty/edit" board_id=$thread.board_id*} {booticon ipackage=icons iname="icon-share" iexplain="Move Thread" iforce="icon"} - {booticon iname="icon-trash" ipackage="icons" iexplain="Delete Thread" iforce="icon"} + title="{tr}Move Thread{/tr}">{booticon iname="fa-share" iexplain="Move Thread"} + {booticon iname="fa-trash" iexplain="Delete Thread"} {/if} diff --git a/templates/menu_boards.tpl b/templates/menu_boards.tpl index 6ce94ca..09ca341 100644 --- a/templates/menu_boards.tpl +++ b/templates/menu_boards.tpl @@ -2,11 +2,11 @@ {if $packageMenuTitle} {tr}{$packageMenuTitle}{/tr} {/if} {/strip} diff --git a/templates/post_display.tpl b/templates/post_display.tpl index a50083e..383d949 100644 --- a/templates/post_display.tpl +++ b/templates/post_display.tpl @@ -27,29 +27,29 @@
{if $print_page ne 'y' && $comment.deleted==0 } {if !$topic_locked && $board->hasPostCommentsPermission()} - {booticon iname="icon-comment-alt" ipackage="icons" iexplain="Reply to this Post" iforce="icon"} + {booticon iname="fa-comment" iexplain="Reply to this Post"} {/if} {if !$topic_locked && $board->hasPostCommentsPermission()} - {booticon ipackage="icons" iname="icon-comment" iexplain="Reply with Quote to this Post" iforce="icon"} + {booticon iname="fa-comment" iexplain="Reply with Quote to this Post"} {/if} {if $comment.is_editable || $gContent->hasUserPermission('p_liberty_edit_comments')} - {booticon iname="icon-edit" ipackage="icons" iexplain="Edit" iforce="icon"} + {booticon iname="fa-pen-to-square" iexplain="Edit"} {/if} {if $board->hasUserPermission( 'p_liberty_admin_comments' )} - {booticon iname="icon-trash" ipackage="icons" iexplain="Remove" iforce="icon"} + {booticon iname="fa-trash" iexplain="Remove"} {/if} {if $board->hasUpdatePermission() && (($comment.user_id<0 && $comment.is_approved==0)||$comment.user_id>=0) && !$comment.is_warned} {if $comment.user_id<0 && $comment.is_approved==0} - {booticon iname="icon-plus-sign" ipackage="icons" iexplain="Approve Post" iforce="icon"} + {booticon iname="fa-circle-plus" iexplain="Approve Post"} - {booticon iname="icon-minus-sign" ipackage="icons" iexplain="Reject Post" iforce="icon"} + {booticon iname="fa-circle-minus" iexplain="Reject Post"} {elseif !$comment.is_warned && $comment.user_id>=0} - {booticon iname="icon-warning-sign" ipackage="icons" iexplain="Warn Post" iforce="icon"} + {booticon iname="fa-triangle-exclamation" iexplain="Warn Post"}