diff --git a/ChangeLog b/ChangeLog index 6980fd1e1..031db8492 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Version 1.0.27 (unreleased) Improvements: +* Put back the action sidebar in task view * Added support for multiple placeholders for LDAP_USER_FILTER * Added local file link provider * Show configuration in settings page diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php index 2eda357bc..0e94a3059 100644 --- a/app/Template/subtask/show.php +++ b/app/Template/subtask/show.php @@ -6,6 +6,12 @@

+
diff --git a/app/Template/task/description.php b/app/Template/task/description.php index f823e7d64..b84e9f420 100644 --- a/app/Template/task/description.php +++ b/app/Template/task/description.php @@ -2,6 +2,12 @@

+
    +
  • + + url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index 951c5095c..e9af71a53 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -1,33 +1,99 @@ -
+

  • app->checkMenuSelection('task', 'show') ?>> + url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • app->checkMenuSelection('activity', 'task') ?>> + url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • app->checkMenuSelection('task', 'transitions') ?>> + url->link(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • app->checkMenuSelection('task', 'analytics') ?>> + url->link(t('Analytics'), 'task', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • 0 || $task['time_spent'] > 0): ?>
  • app->checkMenuSelection('task', 'timetracking') ?>> + url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • app->checkMenuSelection('subtask', 'show') ?>> + url->link(t('Sub-tasks'), 'subtask', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • app->checkMenuSelection('tasklink', 'show') ?>> + url->link(t('Internal links'), 'tasklink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • app->checkMenuSelection('TaskExternalLink', 'show') ?>> + url->link(t('External links'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • - - hook->render('template:task:sidebar', array('task' => $task)) ?>
+

+
    +
  • + + url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Edit the description'), 'taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Edit recurrence'), 'TaskRecurrence', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Attach a document'), 'TaskFile', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Add a screenshot'), 'TaskFile', 'screenshot', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Duplicate'), 'taskduplication', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Duplicate to another project'), 'taskduplication', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + url->link(t('Move to another project'), 'taskduplication', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
  • + + + url->link(t('Close this task'), 'taskstatus', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + + + url->link(t('Open this task'), 'taskstatus', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> + +
    • + task->canRemove($task)): ?> +
  • + + url->link(t('Remove'), 'task', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • + +
+ + hook->render('template:task:sidebar', array('task' => $task)) ?>
diff --git a/app/Template/task_external_link/show.php b/app/Template/task_external_link/show.php index 0b9567bab..e9339e866 100644 --- a/app/Template/task_external_link/show.php +++ b/app/Template/task_external_link/show.php @@ -4,6 +4,12 @@

+
    +
  • + + url->link(t('Add external link'), 'TaskExternalLink', 'find', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php index 1aa141a45..b2ef93d77 100644 --- a/app/Template/tasklink/show.php +++ b/app/Template/tasklink/show.php @@ -6,6 +6,12 @@

+
    +
  • + + url->link(t('Add internal link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> +
    • +