From b3a450bace8461fb7989d5406b9d9ec644d7df4a Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 8 Jan 2017 14:00:51 -0500
Subject: Display project analytics in modal box

---
 app/Template/analytic/cfd.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'app/Template/analytic/cfd.php')

diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php
index 5eb42e82..dcd7b58f 100644
--- a/app/Template/analytic/cfd.php
+++ b/app/Template/analytic/cfd.php
@@ -1,6 +1,8 @@
-<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>
@@ -14,18 +16,8 @@
 <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>
-- 
cgit v1.2.3