Improve project page titles

7 files changed, 22 insertions, 10 deletions

diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php
index 70d8d02b..e4a0b60e 100644
--- a/app/Template/analytic/compare_hours.php
+++ b/app/Template/analytic/compare_hours.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Compare Estimated Time vs Actual Time') ?></h2>
+    <h2><?= t('Estimated vs actual time') ?></h2>
 </div>
 
 <div class="listing">
diff --git a/app/Template/export/subtasks.php b/app/Template/export/subtasks.php
index a82cb3d1..878a7132 100644
--- a/app/Template/export/subtasks.php
+++ b/app/Template/export/subtasks.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Subtasks exportation for "%s"', $project['name']) ?></h2>
+    <h2><?= t('Subtasks export') ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This report contains all subtasks information for the given date range.') ?></p>
@@ -21,4 +21,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/export/summary.php b/app/Template/export/summary.php
index 60aa306f..d9362a9b 100644
--- a/app/Template/export/summary.php
+++ b/app/Template/export/summary.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Daily project summary export for "%s"', $project['name']) ?></h2>
+    <h2><?= t('Daily project summary export') ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This export contains the number of tasks per column grouped per day.') ?></p>
@@ -21,4 +21,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/export/tasks.php b/app/Template/export/tasks.php
index bed8ab90..ae411326 100644
--- a/app/Template/export/tasks.php
+++ b/app/Template/export/tasks.php
@@ -1,5 +1,5 @@
 <div class="page-header">
-    <h2><?= t('Tasks exportation for "%s"', $project['name']) ?></h2>
+    <h2><?= t('Tasks exportation') ?></h2>
 </div>
 
 <p class="alert alert-info"><?= t('This report contains all tasks information for the given date range.') ?></p>
@@ -21,4 +21,4 @@
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/app/Template/header.php b/app/Template/header.php
index f99f1031..a2b3fcb3 100644
--- a/app/Template/header.php
+++ b/app/Template/header.php
@@ -5,7 +5,7 @@
                 <?= $this->url->link('K<span>B</span>', 'DashboardController', 'show', array(), false, '', t('Dashboard')) ?>
             </span>
             <span class="title">
-                <?php if (isset($project) && ! empty($project)): ?>
+                <?php if (! empty($project) && ! empty($task)): ?>
                     <?= $this->url->link($this->text->e($project['name']), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
                 <?php else: ?>
                     <?= $this->text->e($title) ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index b44e6f0b..728741ba 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -1,5 +1,7 @@
 <div class="sidebar sidebar-icons">
-    <h2><?= t('Task #%d', $task['id']) ?></h2>
+    <div class="sidebar-title">
+        <h2><?= t('Task #%d', $task['id']) ?></h2>
+    </div>
     <ul>
         <li <?= $this->app->checkMenuSelection('TaskViewController', 'show') ?>>
             <i class="fa fa-newspaper-o fa-fw"></i>
@@ -28,7 +30,9 @@
     </ul>
 
     <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
-    <h2><?= t('Actions') ?></h2>
+    <div class="sidebar-title">
+        <h2><?= t('Actions') ?></h2>
+    </div>
     <ul>
         <li>
             <i class="fa fa-pencil-square-o fa-fw"></i>
diff --git a/app/Template/user_view/sidebar.php b/app/Template/user_view/sidebar.php
index 3d1b7523..a80daefa 100644
--- a/app/Template/user_view/sidebar.php
+++ b/app/Template/user_view/sidebar.php
@@ -1,4 +1,7 @@
 <div class="sidebar">
+    <div class="sidebar-title">
+        <h2><?= t('Information') ?></h2>
+    </div>
     <ul>
         <?php if ($this->user->hasAccess('UserViewController', 'show')): ?>
             <li <?= $this->app->checkMenuSelection('UserViewController', 'show') ?>>
@@ -34,7 +37,12 @@
         <?php endif ?>
 
         <?= $this->hook->render('template:user:sidebar:information', array('user' => $user)) ?>
+    </ul>
 
+    <div class="sidebar-title">
+        <h2><?= t('Actions') ?></h2>
+    </div>
+    <ul>
         <?php if ($this->user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?>
 
             <?php if ($this->user->hasAccess('UserModificationController', 'show')): ?>