Open project activities in modal box

5 files changed, 8 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 068f5ecf..15ec0979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Improvements:
 * Make icons clickable in menus
 * Open task import 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)
 -----------------------------
diff --git a/app/Controller/ActivityController.php b/app/Controller/ActivityController.php
index 476e4aac..edf0fbb4 100644
--- a/app/Controller/ActivityController.php
+++ b/app/Controller/ActivityController.php
@@ -19,10 +19,9 @@ class ActivityController extends BaseController
     {
         $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']),
             'project' => $project,
-            'title' => t('%s\'s activity', $project['name'])
         )));
     }
 
diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php
index 6d1e4a2e..ce1f8bba 100644
--- a/app/Template/activity/project.php
+++ b/app/Template/activity/project.php
@@ -1,14 +1,12 @@
-<section id="main">
-    <?= $this->projectHeader->render($project, 'ActivityController', $this->app->getRouterAction()) ?>
+<div class="page-header">
+    <h2><?= t('%s\'s activity', $project['name']) ?></h2>
 
     <?php if ($project['is_public']): ?>
-    <div class="menu-inline">
         <ul>
             <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>
         </ul>
-    </div>
     <?php endif ?>
+</div>
 
-    <?= $this->render('event/events', array('events' => $events)) ?>
-</section>
+<?= $this->render('event/events', array('events' => $events)) ?>
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index eaaa3546..4ae9318c 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -17,7 +17,7 @@
         <?php endif ?>
 
         <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>
 
         <?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php
index 3f11838d..27a13ac9 100644
--- a/app/Template/project_header/dropdown.php
+++ b/app/Template/project_header/dropdown.php
@@ -27,7 +27,7 @@
         <?php endif ?>
 
         <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>
 
         <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>