From 01e5d23e1d2045fb134eaa3ad9e532535bd32266 Mon Sep 17 00:00:00 2001 From: buddh4 Date: Wed, 14 Oct 2020 16:29:21 +0200 Subject: [PATCH] Enh #4506: Add more Icon aliases for 1.7 --- protected/humhub/libs/ActionColumn.php | 6 ++-- protected/humhub/libs/Html.php | 3 +- .../admin/views/group/_manageLayout.php | 10 ++++-- .../modules/admin/views/group/index.php | 23 ++++++------ .../modules/admin/views/group/members.php | 36 +++++++++++-------- .../modules/admin/views/setting/design.php | 4 +-- .../admin/views/setting/oembed_edit.php | 3 +- .../modules/admin/views/space/index.php | 7 ++-- .../admin/views/user-profile/_fieldGrid.php | 6 ++-- .../admin/views/user-profile/index.php | 2 +- .../humhub/modules/admin/views/user/add.php | 22 ++++++++---- .../humhub/modules/admin/views/user/list.php | 2 +- .../modules/comment/widgets/views/comment.php | 6 ++-- .../views/containerProfileImageMenu.php | 2 +- .../content/widgets/views/deleteLink.php | 4 +-- .../content/widgets/views/editLink.php | 18 +++++----- .../widgets/views/wallCreateContentForm.php | 8 +++-- protected/humhub/modules/dashboard/Events.php | 2 +- protected/humhub/modules/directory/Module.php | 15 ++++---- .../directory/widgets/views/newMembers.php | 22 +++++++----- .../widgets/views/about_version_pro.php | 18 +++++----- .../modules/manage/views/member/index.php | 12 +++---- .../space/widgets/HeaderControlsMenu.php | 10 ++++-- .../humhub/modules/space/widgets/Menu.php | 4 +-- .../space/widgets/views/inviteButton.php | 9 +++-- .../space/widgets/views/spaceChooser.php | 11 +++--- .../modules/topic/views/manage/overview.php | 8 ++--- protected/humhub/modules/ui/Module.php | 13 ++++++- .../humhub/modules/ui/icon/widgets/Icon.php | 11 ++++-- .../modules/user/widgets/ProfileMenu.php | 4 +-- protected/humhub/widgets/Button.php | 2 +- 31 files changed, 186 insertions(+), 117 deletions(-) diff --git a/protected/humhub/libs/ActionColumn.php b/protected/humhub/libs/ActionColumn.php index 1b2835123e..8dc24891ee 100644 --- a/protected/humhub/libs/ActionColumn.php +++ b/protected/humhub/libs/ActionColumn.php @@ -8,6 +8,7 @@ namespace humhub\libs; +use humhub\widgets\Button; use yii\grid\Column; use yii\helpers\Url; use humhub\libs\Html; @@ -52,7 +53,8 @@ class ActionColumn extends Column } $html = Html::beginTag('div', ['class' => 'btn-group dropdown-navigation']); - $html .= Html::button(' ', ['class' => 'btn btn-default dropdown-toggle', 'data-toggle' => 'dropdown']); + $html .= Button::defaultType('')->cssClass('dropdown-toggle') + ->options(['data-toggle' => 'dropdown'])->icon('controls')->loader(false); $html .= Html::beginTag('ul', ['class' => 'dropdown-menu pull-right']); foreach ($actions as $title => $url) { if ($url === '---') { @@ -89,7 +91,7 @@ class ActionColumn extends Column /** * Builds the URL for a given Action - * + * * @param array $url * @param \yii\base\Model $model * @return string the url diff --git a/protected/humhub/libs/Html.php b/protected/humhub/libs/Html.php index 22063827a2..163026771b 100644 --- a/protected/humhub/libs/Html.php +++ b/protected/humhub/libs/Html.php @@ -8,6 +8,7 @@ namespace humhub\libs; +use humhub\modules\ui\icon\widgets\Icon; use humhub\modules\web\security\helpers\Security; use Yii; use yii\base\InvalidArgumentException; @@ -114,7 +115,7 @@ class Html extends \yii\bootstrap\Html } if (!isset($options['showIcon']) || $options['showIcon'] === true) { - $label = ' ' . $label; + $label = Icon::get('back')->asString().' '. $label; } if (empty($url)) { diff --git a/protected/humhub/modules/admin/views/group/_manageLayout.php b/protected/humhub/modules/admin/views/group/_manageLayout.php index b20a3ddc49..cdb1943979 100644 --- a/protected/humhub/modules/admin/views/group/_manageLayout.php +++ b/protected/humhub/modules/admin/views/group/_manageLayout.php @@ -1,10 +1,16 @@
- Yii::t('AdminModule.base', 'Back to overview')]); ?> +
isNewRecord) : ?> @@ -22,7 +28,7 @@ use humhub\libs\Html; is_admin_group) : ?>
  
- $group]); ?> + $group]); ?> diff --git a/protected/humhub/modules/admin/views/group/index.php b/protected/humhub/modules/admin/views/group/index.php index e6d2c180cc..aa5684e7c5 100644 --- a/protected/humhub/modules/admin/views/group/index.php +++ b/protected/humhub/modules/admin/views/group/index.php @@ -1,14 +1,19 @@
-   ' . Yii::t('AdminModule.user', 'Create new group'), Url::to(['edit']), ['class' => 'btn btn-sm btn-success']); ?> + href(Url::to(['edit']))->sm()->icon('add') ?>
- +

@@ -16,12 +21,11 @@ use humhub\widgets\GridView;
- +
- $dataProvider, 'filterModel' => $searchModel, 'tableOptions' => ['class' => 'table table-hover'], @@ -38,7 +42,7 @@ use humhub\widgets\GridView; } ], [ - 'class' => \humhub\libs\ActionColumn::class, + 'class' => ActionColumn::class, 'actions' => function($group, $key, $index) { /* @var $group \humhub\modules\user\models\Group */ if($group->is_admin_group && !Yii::$app->user->isAdmin()) { @@ -54,6 +58,5 @@ use humhub\widgets\GridView; } ], ], - ]); - ?> -
\ No newline at end of file + ]) ?> +
diff --git a/protected/humhub/modules/admin/views/group/members.php b/protected/humhub/modules/admin/views/group/members.php index 630364b96c..6e43ea3ceb 100644 --- a/protected/humhub/modules/admin/views/group/members.php +++ b/protected/humhub/modules/admin/views/group/members.php @@ -1,33 +1,41 @@ beginContent('@admin/views/group/_manageLayout.php', ['group' => $group]) ?>
-
+
['/admin/group/add-members']]); ?>
- $addGroupMemberForm, 'attribute' => 'userGuids', 'url' => Url::to(['/admin/group/new-member-search', 'id' => $group->id]), 'placeholder' => Yii::t('AdminModule.user', 'Add new members...'), 'focus' => true, - ]) - ?> + ]) ?> $group->id]) ?> - + submit()->style('height:40px')->icon('add') ?>
@@ -39,7 +47,7 @@ use humhub\modules\user\grid\DisplayNameColumn; -
+
@@ -86,11 +94,11 @@ use humhub\modules\user\grid\DisplayNameColumn; return false; }, 'delete' => function($url, $model) use ($group) { - return Html::a('', '#', [ - 'data-action-click' => 'admin.group.removeMember', - 'data-action-url' => Url::to(['remove-group-user', 'id' => $group->id, 'userId' => $model->id]), - 'title' => Yii::t('AdminModule.user', 'Remove from group'), - 'class' => 'btn btn-danger btn-xs tt']); + return Button::danger() + ->tooltip(Yii::t('AdminModule.user', 'Remove from group')) + ->action('admin.group.removeMember', Url::to(['remove-group-user', 'id' => $group->id, 'userId' => $model->id])) + ->icon('remove')->xs() + ->confirm(); } ], ], @@ -100,4 +108,4 @@ use humhub\modules\user\grid\DisplayNameColumn; ?> -endContent(); ?> \ No newline at end of file +endContent(); ?> diff --git a/protected/humhub/modules/admin/views/setting/design.php b/protected/humhub/modules/admin/views/setting/design.php index 3789fa49cd..c79864ad04 100644 --- a/protected/humhub/modules/admin/views/setting/design.php +++ b/protected/humhub/modules/admin/views/setting/design.php @@ -71,7 +71,7 @@ $iconUrl = SiteIcon::getUrl(140); id('admin-delete-logo-image') ->action('admin.deletePageLogo', Url::to(['/admin/setting/delete-logo-image'])) - ->style(LogoImage::hasImage() ? '' : 'display:none')->icon('times')->sm()->loader(false) ?> + ->style(LogoImage::hasImage() ? '' : 'display:none')->icon('remove')->sm()->loader(false) ?> @@ -88,7 +88,7 @@ $iconUrl = SiteIcon::getUrl(140); id('admin-delete-icon-image') ->action('admin.deletePageIcon', Url::to(['/admin/setting/delete-icon-image'])) - ->style(SiteIcon::hasImage() ? '' : 'display:none')->icon('times')->sm()->loader(false) ?> + ->style(SiteIcon::hasImage() ? '' : 'display:none')->icon('remove')->sm()->loader(false) ?> diff --git a/protected/humhub/modules/admin/views/setting/oembed_edit.php b/protected/humhub/modules/admin/views/setting/oembed_edit.php index 13788b58d1..ca6be8558e 100644 --- a/protected/humhub/modules/admin/views/setting/oembed_edit.php +++ b/protected/humhub/modules/admin/views/setting/oembed_edit.php @@ -1,5 +1,6 @@ beginContent('@admin/views/setting/_advancedLayout.php') ?>
-   ' . Yii::t('AdminModule.settings', 'Back to overview'), Url::to(['setting/oembed']), ['class' => 'btn btn-default pull-right']); ?> +

-  ' . Yii::t('AdminModule.space', 'Add new space'), ['/space/create'], ['class' => 'btn btn-sm btn-success pull-right', 'data-target' => '#globalModal']); ?> +load(['/space/create']) + ->icon('add')->right()->sm() ?> -

+

diff --git a/protected/humhub/modules/admin/views/user-profile/_fieldGrid.php b/protected/humhub/modules/admin/views/user-profile/_fieldGrid.php index 1039f63a4c..34b5925692 100644 --- a/protected/humhub/modules/admin/views/user-profile/_fieldGrid.php +++ b/protected/humhub/modules/admin/views/user-profile/_fieldGrid.php @@ -15,10 +15,10 @@ use yii\helpers\Url; icon('plus')->sm()->link(Url::to(['edit-field', 'categoryId' => $category->id]))->right()->style('margin-left:5px') ?> + ->icon('add')->sm()->link(Url::to(['edit-field', 'categoryId' => $category->id]))->right()->style('margin-left:5px') ?> icon('pencil')->sm()->link(Url::to(['edit-category', 'id' => $category->id]))->right() ?> + ->icon('edit')->sm()->link(Url::to(['edit-category', 'id' => $category->id]))->right() ?> function ($url, $category) { /* @var $model ProfileField */ - return Button::primary()->icon('pencil')->link(Url::to(['edit-field', 'id' => $category->id]))->sm(); + return Button::primary()->icon('edit')->link(Url::to(['edit-field', 'id' => $category->id]))->sm(); }, ], ], diff --git a/protected/humhub/modules/admin/views/user-profile/index.php b/protected/humhub/modules/admin/views/user-profile/index.php index 9894b033de..61a533ed90 100644 --- a/protected/humhub/modules/admin/views/user-profile/index.php +++ b/protected/humhub/modules/admin/views/user-profile/index.php @@ -16,7 +16,7 @@ foreach (ProfileFieldCategory::find()->orderBy('sort_order')->all() as $category } $categoryItems[] = [ - 'label' => Icon::get('plus', [ + 'label' => Icon::get('add', [ 'htmlOptions' => [ 'title' => Yii::t('AdminModule.user', 'Add new category'), 'class' => 'tt' diff --git a/protected/humhub/modules/admin/views/user/add.php b/protected/humhub/modules/admin/views/user/add.php index 8139ecbbbe..8118940c8e 100644 --- a/protected/humhub/modules/admin/views/user/add.php +++ b/protected/humhub/modules/admin/views/user/add.php @@ -1,20 +1,28 @@
- Yii::t('AdminModule.base', 'Back to overview')]); ?> -   ' . Yii::t('AdminModule.user', 'Send invite'), ['/user/invite'], ['class' => 'btn btn-success', 'data-target' => '#globalModal']); ?> + right(false) ?> + + load(['/user/invite'])->icon('invite')->sm() ?>
-

+


- ['data-ui-widget' => 'ui.form.TabbedForm', 'data-ui-init' => '']]); ?> - render($form); ?> - + ['data-ui-widget' => 'ui.form.TabbedForm', 'data-ui-init' => '']]); ?> + render($form); ?> +
diff --git a/protected/humhub/modules/admin/views/user/list.php b/protected/humhub/modules/admin/views/user/list.php index 41f14f1039..bfa8697fd3 100644 --- a/protected/humhub/modules/admin/views/user/list.php +++ b/protected/humhub/modules/admin/views/user/list.php @@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
-   ' . Yii::t('AdminModule.user', 'Add new user'), ['/admin/user/add'], ['class' => 'btn btn-success btn-sm', 'data-ui-loader' => '']); ?> + icon('add')->sm()->link(['/admin/user/add']) ?> 'UserSearch']) ?>
diff --git a/protected/humhub/modules/comment/widgets/views/comment.php b/protected/humhub/modules/comment/widgets/views/comment.php index 754db7c189..fce0ef0dc4 100644 --- a/protected/humhub/modules/comment/widgets/views/comment.php +++ b/protected/humhub/modules/comment/widgets/views/comment.php @@ -47,11 +47,11 @@ $module = Yii::$app->getModule('comment');
  • - +
    • @@ -59,7 +59,7 @@ $module = Yii::$app->getModule('comment');
  • - +
    • diff --git a/protected/humhub/modules/content/widgets/views/containerProfileImageMenu.php b/protected/humhub/modules/content/widgets/views/containerProfileImageMenu.php index ce6418d294..9cdd373040 100644 --- a/protected/humhub/modules/content/widgets/views/containerProfileImageMenu.php +++ b/protected/humhub/modules/content/widgets/views/containerProfileImageMenu.php @@ -37,7 +37,7 @@ if (!isset($confirmBody)) { ->cssClass('profile-image-edit profile-image-crop') ?> icon('times') + ->icon('remove') ->action('delete', $deleteUrl) ->style($editButtonStyle)->sm() ->loader(false) diff --git a/protected/humhub/modules/content/widgets/views/deleteLink.php b/protected/humhub/modules/content/widgets/views/deleteLink.php index 6e583658f7..16e2908c38 100644 --- a/protected/humhub/modules/content/widgets/views/deleteLink.php +++ b/protected/humhub/modules/content/widgets/views/deleteLink.php @@ -1,12 +1,12 @@
  • - +
    • diff --git a/protected/humhub/modules/content/widgets/views/editLink.php b/protected/humhub/modules/content/widgets/views/editLink.php index 692fd6dd56..f489f68308 100644 --- a/protected/humhub/modules/content/widgets/views/editLink.php +++ b/protected/humhub/modules/content/widgets/views/editLink.php @@ -1,25 +1,27 @@
  • - + - + - + - + - + - +
    • diff --git a/protected/humhub/modules/content/widgets/views/wallCreateContentForm.php b/protected/humhub/modules/content/widgets/views/wallCreateContentForm.php index 78fb962eef..0a118ef0df 100644 --- a/protected/humhub/modules/content/widgets/views/wallCreateContentForm.php +++ b/protected/humhub/modules/content/widgets/views/wallCreateContentForm.php @@ -1,6 +1,7 @@ createUrl
    • - + +
      • - icon('fa-bell')?> + icon('bell')?>
      • @@ -106,7 +108,7 @@ $pickerUrl = ($contentContainer instanceof Space) ? $contentContainer->createUrl
      • id('contentForm_visibility_entry')->icon('fa-unlock') ?> + ->id('contentForm_visibility_entry')->icon('unlock') ?>
      diff --git a/protected/humhub/modules/dashboard/Events.php b/protected/humhub/modules/dashboard/Events.php index 05d157ccad..acd5236e13 100644 --- a/protected/humhub/modules/dashboard/Events.php +++ b/protected/humhub/modules/dashboard/Events.php @@ -36,7 +36,7 @@ class Events 'id' => 'dashboard', 'label' => Yii::t('DashboardModule.base', 'Dashboard'), 'url' => ['/dashboard/dashboard'], - 'icon' => 'tachometer', + 'icon' => 'dashboard', 'sortOrder' => 100, 'isActive' => MenuLink::isActiveState('dashboard') ])); diff --git a/protected/humhub/modules/directory/Module.php b/protected/humhub/modules/directory/Module.php index 1625ae6e3a..45ed849434 100644 --- a/protected/humhub/modules/directory/Module.php +++ b/protected/humhub/modules/directory/Module.php @@ -8,6 +8,7 @@ namespace humhub\modules\directory; +use humhub\modules\ui\menu\MenuLink; use Yii; use yii\helpers\Url; use humhub\modules\user\models\Group; @@ -84,14 +85,14 @@ class Module extends \humhub\components\Module $module = Yii::$app->getModule('directory'); if($module->canAccess()) { - $event->sender->addItem([ - 'label' => Yii::t('DirectoryModule.base', 'Directory'), + $event->sender->addEntry(new MenuLink([ 'id' => 'directory', - 'icon' => '', - 'url' => Url::to(['/directory/directory']), + 'icon' => 'directory', + 'label' => Yii::t('DirectoryModule.base', 'Directory'), + 'url' => ['/directory/directory'], 'sortOrder' => 400, - 'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'directory'), - ]); + 'isActive' => MenuLink::isActiveState('directory'), + ])); } } @@ -111,7 +112,7 @@ class Module extends \humhub\components\Module /** * Show groups in directory - * + * * @return boolean */ public function isGroupListingEnabled() diff --git a/protected/humhub/modules/directory/widgets/views/newMembers.php b/protected/humhub/modules/directory/widgets/views/newMembers.php index 43e88d9f77..217b38ebfd 100644 --- a/protected/humhub/modules/directory/widgets/views/newMembers.php +++ b/protected/humhub/modules/directory/widgets/views/newMembers.php @@ -1,19 +1,23 @@
      - 'new-people-panel']); ?> + 'new-people-panel']) ?>
      - New people'); ?> + New people') ?>
      limit(10)->all() as $user) : ?> - $user, 'width' => 40, 'showTooltip' => true]); ?> + $user, 'width' => 40, 'showTooltip' => true]) ?> @@ -21,11 +25,13 @@ use humhub\modules\user\widgets\Image; -   ' . Yii::t('DirectoryModule.base', 'Send invite'), Url::to(['/user/invite']), ['data-target' => '#globalModal']); ?> + load(['/user/invite'])->icon('invite')->sm() ?> -   ' . Yii::t('DirectoryModule.base', 'See all'), Url::to(['/directory/directory/members']), ['classx' => 'btn btn-xl btn-primary', 'class' => 'pull-right']); ?> + link(['/directory/directory/members'])->icon('list-ul')->sm() ?>
      -
      \ No newline at end of file +
    diff --git a/protected/humhub/modules/marketplace/widgets/views/about_version_pro.php b/protected/humhub/modules/marketplace/widgets/views/about_version_pro.php index 4c2e10fb81..41e58f5ec7 100644 --- a/protected/humhub/modules/marketplace/widgets/views/about_version_pro.php +++ b/protected/humhub/modules/marketplace/widgets/views/about_version_pro.php @@ -1,22 +1,24 @@
    - + 'height:124px']) ?>
    -   - + link(['/marketplace/licence'])->icon('cogs')->sm() ?>
    HumHub  Professional Edition
    - version ?>
    - licencedTo; ?>
    - maxUsers; ?>
    + version) ?>
    + licencedTo) ?>
    + maxUsers) ?>
    diff --git a/protected/humhub/modules/space/modules/manage/views/member/index.php b/protected/humhub/modules/space/modules/manage/views/member/index.php index f1312050c6..e351d8dc0e 100644 --- a/protected/humhub/modules/space/modules/manage/views/member/index.php +++ b/protected/humhub/modules/space/modules/manage/views/member/index.php @@ -1,5 +1,6 @@ function ($url, $model) use($space) { - $url = ['/space/manage/member/remove', 'userGuid' => $model->user->guid, 'container' => $space]; - return Html::a('', $url, [ - 'title' => Yii::t('SpaceModule.manage', 'Remove from space'), - 'class' => 'btn btn-danger btn-xs tt', - 'data-method' => 'POST', - 'data-confirm' => 'Are you really sure?' - ]); + return Button::danger()->tooltip(Yii::t('SpaceModule.manage', 'Remove from space')) + ->link(['/space/manage/member/remove', 'userGuid' => $model->user->guid, 'container' => $space]) + ->options(['data-method' => 'POST', 'data-confirm' => Yii::t('SpaceModule.manage', 'Are you sure you want to remove this member.') ]) + ->icon('remove')->xs(); } ], ], diff --git a/protected/humhub/modules/space/widgets/HeaderControlsMenu.php b/protected/humhub/modules/space/widgets/HeaderControlsMenu.php index 94b400f8a1..b2edefac47 100644 --- a/protected/humhub/modules/space/widgets/HeaderControlsMenu.php +++ b/protected/humhub/modules/space/widgets/HeaderControlsMenu.php @@ -9,6 +9,7 @@ namespace humhub\modules\space\widgets; use humhub\modules\space\models\Space; +use humhub\modules\ui\icon\widgets\Icon; use humhub\modules\ui\menu\DropdownDivider; use humhub\modules\ui\menu\MenuLink; use humhub\modules\ui\menu\widgets\DropdownMenu; @@ -31,7 +32,7 @@ class HeaderControlsMenu extends DropdownMenu /** * @inheritdoc */ - public $label = ''; + public $label; /** * @inheritdoc @@ -43,6 +44,11 @@ class HeaderControlsMenu extends DropdownMenu */ public function init() { + parent::init(); + + if(!$this->label) { + $this->label = Icon::get('controls'); + } if ($this->template === '@humhub/widgets/views/dropdownNavigation') { $this->template = '@ui/menu/widgets/views/dropdown-menu.php'; @@ -107,7 +113,7 @@ class HeaderControlsMenu extends DropdownMenu $this->addEntry(new MenuLink([ 'label' => Yii::t('SpaceModule.manage', 'Cancel Membership'), 'url' => $this->space->createUrl('/space/membership/revoke-membership'), - 'icon' => 'times', + 'icon' => 'remove', 'sortOrder' => 700, 'htmlOptions' => ['data-method' => 'POST'] ])); diff --git a/protected/humhub/modules/space/widgets/Menu.php b/protected/humhub/modules/space/widgets/Menu.php index c078f86e01..b0d99d31cc 100755 --- a/protected/humhub/modules/space/widgets/Menu.php +++ b/protected/humhub/modules/space/widgets/Menu.php @@ -60,7 +60,7 @@ class Menu extends LeftNavigation $this->addEntry(new MenuLink([ 'label' => Yii::t('SpaceModule.base', 'Stream'), 'url' => $this->space->createUrl('/space/space/home'), - 'icon' => 'bars', + 'icon' => 'stream', 'sortOrder' => 100, 'isActive' => MenuLink::isActiveState('space', 'space', ['index', 'home']), ])); @@ -78,7 +78,7 @@ class Menu extends LeftNavigation $this->addEntry(new MenuLink([ 'label' => Yii::t('SpaceModule.base', 'About'), 'url' => $this->space->createUrl('/space/space/about'), - 'icon' => 'info-circle', + 'icon' => 'about', 'sortOrder' => 10000, 'isActive' => MenuLink::isActiveState('space', 'space', ['about']), ])); diff --git a/protected/humhub/modules/space/widgets/views/inviteButton.php b/protected/humhub/modules/space/widgets/views/inviteButton.php index a5e50b6b8c..ab9892e143 100644 --- a/protected/humhub/modules/space/widgets/views/inviteButton.php +++ b/protected/humhub/modules/space/widgets/views/inviteButton.php @@ -1,3 +1,6 @@ - \ No newline at end of file + + +load($space->createUrl('/space/membership/invite'))->icon('invite') ?> diff --git a/protected/humhub/modules/space/widgets/views/spaceChooser.php b/protected/humhub/modules/space/widgets/views/spaceChooser.php index 681915cac1..d1969fb348 100755 --- a/protected/humhub/modules/space/widgets/views/spaceChooser.php +++ b/protected/humhub/modules/space/widgets/views/spaceChooser.php @@ -1,5 +1,6 @@ active && Yii::$app->user->can(AccessDir
    class="input-group"> + placeholder="" + title=""> - - + + -
    +
    diff --git a/protected/humhub/modules/topic/views/manage/overview.php b/protected/humhub/modules/topic/views/manage/overview.php index e27cd139d6..a453017340 100644 --- a/protected/humhub/modules/topic/views/manage/overview.php +++ b/protected/humhub/modules/topic/views/manage/overview.php @@ -40,8 +40,8 @@ use yii\helpers\Html;
    'height:36px', 'class' => 'form-control', 'placeholder' => Yii::t('TopicModule.base', 'Add Topic')]) ?> - icon('fa-plus')->loader()->submit() ?> - + icon('add')->loader()->submit() ?> +
    @@ -59,7 +59,7 @@ use yii\helpers\Html; 'buttons' => [ 'update' => function ($url, $model) use ($contentContainer) { /* @var $model \humhub\modules\topic\models\Topic */ - return ModalButton::primary()->load($contentContainer->createUrl('edit', ['id' => $model->id]))->icon('fa-pencil')->xs()->loader(false); + return ModalButton::primary()->load($contentContainer->createUrl('edit', ['id' => $model->id]))->icon('edit')->xs()->loader(false); }, 'view' => function ($url, $model) use ($contentContainer) { /* @var $model \humhub\modules\topic\models\Topic */ @@ -67,7 +67,7 @@ use yii\helpers\Html; }, 'delete' => function ($url, $model) use ($contentContainer) { /* @var $model \humhub\modules\topic\models\Topic */ - return Button::danger()->icon('fa-times')->action('topic.removeOverviewTopic', $contentContainer->createUrl('delete', ['id' => $model->id]))->confirm( + return Button::danger()->icon('delete')->action('topic.removeOverviewTopic', $contentContainer->createUrl('delete', ['id' => $model->id]))->confirm( Yii::t('TopicModule.base', 'Confirm topic deletion'), Yii::t('TopicModule.base', 'Do you really want to delete this topic?'), Yii::t('base', 'Delete'))->xs()->loader(false); diff --git a/protected/humhub/modules/ui/Module.php b/protected/humhub/modules/ui/Module.php index 909955d354..a6907bf0c7 100644 --- a/protected/humhub/modules/ui/Module.php +++ b/protected/humhub/modules/ui/Module.php @@ -27,7 +27,18 @@ class Module extends \humhub\components\Module * @var array contains all available icon aliases */ public $iconAlias = [ - 'dropdownToggle' => 'angle-down' + 'dropdownToggle' => 'angle-down', + 'edit' => 'pencil', + 'delete' => 'trash', + 'dashboard' => 'tachometer', + 'directory' => 'book', + 'back' => 'arrow-left', + 'add' => 'plus', + 'invite' => 'paper-plane', + 'remove' => 'times', + 'controls' => 'cog', + 'about' => 'info-circle', + 'stream' => 'bars' ]; /** diff --git a/protected/humhub/modules/ui/icon/widgets/Icon.php b/protected/humhub/modules/ui/icon/widgets/Icon.php index 60e01a55c7..92b1f1a2a0 100644 --- a/protected/humhub/modules/ui/icon/widgets/Icon.php +++ b/protected/humhub/modules/ui/icon/widgets/Icon.php @@ -985,11 +985,16 @@ class Icon extends Widget /** * @return string - * @throws \Exception */ public function asString() { - return (string)$this; + try { + return (string) $this; + } catch (\Throwable $e) { + Yii::error($e); + } + + return ''; } /** @@ -1000,7 +1005,7 @@ class Icon extends Widget try { $result = $this::widget($this->asArray()); return $result ?: ''; - } catch (\Exception $e) { + } catch (\Throwable $e) { Yii::error($e); } diff --git a/protected/humhub/modules/user/widgets/ProfileMenu.php b/protected/humhub/modules/user/widgets/ProfileMenu.php index 881f699bb9..877d9ff5e5 100644 --- a/protected/humhub/modules/user/widgets/ProfileMenu.php +++ b/protected/humhub/modules/user/widgets/ProfileMenu.php @@ -50,7 +50,7 @@ class ProfileMenu extends LeftNavigation if (!$module->profileDisableStream) { $this->addEntry(new MenuLink([ 'label' => Yii::t('UserModule.profile', 'Stream'), - 'icon' => 'bars', + 'icon' => 'stream', 'url' => $this->user->createUrl('//user/profile/home'), 'sortOrder' => 200, 'isActive' => MenuLink::isActiveState('user', 'profile', ['index', 'home']) @@ -59,7 +59,7 @@ class ProfileMenu extends LeftNavigation $this->addEntry(new MenuLink([ 'label' => Yii::t('UserModule.profile', 'About'), - 'icon' => 'info-circle', + 'icon' => 'about', 'url' => $this->user->createUrl('/user/profile/about'), 'sortOrder' => 300, 'isActive' => MenuLink::isActiveState('user', 'profile', 'about'), diff --git a/protected/humhub/widgets/Button.php b/protected/humhub/widgets/Button.php index 47a3c14382..aeaef3876b 100644 --- a/protected/humhub/widgets/Button.php +++ b/protected/humhub/widgets/Button.php @@ -61,7 +61,7 @@ class Button extends BootstrapComponent $text = Yii::t('base', 'Back'); } - return self::defaultType($text)->link($url)->icon('fa-arrow-left')->right()->loader(true); + return self::defaultType($text)->link($url)->icon('back')->right()->loader(true)->sm(); } public static function userPickerSelfSelect($selector, $text = null) {