Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
},
"require": {
"php": ">=7.2",
"winter/wn-backend-module": "~1.2.8|dev-develop",
"composer/installers": "~1.0"
},
"replace": {
Expand Down
25 changes: 0 additions & 25 deletions controllers/UserGroups.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,8 @@ class UserGroups extends Controller
\Backend\Behaviors\ListController::class
];

/**
* @var array `FormController` configuration.
*/
public $formConfig = 'config_form.yaml';

/**
* @var array `ListController` configuration.
*/
public $listConfig = 'config_list.yaml';

/**
* @var array `RelationController` configuration, by extension.
*/
public $relationConfig;

/**
* @var array Permissions required to view this page.
*/
public $requiredPermissions = ['winter.users.access_groups'];

/**
* Constructor.
*/
public function __construct()
{
parent::__construct();

BackendMenu::setContext('Winter.User', 'user', 'usergroups');
}
}
18 changes: 2 additions & 16 deletions controllers/Users.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
use Flash;
use Response;
use Redirect;
use BackendMenu;
use BackendAuth;
use Backend\Classes\Controller;
use System\Classes\SettingsManager;
use Winter\User\Models\User;
use Winter\User\Models\UserGroup;
use Winter\User\Models\MailBlocker;
Expand Down Expand Up @@ -45,20 +42,9 @@ class Users extends Controller
public $requiredPermissions = ['winter.users.access_users'];

/**
* @var string HTML body tag class
* @var string The form layout to use. One of standard, sidebar, fancy
*/
public $bodyClass = 'compact-container';

/**
* Constructor.
*/
public function __construct()
{
parent::__construct();

BackendMenu::setContext('Winter.User', 'user', 'users');
SettingsManager::setContext('Winter.User', 'settings');
}
public $formLayout = 'sidebar';

public function index()
{
Expand Down
48 changes: 0 additions & 48 deletions controllers/usergroups/create.htm

This file was deleted.

2 changes: 0 additions & 2 deletions controllers/usergroups/index.htm

This file was deleted.

19 changes: 0 additions & 19 deletions controllers/usergroups/preview.htm

This file was deleted.

56 changes: 0 additions & 56 deletions controllers/usergroups/update.htm

This file was deleted.

File renamed without changes.
File renamed without changes.
40 changes: 0 additions & 40 deletions controllers/users/_preview_scoreboard.htm

This file was deleted.

45 changes: 45 additions & 0 deletions controllers/users/_preview_scoreboard.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<div class="scoreboard">
<div data-control="toolbar">
<div class="scoreboard-item title-value">
<h4><?= e(trans('winter.user::lang.user.label')) ?></h4>
<?php if ($formModel->name): ?>
<p><?= e($formModel->name) ?></p>
<?php else: ?>
<p><em><?= e(trans('winter.user::lang.user.name_empty')) ?></em></p>
<?php endif ?>
<p class="description">
<a href="mailto:<?= e($formModel->email) ?>">
<?= e($formModel->email) ?>
</a>
</p>
</div>
<?php if ($formModel->created_at): ?>
<div class="scoreboard-item title-value">
<h4><?= e(trans('winter.user::lang.user.joined')) ?></h4>
<p title="<?= $formModel->created_at->diffForHumans() ?>">
<?= $formModel->created_at->toFormattedDateString() ?>
</p>
<p class="description">
Status:
<?php if ($formModel->is_guest): ?>
<?= e(trans('winter.user::lang.user.status_guest')) ?>
<?php elseif ($formModel->is_activated): ?>
<?= e(trans('winter.user::lang.user.status_activated')) ?>
<?php else: ?>
<?= e(trans('winter.user::lang.user.status_registered')) ?>
<?php endif ?>
</p>
</div>
<?php endif ?>
<?php if ($formModel->last_seen): ?>
<div class="scoreboard-item title-value">
<h4><?= e(trans('winter.user::lang.user.last_seen')) ?></h4>
<p><?= $formModel->last_seen->diffForHumans() ?></p>
<p class="description">
<?= $formModel->isOnline() ? e(trans('winter.user::lang.user.is_online')) : e(trans('winter.user::lang.user.is_offline')) ?>
</p>
</div>
<?php endif ?>
</div>
</div>

9 changes: 9 additions & 0 deletions controllers/users/_preview_status.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php if ($formModel->is_guest): ?>
<?= $this->makePartial('hint_guest') ?>
<?php elseif ($formModel->isBanned()): ?>
<?= $this->makePartial('hint_banned') ?>
<?php elseif ($formModel->trashed()): ?>
<?= $this->makePartial('hint_trashed') ?>
<?php elseif (!$formModel->is_activated): ?>
<?= $this->makePartial('hint_activate') ?>
<?php endif ?>
71 changes: 0 additions & 71 deletions controllers/users/_preview_toolbar.htm

This file was deleted.

Loading
Loading