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 @@
-
- */
-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 @@
- = 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']) ?>
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 @@
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 @@
- = Html::tag('i', '', ['class' => 'bi-pencil']) . ' ' . Yii::t('app', 'Publish') ?>
+ = Html::tag('i', '', ['class' => 'fa fa-pencil']) . ' ' . Yii::t('app', 'Publish') ?>
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 @@
= $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']) : '' ?>
-
= $model->like ?> •
+
= $model->like ?> •
= $model->node->name ?> •
comment > 0) { ?>
最后由 = $model->last_comment_username ?> 于 = 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 @@
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' => '
' . Yii::t('app', 'Chinese'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'cn']],
['label' => '
' . 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 @@
= Html::tag('span', $model->node->name, ['class' => 'btn-sm btn-info']) ?> •
= $model->tag_id > 0 ? Html::a($model->tag->name, ['/bbs/default/index', 'ModelSearch[tag_id]' => $model->tag_id], ['class' => 'btn-sm btn-info']) : '' ?> •
-
= $model->like ?> •
+
= $model->like ?> •
comment > 0) { ?>
最后由 = $model->last_comment_username ?> 于 = Yii::$app->formatter->asDate($model->last_comment_updated_at) ?> 回复 •
@@ -55,7 +55,7 @@
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 @@
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' => '
' . Yii::t('app', 'Chinese'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'cn']],
['label' => '
' . Yii::t('app', 'English'), 'url' => 'javascript:;', 'linkOptions' => ['class' => 'funboot-lang', 'data-lang' => 'en']],