From 457e181ffb915e36e5da77317a6c824e10f5d5b3 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Mon, 1 Sep 2014 20:40:02 -0800
Subject: Improve task duplication

---
 app/Templates/task_duplicate.php | 14 ++++++++++++++
 app/Templates/task_show.php      |  1 +
 app/Templates/task_sidebar.php   |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 app/Templates/task_duplicate.php

(limited to 'app/Templates')

diff --git a/app/Templates/task_duplicate.php b/app/Templates/task_duplicate.php
new file mode 100644
index 00000000..ef903f1d
--- /dev/null
+++ b/app/Templates/task_duplicate.php
@@ -0,0 +1,14 @@
+<div class="page-header">
+    <h2><?= t('Duplicate a task') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to duplicate this task?') ?>
+    </p>
+
+    <div class="form-actions">
+        <a href="?controller=task&amp;action=duplicate&amp;confirmation=yes&amp;task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
+        <?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Templates/task_show.php b/app/Templates/task_show.php
index 329fde80..a152bf07 100644
--- a/app/Templates/task_show.php
+++ b/app/Templates/task_show.php
@@ -41,6 +41,7 @@
             <strong><?= Helper\escape($task['column_title']) ?></strong>
             (<?= Helper\escape($task['project_name']) ?>)
         </li>
+        <li><?= t('Task position:').' '.Helper\escape($task['position']) ?></li>
         <?php if ($task['category_name']): ?>
         <li>
             <?= t('Category:') ?> <strong><?= Helper\escape($task['category_name']) ?></strong>
diff --git a/app/Templates/task_sidebar.php b/app/Templates/task_sidebar.php
index 43170aa6..5d93d7b1 100644
--- a/app/Templates/task_sidebar.php
+++ b/app/Templates/task_sidebar.php
@@ -9,8 +9,8 @@
             <li><a href="?controller=comment&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Add a comment') ?></a></li>
             <li><a href="?controller=file&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Attach a document') ?></a></li>
             <li><a href="?controller=task&amp;action=duplicate&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
-            <li><a href="?controller=task&amp;action=move&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Move to another project') ?></a></li>
             <li><a href="?controller=task&amp;action=copy&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate to another project') ?></a></li>
+            <li><a href="?controller=task&amp;action=move&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Move to another project') ?></a></li>
             <li>
                 <?php if ($task['is_active'] == 1): ?>
                     <a href="?controller=task&amp;action=confirmClose&amp;task_id=<?= $task['id'] ?>"><?= t('Close this task') ?></a>
-- 
cgit v1.2.3