From 5348f6ae9be6d2dcc9e65af98c7334d97200736b Mon Sep 17 00:00:00 2001
From: funson86 <funson86@gmail.com>
Date: Tue, 7 Jun 2022 10:16:00 +0800
Subject: [PATCH] no cdn bi m

---
 .../widgets/adminlte/BootstrapIconsAsset.php  | 17 -------------
 frontend/assets/BbsAsset.php                  |  2 +-
 frontend/assets/MallPlatformAsset.php         |  2 +-
 frontend/widgets/views/bbs-sidebar.php        |  2 +-
 .../bbs/default/views/comment/index_.php      |  8 +++----
 .../bbs/default/views/default/index.php       |  2 +-
 .../bbs/default/views/default/index_.php      |  2 +-
 .../bbs/default/views/layouts/footer.php      | 10 ++++----
 .../bbs/default/views/layouts/nav.php         |  4 ++--
 .../bbs/default/views/topic/view.php          | 24 +++++++++----------
 .../default/views/default/index-platform.php  |  2 +-
 .../default/views/layouts/footer-platform.php |  8 +++----
 .../default/views/layouts/nav-platform.php    |  4 ++--
 13 files changed, 35 insertions(+), 52 deletions(-)
 delete mode 100644 common/widgets/adminlte/BootstrapIconsAsset.php

diff --git a/common/widgets/adminlte/BootstrapIconsAsset.php b/common/widgets/adminlte/BootstrapIconsAsset.php
deleted file mode 100644
index dc12b2dd..00000000
--- a/common/widgets/adminlte/BootstrapIconsAsset.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace common\widgets\adminlte;
-
-use yii\web\AssetBundle;
-
-/**
- * Class Bootstrap4Asset
- * @package common\widgets\adminlte
- * @author funson86 <funson86@gmail.com>
- */
-class BootstrapIconsAsset extends AssetBundle
-{
-    public $css = [
-        'https://unpkg.com/bootstrap-icons@1.4.0/font/bootstrap-icons.css',
-    ];
-}
diff --git a/frontend/assets/BbsAsset.php b/frontend/assets/BbsAsset.php
index 0fe9227b..9151bf0a 100644
--- a/frontend/assets/BbsAsset.php
+++ b/frontend/assets/BbsAsset.php
@@ -22,10 +22,10 @@ class BbsAsset extends AssetBundle
         'yii\web\YiiAsset',
         'common\widgets\adminlte\Bootstrap4Asset',
         'common\widgets\adminlte\Bootstrap4PluginAsset',
-        'common\widgets\adminlte\BootstrapIconsAsset',
         'common\widgets\adminlte\FlagIconAsset',
         'common\widgets\funboot\assets\FunbootBootstrapFixAsset',
         'common\components\assets\CookieBarAsset',
+        'common\components\assets\FontAwesomeAsset',
 //        'yii\bootstrap\BootstrapAsset',
     ];
 }
diff --git a/frontend/assets/MallPlatformAsset.php b/frontend/assets/MallPlatformAsset.php
index f7eb2bf1..e4938813 100644
--- a/frontend/assets/MallPlatformAsset.php
+++ b/frontend/assets/MallPlatformAsset.php
@@ -22,10 +22,10 @@ class MallPlatformAsset extends AssetBundle
         'yii\web\YiiAsset',
         'common\widgets\adminlte\Bootstrap4Asset',
         'common\widgets\adminlte\Bootstrap4PluginAsset',
-        'common\widgets\adminlte\BootstrapIconsAsset',
         'common\widgets\adminlte\FlagIconAsset',
         'common\widgets\funboot\assets\FunbootBootstrapFixAsset',
         'common\components\assets\CookieBarAsset',
+        'common\components\assets\FontAwesomeAsset',
 //        'yii\bootstrap\BootstrapAsset',
     ];
 }
diff --git a/frontend/widgets/views/bbs-sidebar.php b/frontend/widgets/views/bbs-sidebar.php
index 5baa54ec..d242f68d 100644
--- a/frontend/widgets/views/bbs-sidebar.php
+++ b/frontend/widgets/views/bbs-sidebar.php
@@ -7,7 +7,7 @@
 <?php if ($type == 'topic') { ?>
 <div class="card">
     <div class="card-body text-center">
-        <?= Html::a(Html::tag('i', '', ['class' => 'bi-pencil']) . ' ' . Yii::t('app', 'Publish'), ['/bbs/topic/edit', 'type' => $type, 'node_id' => $nodeId], ['class' => 'btn btn-block btn-primary']) ?>
+        <?= Html::a(Html::tag('i', '', ['class' => 'fa fa-pencil']) . ' ' . Yii::t('app', 'Publish'), ['/bbs/topic/edit', 'type' => $type, 'node_id' => $nodeId], ['class' => 'btn btn-block btn-primary']) ?>
     </div>
 </div>
 <?php } ?>
diff --git a/web/resources/bbs/default/views/comment/index_.php b/web/resources/bbs/default/views/comment/index_.php
index 9287035b..1084a211 100644
--- a/web/resources/bbs/default/views/comment/index_.php
+++ b/web/resources/bbs/default/views/comment/index_.php
@@ -19,19 +19,19 @@
             <div class="float-right">
                 <?php if ($model->isOwner()) {
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-hand-thumbs-up']) . ' ' . Html::tag('span', $model->like) . ' 个赞 ',
+                        Html::tag('i', '', ['class' => 'fa fa-thumbs-o-up']) . ' ' . Html::tag('span', $model->like) . ' 个赞 ',
                         'javascript:;'
                     );
 
                     echo Html::a('',
                         ['/bbs/comment/update', 'id' => $model->id],
-                        ['title' => '修改回帖', 'class' => 'bi-pencil']
+                        ['title' => '修改回帖', 'class' => 'fa fa-pencil']
                     ) . ' ';
                     echo Html::a('',
                         ['/bbs/comment/delete', 'id' => $model->id],
                         [
                             'title' => '删除回复',
-                            'class' => 'bi-trash',
+                            'class' => 'fa fa-trash',
                             'data' => [
                                 'confirm' => "您确认要删除回复吗？",
                                 'method' => 'post',
@@ -40,7 +40,7 @@
                     );
                 } else {
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-hand-thumbs-up']) . ' ' . Html::tag('span', $model->like_count) . ' 个赞',
+                        Html::tag('i', '', ['class' => 'fa fa-thumbs-o-up']) . ' ' . Html::tag('span', $model->like_count) . ' 个赞',
                         '#',
                         [
                             'data-do' => 'like',
diff --git a/web/resources/bbs/default/views/default/index.php b/web/resources/bbs/default/views/default/index.php
index b62eb4ab..2f556abc 100644
--- a/web/resources/bbs/default/views/default/index.php
+++ b/web/resources/bbs/default/views/default/index.php
@@ -28,7 +28,7 @@
                     </li>
                     <?php } ?>
                     <li class="nav-item ml-auto mr-2">
-                        <a class="nav-link btn-primary" href="<?= Url::to(['/bbs/topic/edit', 'node_id' => Yii::$app->request->get('id')]) ?>" tabindex="-1" aria-disabled="true"><?= Html::tag('i', '', ['class' => 'bi-pencil']) . ' ' . Yii::t('app', 'Publish') ?></a>
+                        <a class="nav-link btn-primary" href="<?= Url::to(['/bbs/topic/edit', 'node_id' => Yii::$app->request->get('id')]) ?>" tabindex="-1" aria-disabled="true"><?= Html::tag('i', '', ['class' => 'fa fa-pencil']) . ' ' . Yii::t('app', 'Publish') ?></a>
                     </li>
                 </ul>
             </div>
diff --git a/web/resources/bbs/default/views/default/index_.php b/web/resources/bbs/default/views/default/index_.php
index 563bd1e7..292c0e41 100644
--- a/web/resources/bbs/default/views/default/index_.php
+++ b/web/resources/bbs/default/views/default/index_.php
@@ -15,7 +15,7 @@
     <div class="media-body small lh-125 border-gray">
         <div class="media-heading topic-title"><?= $model->grade == ActiveModel::GRADE_EXCELLENT ? Html::tag('span', '精', ['class' => 'badge badge-pill badge-info']) : '' ?><?= Html::a($model->name, ['/bbs/topic/view', 'id' => $model->id]) ?><?= $model->status == ActiveModel::STATUS_INACTIVE ? ' ' . Html::tag('span', Yii::t('app', 'Unverified'), ['class' => 'btn-warning pl-1 pr-1']) . ' ' . Html::a(Yii::t('app', 'Pass'), ['/bbs/topic/pass', 'id' => $model->id], ['class' => 'btn btn-sm btn-success']) . ' ' . Html::a(Yii::t('app', 'Delete'), ['/bbs/topic/delete', 'id' => $model->id], ['class' => 'btn btn-sm btn-danger']) : '' ?> </div>
         <div class="topic-info">
-            <a class="remove-padding-left" href="<?= Url::to(['/bbs/topic/view', 'id' => $model->id]) ?>"><span class="bi-hand-thumbs-up"> <?= $model->like ?> </span></a> •
+            <a class="remove-padding-left" href="<?= Url::to(['/bbs/topic/view', 'id' => $model->id]) ?>"><span class="fa fa-thumbs-o-up"> <?= $model->like ?> </span></a> •
             <a class="topic-node" href="<?= Url::to(['/bbs/default/index', 'id' => $model->node_id]) ?>"><?= $model->node->name ?></a> •
             <?php if ($model->comment > 0) { ?>
             <span>最后由 <a href="<?= Url::to(['/bbs/user/view', 'id' => $model->last_comment_user_id]) ?>"><strong> <?= $model->last_comment_username ?> </strong></a>于 <?= Yii::$app->formatter->asDate($model->last_comment_updated_at) ?> 回复 •
diff --git a/web/resources/bbs/default/views/layouts/footer.php b/web/resources/bbs/default/views/layouts/footer.php
index b47c05e7..a882f35f 100644
--- a/web/resources/bbs/default/views/layouts/footer.php
+++ b/web/resources/bbs/default/views/layouts/footer.php
@@ -28,11 +28,11 @@
 </div>
 
 <div class="btn-group-vertical" id="floatButton">
-    <button type="button" class="btn btn-light" id="goTop" title="<?= Yii::t('app', 'Go Top') ?>"><span class="bi-arrow-up"></span></button>
-    <button type="button" class="btn btn-light" id="refresh" title="<?= Yii::t('app', 'Refresh') ?>"><span class="bi-arrow-clockwise"></span></button>
-    <button type="button" class="btn btn-light" id="pageQrcode" title="<?= Yii::t('app', 'Qrcode') ?>"><span class="bi-upc-scan"></span>
-        <img class="qrcode" width="130" height="130" src="<?= Url::to(['/site/qr', 'text' => Yii::$app->request->absoluteUrl]) ?>"/>
+    <button type="button" class="btn btn-light" id="goTop" title="<?= Yii::t('app', 'Go Top') ?>"><span class="fa fa-chevron-up"></span></button>
+    <button type="button" class="btn btn-light" id="refresh" title="<?= Yii::t('app', 'Refresh') ?>"><span class="fa fa-refresh"></span></button>
+    <button type="button" class="btn btn-light" id="pageQrcode" title="<?= Yii::t('app', 'Qrcode') ?>"><span class="fa fa-qrcode"></span>
+        <img class="qrcode" width="130" height="130" src="<?= Url::to(['/bbs/default/qr', 'text' => Yii::$app->request->absoluteUrl]) ?>"/>
     </button>
-    <button type="button" class="btn btn-light" id="goBottom" title="<?= Yii::t('app', 'Go Bottom') ?>"><span class="bi-arrow-down"></span></button>
+    <button type="button" class="btn btn-light" id="goBottom" title="<?= Yii::t('app', 'Go Bottom') ?>"><span class="fa fa-chevron-down"></span></button>
 </div>
 
diff --git a/web/resources/bbs/default/views/layouts/nav.php b/web/resources/bbs/default/views/layouts/nav.php
index 874baf93..2dc4c7a6 100644
--- a/web/resources/bbs/default/views/layouts/nav.php
+++ b/web/resources/bbs/default/views/layouts/nav.php
@@ -59,7 +59,7 @@
 } else {
     // 通知
     /*$menuItems[] = [
-        'label' => Html::tag('i', '', ['class' => 'bi-bell-fill']) . (1 > 0 ?Html::tag('span', 1, ['class' => 'badge badge-danger']) : ''),
+        'label' => Html::tag('i', '', ['class' => 'fa fa-bell']) . (1 > 0 ?Html::tag('span', 1, ['class' => 'badge badge-danger']) : ''),
         'url' => ['/notice/index'],
         'options' => ['class' => 'notice-count'],
     ];*/
@@ -78,7 +78,7 @@
 
 // 语言
 /*$menuItems[] = [
-    'label' => Html::tag('i', '', ['class' => 'bi-globe']),
+    'label' => Html::tag('i', '', ['class' => 'fa fa-globe']),
     'items' => [
         ['label' => '<i class="flag-icon flag-icon-cn mr-2"></i>' . Yii::t('app', 'Chinese'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'cn']],
         ['label' => '<i class="flag-icon flag-icon-gb mr-2"></i>' . Yii::t('app', 'English'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'en']],
diff --git a/web/resources/bbs/default/views/topic/view.php b/web/resources/bbs/default/views/topic/view.php
index 318cccb7..268c101b 100644
--- a/web/resources/bbs/default/views/topic/view.php
+++ b/web/resources/bbs/default/views/topic/view.php
@@ -26,7 +26,7 @@
                         <div class="topic-info">
                             <a class="topic-node" href="<?= Url::to(['/bbs/default/index', 'id' => $model->node_id]) ?>"><?= Html::tag('span', $model->node->name, ['class' => 'btn-sm btn-info']) ?></a> •
                             <?= $model->tag_id > 0 ? Html::a($model->tag->name, ['/bbs/default/index', 'ModelSearch[tag_id]' => $model->tag_id], ['class' => 'btn-sm btn-info']) : '' ?> •
-                            <a class="remove-padding-left" href="<?= Url::to(['/bbs/topic/view', 'id' => $model->id]) ?>"><span class="bi-hand-thumbs-up"> <?= $model->like ?> </span></a> •
+                            <a class="remove-padding-left" href="<?= Url::to(['/bbs/topic/view', 'id' => $model->id]) ?>"><span class="fa fa-thumbs-o-up"> <?= $model->like ?> </span></a> •
                             <?php if ($model->comment > 0) { ?>
                             <span>最后由 <a href="<?= Url::to(['/bbs/user/view', 'id' => $model->last_comment_user_id]) ?>"><strong> <?= $model->last_comment_username ?> </strong></a>于 <?= Yii::$app->formatter->asDate($model->last_comment_updated_at) ?> 回复 •
                             <?php } else { ?>
@@ -55,7 +55,7 @@
             <div class="card-footer">
                 <?php
                 $like = Html::a(
-                    Html::tag('i', '', ['class' => 'bi-hand-thumbs-up']) . Html::tag('span', $model->like) . ' 个赞',
+                    Html::tag('i', '', ['class' => 'fa fa-thumbs-o-up']) . Html::tag('span', $model->like) . ' 个赞',
                     '#',
                     [
                         'data-action' => UserAction::ACTION_LIKE,
@@ -65,7 +65,7 @@
                     ]);
 
                 $hate = Html::a(
-                    Html::tag('i', '', ['class' => 'bi-hand-thumbs-down']) . ' 踩',
+                    Html::tag('i', '', ['class' => 'fa fa-thumbs-o-down']) . ' 踩',
                     '#',
                     [
                         'data-action' => UserAction::ACTION_HATE,
@@ -76,7 +76,7 @@
                 );
 
                 $follow = Html::a(
-                    Html::tag('i', '', ['class' => 'bi-eye']) . ' 关注',
+                    Html::tag('i', '', ['class' => 'fa fa-eye']) . ' 关注',
                     '#',
                     [
                         'data-action' => UserAction::ACTION_FOLLOW,
@@ -86,7 +86,7 @@
                     ]
                 );
                 $thanks = Html::a(
-                    Html::tag('i', '', ['class' => 'bi-heart']) . ' 感谢',
+                    Html::tag('i', '', ['class' => 'fa fa-heart-o']) . ' 感谢',
                     '#',
                     [
                         'data-action' => UserAction::ACTION_THANKS,
@@ -96,7 +96,7 @@
                     ]
                 );
                 $favorite = Html::a(
-                    Html::tag('i', '', ['class' => 'bi-bookmark']) . ' 收藏',
+                    Html::tag('i', '', ['class' => 'fa fa-bookmark-o']) . ' 收藏',
                     '#',
                     [
                         'data-action' => UserAction::ACTION_FAVORITE,
@@ -109,7 +109,7 @@
 
                 if ($model->isOwner()) {
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-hand-thumbs-up']) . ' ' . Html::tag('span', $model->like) . ' 个赞',
+                        Html::tag('i', '', ['class' => 'fa fa-thumbs-o-up']) . ' ' . Html::tag('span', $model->like) . ' 个赞',
                         'javascript:;'
                     );
                 } else {
@@ -119,12 +119,12 @@
 
                 if ($this->context->isManager()) {
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-trophy']) . ' ' . ($model->grade == ActiveModel::GRADE_EXCELLENT ? '取消' : '') . '加精',
+                        Html::tag('i', '', ['class' => 'fa fa-trophy']) . ' ' . ($model->grade == ActiveModel::GRADE_EXCELLENT ? '取消' : '') . '加精',
                         ['/bbs/topic/excellent', 'id' => $model->id, 'cancel' => $model->grade == ActiveModel::GRADE_EXCELLENT ? 1 : 0],
                         ['class' => ($model->grade == ActiveModel::GRADE_EXCELLENT ? 'icon-active' : '')]
                     );
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-arrow-up-circle']) . ' ' . ($model->sort == 10 ? '取消' : '') . '置顶',
+                        Html::tag('i', '', ['class' => 'fa fa-arrow-circle-o-up']) . ' ' . ($model->sort == 10 ? '取消' : '') . '置顶',
                         ['/bbs/topic/top', 'id' => $model->id, 'cancel' => $model->sort == 10 ? 1 : 0],
                         ['class' => ($model->sort == 10 ? ' icon-active' : '')]
                     );
@@ -134,16 +134,16 @@
                     echo '<span class="float-right">';
                     if ($model->status != ActiveModel::STATUS_ACTIVE) {
                         echo Html::a(
-                            Html::tag('i', '', ['class' => 'bi-pencil']) . ' 审核通过',
+                            Html::tag('i', '', ['class' => 'fa fa-pencil']) . ' 审核通过',
                             ['/bbs/topic/pass', 'id' => $model->id]
                         );
                     }
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-pencil']) . ' 修改',
+                        Html::tag('i', '', ['class' => 'fa fa-pencil']) . ' 修改',
                         ['/bbs/topic/edit', 'id' => $model->id]
                     );
                     echo Html::a(
-                        Html::tag('i', '', ['class' => 'bi-trash']) . ' 删除',
+                        Html::tag('i', '', ['class' => 'fa fa-trash']) . ' 删除',
                         ['/bbs/topic/delete', 'id' => $model->id],
                         [
                             'data' => [
diff --git a/web/resources/mall/default/views/default/index-platform.php b/web/resources/mall/default/views/default/index-platform.php
index b62eb4ab..2f556abc 100644
--- a/web/resources/mall/default/views/default/index-platform.php
+++ b/web/resources/mall/default/views/default/index-platform.php
@@ -28,7 +28,7 @@
                     </li>
                     <?php } ?>
                     <li class="nav-item ml-auto mr-2">
-                        <a class="nav-link btn-primary" href="<?= Url::to(['/bbs/topic/edit', 'node_id' => Yii::$app->request->get('id')]) ?>" tabindex="-1" aria-disabled="true"><?= Html::tag('i', '', ['class' => 'bi-pencil']) . ' ' . Yii::t('app', 'Publish') ?></a>
+                        <a class="nav-link btn-primary" href="<?= Url::to(['/bbs/topic/edit', 'node_id' => Yii::$app->request->get('id')]) ?>" tabindex="-1" aria-disabled="true"><?= Html::tag('i', '', ['class' => 'fa fa-pencil']) . ' ' . Yii::t('app', 'Publish') ?></a>
                     </li>
                 </ul>
             </div>
diff --git a/web/resources/mall/default/views/layouts/footer-platform.php b/web/resources/mall/default/views/layouts/footer-platform.php
index 5986640e..75f3f478 100644
--- a/web/resources/mall/default/views/layouts/footer-platform.php
+++ b/web/resources/mall/default/views/layouts/footer-platform.php
@@ -11,11 +11,11 @@
 </div>
 
 <div class="btn-group-vertical" id="floatButton">
-    <button type="button" class="btn btn-light" id="goTop" title="<?= Yii::t('app', 'Go Top') ?>"><span class="bi-arrow-up"></span></button>
-    <button type="button" class="btn btn-light" id="refresh" title="<?= Yii::t('app', 'Refresh') ?>"><span class="bi-arrow-clockwise"></span></button>
-    <button type="button" class="btn btn-light" id="pageQrcode" title="<?= Yii::t('app', 'Qrcode') ?>"><span class="bi-upc-scan"></span>
+    <button type="button" class="btn btn-light" id="goTop" title="<?= Yii::t('app', 'Go Top') ?>"><span class="fa fa-chevron-up"></span></button>
+    <button type="button" class="btn btn-light" id="refresh" title="<?= Yii::t('app', 'Refresh') ?>"><span class="fa fa-refresh"></span></button>
+    <button type="button" class="btn btn-light" id="pageQrcode" title="<?= Yii::t('app', 'Qrcode') ?>"><span class="fa fa-qrcode"></span>
         <img class="qrcode" width="130" height="130" src="<?= Url::to(['/site/qr', 'text' => Yii::$app->request->absoluteUrl]) ?>"/>
     </button>
-    <button type="button" class="btn btn-light" id="goBottom" title="<?= Yii::t('app', 'Go Bottom') ?>"><span class="bi-arrow-down"></span></button>
+    <button type="button" class="btn btn-light" id="goBottom" title="<?= Yii::t('app', 'Go Bottom') ?>"><span class="fa fa-chevron-down"></span></button>
 </div>
 
diff --git a/web/resources/mall/default/views/layouts/nav-platform.php b/web/resources/mall/default/views/layouts/nav-platform.php
index 8efa4d49..bddcab4b 100644
--- a/web/resources/mall/default/views/layouts/nav-platform.php
+++ b/web/resources/mall/default/views/layouts/nav-platform.php
@@ -50,7 +50,7 @@
 } else {
     // 通知
     /*$menuItems[] = [
-        'label' => Html::tag('i', '', ['class' => 'bi-bell-fill']) . (1 > 0 ?Html::tag('span', 1, ['class' => 'badge badge-danger']) : ''),
+        'label' => Html::tag('i', '', ['class' => 'fa fa-bell']) . (1 > 0 ?Html::tag('span', 1, ['class' => 'badge badge-danger']) : ''),
         'url' => ['/notice/index'],
         'options' => ['class' => 'notice-count'],
     ];*/
@@ -70,7 +70,7 @@
 
 // 语言
 /*$menuItems[] = [
-    'label' => Html::tag('i', '', ['class' => 'bi-globe']),
+    'label' => Html::tag('i', '', ['class' => 'fa fa-globe']),
     'items' => [
         ['label' => '<i class="flag-icon flag-icon-cn mr-2"></i>' . Yii::t('app', 'Chinese'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'cn']],
         ['label' => '<i class="flag-icon flag-icon-gb mr-2"></i>' . Yii::t('app', 'English'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'en']],