9 files changed, 115 insertions, 120 deletions
diff --git a/app/Template/analytic/avg_time_columns.php b/app/Template/analytic/avg_time_columns.php
index 91c269fc..1af69c8b 100644
--- a/app/Template/analytic/avg_time_columns.php
+++ b/app/Template/analytic/avg_time_columns.php
@@ -1,29 +1,31 @@
-<div class="page-header">
-    <h2><?= t('Average time spent into each column') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('Average time spent into each column') ?></h2>
+    </div>
+<?php endif ?>
 
 <?php if (empty($metrics)): ?>
     <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
 <?php else: ?>
-    <section id="analytic-avg-time-column">
-
-        <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label="<?= t('Average time spent') ?>"></div>
+    <?= $this->app->component('chart-project-avg-time-column', array(
+        'metrics' => $metrics,
+        'label' => t('Average time spent'),
+    )) ?>
 
-        <table class="table-striped">
+    <table class="table-striped">
         <tr>
             <th><?= t('Column') ?></th>
             <th><?= t('Average time spent') ?></th>
         </tr>
         <?php foreach ($metrics as $column): ?>
-        <tr>
-            <td><?= $this->text->e($column['title']) ?></td>
-            <td><?= $this->dt->duration($column['average']) ?></td>
-        </tr>
+            <tr>
+                <td><?= $this->text->e($column['title']) ?></td>
+                <td><?= $this->dt->duration($column['average']) ?></td>
+            </tr>
         <?php endforeach ?>
-        </table>
+    </table>
 
-        <p class="alert alert-info">
-            <?= t('This chart show the average time spent into each column for the last %d tasks.', 1000) ?>
-        </p>
-    </section>
+    <p class="alert alert-info">
+        <?= t('This chart show the average time spent into each column for the last %d tasks.', 1000) ?>
+    </p>
 <?php endif ?>
diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php
index dfd77604..d62c9ba0 100644
--- a/app/Template/analytic/burndown.php
+++ b/app/Template/analytic/burndown.php
@@ -1,32 +1,26 @@
-<div class="page-header">
-    <h2><?= t('Burndown chart') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('Burndown chart') ?></h2>
+    </div>
+<?php endif ?>
 
 <?php if (! $display_graph): ?>
     <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p>
 <?php else: ?>
-    <section id="analytic-burndown">
-        <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-date-format="<?= e('%%Y-%%m-%%d') ?>" data-label-total="<?= t('Total for all columns') ?>"></div>
-    </section>
+    <?= $this->app->component('chart-project-burndown', array(
+        'metrics' => $metrics,
+        'labelTotal' => t('Total for all columns'),
+        'dateFormat' => e('%%Y-%%m-%%d'),
+    )) ?>
 <?php endif ?>
 
 <hr/>
 
 <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
-
-    <div class="form-inline-group">
-        <?= $this->form->date(t('Start date'), 'from', $values) ?>
-    </div>
-
-    <div class="form-inline-group">
-        <?= $this->form->date(t('End date'), 'to', $values) ?>
-    </div>
-
-    <div class="form-inline-group">
-        <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
-    </div>
+    <?= $this->form->date(t('Start date'), 'from', $values) ?>
+    <?= $this->form->date(t('End date'), 'to', $values) ?>
+    <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
 </form>
 
 <p class="alert alert-info"><?= t('This chart show the task complexity over the time (Work Remaining).') ?></p>
diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php
index 89ded3ad..dcd7b58f 100644
--- a/app/Template/analytic/cfd.php
+++ b/app/Template/analytic/cfd.php
@@ -1,30 +1,23 @@
-<div class="page-header">
-    <h2><?= t('Cumulative flow diagram') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('Cumulative flow diagram') ?></h2>
+    </div>
+<?php endif ?>
 
 <?php if (! $display_graph): ?>
     <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p>
 <?php else: ?>
-    <section id="analytic-cfd">
-        <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-date-format="<?= e('%%Y-%%m-%%d') ?>"></div>
-    </section>
+    <?= $this->app->component('chart-project-cumulative-flow', array(
+        'metrics' => $metrics,
+        'dateFormat' => e('%%Y-%%m-%%d'),
+    )) ?>
 <?php endif ?>
 
 <hr/>
 
 <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
-
-    <div class="form-inline-group">
-        <?= $this->form->date(t('Start date'), 'from', $values) ?>
-    </div>
-
-    <div class="form-inline-group">
-        <?= $this->form->date(t('End date'), 'to', $values) ?>
-    </div>
-
-    <div class="form-inline-group">
-        <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
-    </div>
+    <?= $this->form->date(t('Start date'), 'from', $values) ?>
+    <?= $this->form->date(t('End date'), 'to', $values) ?>
+    <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
 </form>
diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php
index e3c6099f..7159094c 100644
--- a/app/Template/analytic/layout.php
+++ b/app/Template/analytic/layout.php
@@ -1,10 +1,14 @@
-<section id="main">
+<?php if ($is_ajax): ?>
+    <div class="page-header">
+        <h2><?= $title ?></h2>
+    </div>
+<?php else: ?>
     <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
-    <section class="sidebar-container">
-        <?= $this->render($sidebar_template, array('project' => $project)) ?>
+<?php endif ?>
+<section class="sidebar-container">
+    <?= $this->render($sidebar_template, array('project' => $project)) ?>
 
-        <div class="sidebar-content">
-            <?= $content_for_sublayout ?>
-        </div>
-    </section>
+    <div class="sidebar-content">
+        <?= $content_for_sublayout ?>
+    </div>
 </section>
diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php
index ef595b79..780b47b6 100644
--- a/app/Template/analytic/lead_cycle_time.php
+++ b/app/Template/analytic/lead_cycle_time.php
@@ -1,8 +1,10 @@
-<div class="page-header">
-    <h2><?= t('Average Lead and Cycle time') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('Average Lead and Cycle time') ?></h2>
+    </div>
+<?php endif ?>
 
-<div class="listing">
+<div class="panel">
     <ul>
         <li><?= t('Average lead time: ').'<strong>'.$this->dt->duration($average['avg_lead_time']) ?></strong></li>
         <li><?= t('Average cycle time: ').'<strong>'.$this->dt->duration($average['avg_cycle_time']) ?></strong></li>
@@ -12,29 +14,20 @@
 <?php if (empty($metrics)): ?>
     <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
 <?php else: ?>
-    <section id="analytic-lead-cycle-time">
-
-        <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div>
-
-        <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
-
-            <?= $this->form->csrf() ?>
-
-            <div class="form-inline-group">
-                <?= $this->form->date(t('Start date'), 'from', $values) ?>
-            </div>
-
-            <div class="form-inline-group">
-                <?= $this->form->date(t('End date'), 'to', $values) ?>
-            </div>
-
-            <div class="form-inline-group">
-                <button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
-            </div>
-        </form>
-
-        <p class="alert alert-info">
-            <?= t('This chart show the average lead and cycle time for the last %d tasks over the time.', 1000) ?>
-        </p>
-    </section>
+    <?= $this->app->component('chart-project-lead-cycle-time', array(
+        'metrics' => $metrics,
+        'labelCycle' => t('Cycle Time'),
+        'labelLead' => t('Lead Time'),
+    )) ?>
+
+    <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
+        <?= $this->form->csrf() ?>
+        <?= $this->form->date(t('Start date'), 'from', $values) ?>
+        <?= $this->form->date(t('End date'), 'to', $values) ?>
+        <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
+    </form>
+
+    <p class="alert alert-info">
+        <?= t('This chart show the average lead and cycle time for the last %d tasks over the time.', 1000) ?>
+    </p>
 <?php endif ?>
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index f768a11d..d5ce88cb 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -1,28 +1,27 @@
 <div class="sidebar">
     <ul>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'taskDistribution') ?>>
-            <?= $this->url->link(t('Task distribution'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('Task distribution'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'userDistribution') ?>>
-            <?= $this->url->link(t('User repartition'), 'AnalyticController', 'userDistribution', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('User repartition'), 'AnalyticController', 'userDistribution', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'cfd') ?>>
-            <?= $this->url->link(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'burndown') ?>>
-            <?= $this->url->link(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>>
-            <?= $this->url->link(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
-            <?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'timeComparison') ?>>
-            <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'timeComparison', array('project_id' => $project['id'])) ?>
+            <?= $this->modal->replaceLink(t('Estimated vs actual time'), 'AnalyticController', 'timeComparison', array('project_id' => $project['id'])) ?>
         </li>
 
         <?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
-
     </ul>
 </div>
diff --git a/app/Template/analytic/task_distribution.php b/app/Template/analytic/task_distribution.php
index 311e8c65..671d462f 100644
--- a/app/Template/analytic/task_distribution.php
+++ b/app/Template/analytic/task_distribution.php
@@ -1,11 +1,15 @@
-<div class="page-header">
-    <h2><?= t('Task distribution') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('Task distribution') ?></h2>
+    </div>
+<?php endif ?>
 
 <?php if (empty($metrics)): ?>
     <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
 <?php else: ?>
-    <chart-project-task-distribution :metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>'></chart-project-task-distribution>
+    <?= $this->app->component('chart-project-task-distribution', array(
+        'metrics' => $metrics,
+    )) ?>
 
     <table class="table-striped">
         <tr>
diff --git a/app/Template/analytic/time_comparison.php b/app/Template/analytic/time_comparison.php
index ee0ee4b6..754c68f2 100644
--- a/app/Template/analytic/time_comparison.php
+++ b/app/Template/analytic/time_comparison.php
@@ -1,8 +1,10 @@
-<div class="page-header">
-    <h2><?= t('Estimated vs actual time') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('Estimated vs actual time') ?></h2>
+    </div>
+<?php endif ?>
 
-<div class="listing">
+<div class="panel">
     <ul>
         <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>
@@ -15,21 +17,21 @@
     <?php if ($paginator->isEmpty()): ?>
         <p class="alert"><?= t('No tasks found.') ?></p>
     <?php elseif (! $paginator->isEmpty()): ?>
-        <chart-project-time-comparison
-            :metrics='<?= json_encode($metrics, JSON_HEX_APOS)?>'
-            label-spent="<?= t('Hours Spent') ?>"
-            label-estimated="<?= t('Hours Estimated') ?>"
-            label-closed="<?= t('Closed') ?>"
-            label-open="<?= t('Open') ?>">
-        </chart-project-time-comparison>
+        <?= $this->app->component('chart-project-time-comparison', array(
+            'metrics' => $metrics,
+            'labelSpent' => t('Hours Spent'),
+            'labelEstimated' => t('Hours Estimated'),
+            'labelClosed' => t('Closed'),
+            'labelOpen' => t('Open'),
+        )) ?>
 
         <table class="table-fixed table-small table-scrolling">
             <tr>
                 <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
                 <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
-                <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+                <th class="column-12"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
+                <th class="column-12"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
             </tr>
             <?php foreach ($paginator->getCollection() as $task): ?>
             <tr>
diff --git a/app/Template/analytic/user_distribution.php b/app/Template/analytic/user_distribution.php
index c3cf4961..cae6fa57 100644
--- a/app/Template/analytic/user_distribution.php
+++ b/app/Template/analytic/user_distribution.php
@@ -1,11 +1,15 @@
-<div class="page-header">
-    <h2><?= t('User repartition') ?></h2>
-</div>
+<?php if (! $is_ajax): ?>
+    <div class="page-header">
+        <h2><?= t('User repartition') ?></h2>
+    </div>
+<?php endif ?>
 
 <?php if (empty($metrics)): ?>
     <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
 <?php else: ?>
-    <chart-project-user-distribution :metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>'></chart-project-user-distribution>
+    <?= $this->app->component('chart-project-user-distribution', array(
+        'metrics' => $metrics,
+    )) ?>
 
     <table class="table-striped">
         <tr>