@@ -4,10 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use humhub\modules\geolocation\Module; |
6 | 6 | use humhub\modules\queue\driver\MySQLCommand; |
7 | -use Yii; |
|
8 | 7 | use yii\base\Model; |
9 | 8 | use yii\data\ActiveDataProvider; |
10 | -use yii\db\QueryBuilder; |
|
11 | 9 | |
12 | 10 | /** |
13 | 11 | * UserSearch represents the model behind the search form of `humhub\modules\geolocation\models\User`. |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | use Yii; |
12 | 12 | use yii\helpers\Url; |
13 | - |
|
14 | 13 | use humhub\modules\directory\models\User; |
15 | 14 | |
16 | 15 | /** |
@@ -10,9 +10,7 @@ |
||
10 | 10 | echo StreamViewer::widget([ |
11 | 11 | 'streamAction' => '//directory/directory/stream', |
12 | 12 | 'messageStreamEmpty' => (!Yii::$app->user->isGuest) ? |
13 | - Yii::t('DirectoryModule.base', '<b>Nobody wrote something yet.</b><br>Make the beginning and post something...') : |
|
14 | - Yii::t('DirectoryModule.base', '<b>There are no profile posts yet!</b>'), |
|
13 | + Yii::t('DirectoryModule.base', '<b>Nobody wrote something yet.</b><br>Make the beginning and post something...') : Yii::t('DirectoryModule.base', '<b>There are no profile posts yet!</b>'), |
|
15 | 14 | 'messageStreamEmptyCss' => (!Yii::$app->user->isGuest) ? |
16 | - 'placeholder-empty-stream' : |
|
17 | - '', |
|
15 | + 'placeholder-empty-stream' : '', |
|
18 | 16 | ]); |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | use Yii; |
12 | 12 | use yii\helpers\Url; |
13 | - |
|
14 | 13 | use humhub\modules\directory\models\User; |
15 | 14 | |
16 | 15 | /** |
@@ -22,7 +22,7 @@ |
||
22 | 22 | if (!Yii::$app->user->isGuest && !$user->isCurrentUser() && Yii::$app->getModule('friendship')->getIsEnabled()) { |
23 | 23 | $friendShipState = Friendship::getStateForUser(Yii::$app->user->getIdentity(), $user); |
24 | 24 | if ($friendShipState === Friendship::STATE_NONE) { |
25 | - echo Html::a('<span class="glyphicon glyphicon-plus"></span> ' . Yii::t("FriendshipModule.base", "Add Friend"), Url::to(['/friendship/request/add', 'userId' => $user->id]), ['class' => 'btn btn-primary btn-sm','data-ui-loader' => '', 'data-method' => 'POST']); |
|
25 | + echo Html::a('<span class="glyphicon glyphicon-plus"></span> ' . Yii::t("FriendshipModule.base", "Add Friend"), Url::to(['/friendship/request/add', 'userId' => $user->id]), ['class' => 'btn btn-primary btn-sm', 'data-ui-loader' => '', 'data-method' => 'POST']); |
|
26 | 26 | } elseif ($friendShipState === Friendship::STATE_FRIENDS) { |
27 | 27 | echo Html::a('<span class="glyphicon glyphicon-ok"></span> ' . Yii::t("FriendshipModule.base", "Friends"), $user->getUrl(), ['class' => 'btn btn-info btn-sm', 'data-ui-loader' => '']); |
28 | 28 | } |
@@ -18,8 +18,10 @@ |
||
18 | 18 | <div class="panel-heading"> |
19 | 19 | <?php if ($group === null) : ?> |
20 | 20 | <?= Yii::t('DirectoryModule.base', '<strong>Member</strong> directory'); ?> |
21 | - <?php else : ?> |
|
21 | + <?php else { |
|
22 | + : ?> |
|
22 | 23 | <?= Yii::t('DirectoryModule.base', '<strong>Group</strong> members - {group}', ['{group}' => Html::encode($group->name)]); |
24 | +} |
|
23 | 25 | ?> |
24 | 26 | <?php endif; ?> |
25 | 27 | </div> |