AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove username for dashboard sidebar and change titles

Browse Source
This commit is contained in:
Frederic Guillot
2016-07-24 13:00:59 -04:00
parent 51b2193fc4
commit a6d22bf271
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Controller/DashboardController.php
View File

@@ -20,7 +20,7 @@ class DashboardController extends BaseController
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/show', array( $this->response->html($this->helper->layout->dashboard('dashboard/show', array(
'title' => t('Dashboard'), 'title' => t('Dashboard for %s', $this->helper->user->getFullname($user)),
'project_paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'show', 10), 'project_paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'show', 10),
'task_paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'show', 10), 'task_paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'show', 10),
'subtask_paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'show', 10), 'subtask_paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'show', 10),
@@ -38,7 +38,7 @@ class DashboardController extends BaseController
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/tasks', array( $this->response->html($this->helper->layout->dashboard('dashboard/tasks', array(
'title' => t('My tasks'), 'title' => t('Tasks overview for %s', $this->helper->user->getFullname($user)),
'paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'tasks', 50), 'paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'tasks', 50),
'user' => $user, 'user' => $user,
))); )));
@@ -54,7 +54,7 @@ class DashboardController extends BaseController
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/subtasks', array( $this->response->html($this->helper->layout->dashboard('dashboard/subtasks', array(
'title' => t('My subtasks'), 'title' => t('Subtasks overview for %s', $this->helper->user->getFullname($user)),
'paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'subtasks', 50), 'paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'subtasks', 50),
'user' => $user, 'user' => $user,
))); )));
@@ -70,7 +70,7 @@ class DashboardController extends BaseController
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/projects', array( $this->response->html($this->helper->layout->dashboard('dashboard/projects', array(
'title' => t('My projects'), 'title' => t('Projects overview for %s', $this->helper->user->getFullname($user)),
'paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'projects', 25), 'paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'projects', 25),
'user' => $user, 'user' => $user,
))); )));
@@ -86,7 +86,7 @@ class DashboardController extends BaseController
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/activity', array( $this->response->html($this->helper->layout->dashboard('dashboard/activity', array(
'title' => t('My activity stream'), 'title' => t('Activity stream for %s', $this->helper->user->getFullname($user)),
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100), 'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
'user' => $user, 'user' => $user,
))); )));
@@ -99,9 +99,11 @@ class DashboardController extends BaseController
*/ */
public function calendar() public function calendar()
{ {
$user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/calendar', array( $this->response->html($this->helper->layout->dashboard('dashboard/calendar', array(
'title' => t('My calendar'), 'title' => t('Calendar for %s', $this->helper->user->getFullname($user)),
'user' => $this->getUser(), 'user' => $user,
))); )));
} }
@@ -115,7 +117,7 @@ class DashboardController extends BaseController
$user = $this->getUser(); $user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/notifications', array( $this->response->html($this->helper->layout->dashboard('dashboard/notifications', array(
'title' => t('My notifications'), 'title' => t('Notifications for %s', $this->helper->user->getFullname($user)),
'notifications' => $this->userUnreadNotificationModel->getAll($user['id']), 'notifications' => $this->userUnreadNotificationModel->getAll($user['id']),
'user' => $user, 'user' => $user,
))); )));

1
app/Template/dashboard/sidebar.php
View File

@@ -1,5 +1,4 @@
<div class="sidebar"> <div class="sidebar">
<h2><?= $this->text->e($user['name'] ?: $user['username']) ?></h2>
<ul> <ul>
<li <?= $this->app->checkMenuSelection('DashboardController', 'show') ?>> <li <?= $this->app->checkMenuSelection('DashboardController', 'show') ?>>
<?= $this->url->link(t('Overview'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?> <?= $this->url->link(t('Overview'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?>