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

Open project activities in modal box

Browse Source
This commit is contained in:
Frederic Guillot
2017-01-08 12:23:25 -05:00
parent e377f450ad
commit ea2cbb76d5
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -10,6 +10,7 @@ Improvements:
* Make icons clickable in menus * Make icons clickable in menus
* Open task import in modal box * Open task import in modal box
* Open form to create customer filters in modal box * Open form to create customer filters in modal box
* Open project activities in modal box
Version 1.0.36 (Dec 30, 2016) Version 1.0.36 (Dec 30, 2016)
----------------------------- -----------------------------

3
app/Controller/ActivityController.php
View File

@@ -19,10 +19,9 @@ class ActivityController extends BaseController
{ {
$project = $this->getProject(); $project = $this->getProject();
$this->response->html($this->helper->layout->app('activity/project', array( $this->response->html($this->template->render('activity/project', array(
'events' => $this->helper->projectActivity->getProjectEvents($project['id']), 'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
'project' => $project, 'project' => $project,
'title' => t('%s\'s activity', $project['name'])
))); )));
} }

10
app/Template/activity/project.php
View File

@@ -1,14 +1,12 @@
<section id="main"> <div class="page-header">
<?= $this->projectHeader->render($project, 'ActivityController', $this->app->getRouterAction()) ?> <h2><?= t('%s\'s activity', $project['name']) ?></h2>
<?php if ($project['is_public']): ?> <?php if ($project['is_public']): ?>
<div class="menu-inline">
<ul> <ul>
<li><?= $this->url->icon('rss-square', t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> <li><?= $this->url->icon('rss-square', t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li>
<li><?= $this->url->icon('calendar', t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> <li><?= $this->url->icon('calendar', t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li>
</ul> </ul>
</div>
<?php endif ?> <?php endif ?>
</div>
<?= $this->render('event/events', array('events' => $events)) ?> <?= $this->render('event/events', array('events' => $events)) ?>
</section>

2
app/Template/project/dropdown.php
View File

@@ -17,7 +17,7 @@
<?php endif ?> <?php endif ?>
<li> <li>
<?= $this->url->icon('dashboard', t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?> <?= $this->modal->medium('dashboard', t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
</li> </li>
<?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?> <?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>

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

@@ -27,7 +27,7 @@
<?php endif ?> <?php endif ?>
<li> <li>
<?= $this->url->icon('dashboard', t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?> <?= $this->modal->medium('dashboard', t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
</li> </li>
<?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?> <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>