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

Move dashboard menu for calendar and activity stream

Browse Source
This commit is contained in:
Frederic Guillot
2017-03-11 19:36:48 -05:00
parent cfd3000d83
commit 8f6b3295e8
11 changed files with 59 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/Template/dashboard/activity.php → app/Template/activity/user.php
View File

6
app/Template/calendar/project.php Normal file
View File

@@ -0,0 +1,6 @@
<?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
<?= $this->calendar->render(
$this->url->href('CalendarController', 'projectEvents', array('project_id' => $project['id'])),
$this->url->href('CalendarController', 'save', array('project_id' => $project['id']))
) ?>

9
app/Template/calendar/show.php
View File

@@ -1,9 +0,0 @@
<section id="main">
<?= $this->projectHeader->render($project, 'CalendarController', 'show') ?>
<?= $this->calendar->render(
$this->url->href('CalendarController', 'project', array('project_id' => $project['id'])),
$this->url->href('CalendarController', 'save', array('project_id' => $project['id']))
) ?>
</section>

4
app/Template/calendar/user.php Normal file
View File

@@ -0,0 +1,4 @@
<?= $this->calendar->render(
$this->url->href('CalendarController', 'userEvents', array('user_id' => $user['id'])),
$this->url->href('CalendarController', 'save')
) ?>

4
app/Template/dashboard/calendar.php
View File

@@ -1,4 +0,0 @@
<?= $this->calendar->render(
$this->url->href('CalendarController', 'user', array('user_id' => $user['id'])),
$this->url->href('CalendarController', 'save')
) ?>

7
app/Template/dashboard/layout.php
View File

@@ -12,10 +12,13 @@
</li>
<?php endif ?>
<li>
<?= $this->url->icon('search', t('Search'), 'SearchController', 'index') ?>
<?= $this->url->icon('folder', t('Project management'), 'ProjectListController', 'show') ?>
</li>
<li>
<?= $this->url->icon('folder', t('Project management'), 'ProjectListController', 'show') ?>
<?= $this->modal->medium('dashboard', t('My activity stream'), 'ActivityController', 'user') ?>
</li>
<li>
<?= $this->modal->medium('calendar', t('My calendar'), 'CalendarController', 'user') ?>
</li>
</ul>
</div>

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

@@ -12,12 +12,6 @@
<li <?= $this->app->checkMenuSelection('DashboardController', 'subtasks') ?>>
<?= $this->url->link(t('My subtasks'), 'DashboardController', 'subtasks', array('user_id' => $user['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('DashboardController', 'calendar') ?>>
<?= $this->url->link(t('My calendar'), 'DashboardController', 'calendar', array('user_id' => $user['id'])) ?>
</li>
<li <?= $this->app->checkMenuSelection('DashboardController', 'activity') ?>>
<?= $this->url->link(t('My activity stream'), 'DashboardController', 'activity', array('user_id' => $user['id'])) ?>
</li>
<?= $this->hook->render('template:dashboard:sidebar', array('user' => $user)) ?>
</ul>
</div>

2
app/Template/project_header/views.php
View File

@@ -6,7 +6,7 @@
<?= $this->url->icon('th', t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
</li>
<li <?= $this->app->checkMenuSelection('CalendarController') ?>>
<?= $this->url->icon('calendar', t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
<?= $this->url->icon('calendar', t('Calendar'), 'CalendarController', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
</li>
<li <?= $this->app->checkMenuSelection('TaskListController') ?>>
<?= $this->url->icon('list', t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>