From c9dcd7061708114c72c0c7d80d108661308b1e50 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 10 May 2015 14:36:17 -0400
Subject: Recurring tasks (#847): template cleanup

---
 app/Template/board/recurrence.php | 18 ------------------
 app/Template/board/task_menu.php  |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 app/Template/board/recurrence.php

(limited to 'app/Template/board')

diff --git a/app/Template/board/recurrence.php b/app/Template/board/recurrence.php
deleted file mode 100644
index 1b71bc34..00000000
--- a/app/Template/board/recurrence.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<section class="tooltip-large">
-<?php if ($task['recurrence_status'] == \Model\Task::RECURE_STATUS_PENDING): ?>
-    <?= t('Recurrent task is scheduled to generate') ?><br/>
-<?php endif ?>
-<?php if ($task['recurrence_status'] == \Model\Task::RECURE_STATUS_PROCESSED): ?>
-    <?= t('Recurrent task has been generated') ?><br/>
-<?php endif ?>
-    <?= t('Trigger to generate recurrent task: %s', $recurrence_trigger_list[$task['recurrence_trigger']]) ?><br/>
-    <?= t('Factor to calculate new due date: %s', $task['recurrence_factor']) ?><br/>
-    <?= t('Timeframe to calculate new due date: %s', $recurrence_timeframe_list[$task['recurrence_timeframe']]) ?><br/>
-    <?= t('Base date to calculate new due date: %s', $recurrence_basedate_list[$task['recurrence_basedate']]) ?><br/>
-<?php if ($task['recurrence_parent']): ?>
-    <?= t('Recurrent task created by: %s', $task['recurrence_parent']) ?><br/>
-<?php endif ?>
-<?php if ($task['recurrence_child']): ?>
-    <?= t('Created recurrent task: %s', $task['recurrence_child']) ?><br/>
-<?php endif ?>
-</section>
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php
index fba2d71d..04b03385 100644
--- a/app/Template/board/task_menu.php
+++ b/app/Template/board/task_menu.php
@@ -5,11 +5,11 @@
             <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-            <li><i class="fa fa-refresh fa-rotate-90"></i> <?= $this->a(t('Edit recurrence'), 'task', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-code-fork"></i> <?= $this->a(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
-            <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-camera"></i> <?= $this->a(t('Add a screenshot'), 'board', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-refresh fa-rotate-90"></i> <?= $this->a(t('Edit recurrence'), 'task', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
         </ul>
     </span>
-- 
cgit v1.2.3