From 6d65cfd88343aadc68e4963e66dcdc0688b4346c Mon Sep 17 00:00:00 2001
From: Francois Ferrand <thetypz@gmail.com>
Date: Thu, 26 Jun 2014 15:52:39 +0200
Subject: Use popover to edit task and description directly from board.

- Click on 'description' icon opens the 'edit-description' page.
- Edit task and edit description now open in popover, like the assign
dialog.
---
 app/Templates/task_edit_description.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/Templates/task_edit_description.php')

diff --git a/app/Templates/task_edit_description.php b/app/Templates/task_edit_description.php
index 550dac73..ba0d3887 100644
--- a/app/Templates/task_edit_description.php
+++ b/app/Templates/task_edit_description.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit the description') ?></h2>
 </div>
 
-<form method="post" action="?controller=task&amp;action=saveDescription&amp;task_id=<?= $task['id'] ?>" autocomplete="off">
+<form method="post" action="?controller=task&amp;action=saveDescription&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
 
     <?= Helper\form_csrf() ?>
 
@@ -13,6 +13,11 @@
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
+<?php if ($ajax): ?>
+        <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
+<?php else: ?>
         <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+<?php endif ?>
     </div>
 </form>
+
-- 
cgit v1.2.3