Rename controllers

2 files changed, 16 insertions, 16 deletions

diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php
index 5a27e981..d98552e6 100644
--- a/app/Template/project_header/dropdown.php
+++ b/app/Template/project_header/dropdown.php
@@ -39,13 +39,13 @@
 
         <li>
             <i class="fa fa-dashboard fa-fw"></i>
-            <?= $this->url->link(t('Activity'), 'activity', 'project', array('project_id' => $project['id'])) ?>
+            <?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
         </li>
 
-        <?php if ($this->user->hasProjectAccess('customfilter', 'index', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
             <li>
                 <i class="fa fa-filter fa-fw"></i>
-                <?= $this->url->link(t('Custom filters'), 'customfilter', 'index', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
@@ -58,17 +58,17 @@
 
         <?= $this->hook->render('template:project:dropdown', array('project' => $project)) ?>
 
-        <?php if ($this->user->hasProjectAccess('analytic', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>
-                <?= $this->url->link(t('Analytics'), 'analytic', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
-        <?php if ($this->user->hasProjectAccess('export', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?>
             <li>
                 <i class="fa fa-download fa-fw"></i>
-                <?= $this->url->link(t('Exports'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php
index 353e4b62..e444235a 100644
--- a/app/Template/project_header/views.php
+++ b/app/Template/project_header/views.php
@@ -1,24 +1,24 @@
 <ul class="views">
-    <li <?= $this->app->getRouterController() === 'ProjectOverview' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('ProjectOverviewController') ?>>
         <i class="fa fa-eye fa-fw"></i>
-        <?= $this->url->link(t('Overview'), 'ProjectOverview', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
+        <?= $this->url->link(t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Board' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Board') ?>>
         <i class="fa fa-th fa-fw"></i>
         <?= $this->url->link(t('Board'), 'board', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Calendar' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Calendar') ?>>
         <i class="fa fa-calendar fa-fw"></i>
-        <?= $this->url->link(t('Calendar'), 'calendar', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
+        <?= $this->url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
     </li>
-    <li <?= $this->app->getRouterController() === 'Listing' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('TaskListController') ?>>
         <i class="fa fa-list fa-fw"></i>
-        <?= $this->url->link(t('List'), 'listing', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
+        <?= $this->url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
     </li>
     <?php if ($this->user->hasProjectAccess('gantt', 'project', $project['id'])): ?>
-    <li <?= $this->app->getRouterController() === 'Gantt' ? 'class="active"' : '' ?>>
+    <li <?= $this->app->checkMenuSelection('Gantt') ?>>
         <i class="fa fa-sliders fa-fw"></i>
         <?= $this->url->link(t('Gantt'), 'gantt', 'project', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
     </li>
     <?php endif ?>
-</ul>
\ No newline at end of file
+</ul>