9 files changed, 17 insertions, 17 deletions
diff --git a/app/Template/analytic/avg_time_columns.php b/app/Template/analytic/avg_time_columns.php
index 7b9d7cf9..5f6c6b35 100644
--- a/app/Template/analytic/avg_time_columns.php
+++ b/app/Template/analytic/avg_time_columns.php
@@ -16,7 +16,7 @@
         </tr>
         <?php foreach ($metrics as $column): ?>
         <tr>
-            <td><?= $this->e($column['title']) ?></td>
+            <td><?= $this->text->e($column['title']) ?></td>
             <td><?= $this->dt->duration($column['average']) ?></td>
         </tr>
         <?php endforeach ?>
diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php
index 3dfb6ee8..ed6c8aeb 100644
--- a/app/Template/analytic/burndown.php
+++ b/app/Template/analytic/burndown.php
@@ -27,7 +27,7 @@
     </div>
 
     <div class="form-inline-group">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+        <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
     </div>
 </form>
 
diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php
index 45f53e0f..ee259c70 100644
--- a/app/Template/analytic/cfd.php
+++ b/app/Template/analytic/cfd.php
@@ -27,6 +27,6 @@
     </div>
 
     <div class="form-inline-group">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+        <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
     </div>
 </form>
diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php
index bb145d61..8249e7ba 100644
--- a/app/Template/analytic/compare_hours.php
+++ b/app/Template/analytic/compare_hours.php
@@ -4,8 +4,8 @@
 
 <div class="listing">
     <ul>
-        <li><?= t('Estimated hours: ').'<strong>'.$this->e($metrics['open']['time_estimated'] + $metrics['closed']['time_estimated']) ?></strong></li>
-        <li><?= t('Actual hours: ').'<strong>'.$this->e($metrics['open']['time_spent'] + $metrics['closed']['time_spent']) ?></strong></li>
+        <li><?= t('Estimated hours: ').'<strong>'.$this->text->e($metrics['open']['time_estimated'] + $metrics['closed']['time_estimated']) ?></strong></li>
+        <li><?= t('Actual hours: ').'<strong>'.$this->text->e($metrics['open']['time_spent'] + $metrics['closed']['time_spent']) ?></strong></li>
     </ul>
 </div>
 
@@ -34,10 +34,10 @@
             <?php foreach ($paginator->getCollection() as $task): ?>
             <tr>
                 <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?= $this->url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
-                    <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                    <?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
                 </td>
                 <td>
                     <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
@@ -47,10 +47,10 @@
                     <?php endif ?>
                 </td>
                 <td>
-                    <?= $this->e($task['time_estimated']) ?>
+                    <?= $this->text->e($task['time_estimated']) ?>
                 </td>
                 <td>
-                    <?= $this->e($task['time_spent']) ?>
+                    <?= $this->text->e($task['time_spent']) ?>
                 </td>
             </tr>
             <?php endforeach ?>
diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index ff532fc0..f1dba552 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -31,9 +31,8 @@
             </li>
         </ul>
     </div>
-    <section class="sidebar-container" id="analytic-section">
-
-        <?= $this->render('analytic/sidebar', array('project' => $project)) ?>
+    <section class="sidebar-container">
+        <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
         <div class="sidebar-content">
             <?= $content_for_sublayout ?>
diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php
index 8e04bd6d..82ffe534 100644
--- a/app/Template/analytic/lead_cycle_time.php
+++ b/app/Template/analytic/lead_cycle_time.php
@@ -31,7 +31,7 @@
             </div>
 
             <div class="form-inline-group">
-                <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+                <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
             </div>
         </form>
 
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index 19eef8d5..76289b9f 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -22,7 +22,8 @@
         <li <?= $this->app->checkMenuSelection('analytic', 'compareHours') ?>>
             <?= $this->url->link(t('Estimated vs actual time'), 'analytic', 'compareHours', array('project_id' => $project['id'])) ?>
         </li>
+        
+        <?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
+        
     </ul>
-    <div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div>
-    <div class="sidebar-expand" style="display: none"><a href="#" title="<?= t('Expand sidebar') ?>"><i class="fa fa-chevron-right"></i></a></div>
 </div>
diff --git a/app/Template/analytic/tasks.php b/app/Template/analytic/tasks.php
index 7392ee56..9e7b1fd7 100644
--- a/app/Template/analytic/tasks.php
+++ b/app/Template/analytic/tasks.php
@@ -18,7 +18,7 @@
         <?php foreach ($metrics as $metric): ?>
         <tr>
             <td>
-                <?= $this->e($metric['column_title']) ?>
+                <?= $this->text->e($metric['column_title']) ?>
             </td>
             <td>
                 <?= $metric['nb_tasks'] ?>
diff --git a/app/Template/analytic/users.php b/app/Template/analytic/users.php
index 514d7133..9d1d3a1e 100644
--- a/app/Template/analytic/users.php
+++ b/app/Template/analytic/users.php
@@ -18,7 +18,7 @@
         <?php foreach ($metrics as $metric): ?>
         <tr>
             <td>
-                <?= $this->e($metric['user']) ?>
+                <?= $this->text->e($metric['user']) ?>
             </td>
             <td>
                 <?= $metric['nb_tasks'] ?>