diff --git a/app/Helper/SubtaskHelper.php b/app/Helper/SubtaskHelper.php index dac712034..833544a70 100644 --- a/app/Helper/SubtaskHelper.php +++ b/app/Helper/SubtaskHelper.php @@ -66,7 +66,10 @@ class SubtaskHelper extends Base $html = $this->helper->form->label(t('Assignee'), 'user_id'); $html .= $this->helper->form->select('user_id', $users, $values, $errors, $attributes); - $html .= ' '.t('Me').''; + $html .= ' '; + $html .= ''; + $html .= ''.t('Me').''; + $html .= ''; return $html; } diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php index 481a5efb1..599146b99 100644 --- a/app/Helper/TaskHelper.php +++ b/app/Helper/TaskHelper.php @@ -103,7 +103,10 @@ class TaskHelper extends Base $html = $this->helper->form->label(t('Assignee'), 'owner_id'); $html .= $this->helper->form->select('owner_id', $users, $values, $errors, $attributes); - $html .= ' '.t('Me').''; + $html .= ' '; + $html .= ''; + $html .= ''.t('Me').''; + $html .= ''; return $html; } diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index 75a6eb4cb..c0b71eabf 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -5,9 +5,9 @@
= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/comment_delete.php b/app/Template/event/comment_delete.php index ead7d56ac..e3a2f9fad 100644 --- a/app/Template/event/comment_delete.php +++ b/app/Template/event/comment_delete.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php index 5be598ac1..9e25ec2df 100644 --- a/app/Template/event/comment_update.php +++ b/app/Template/event/comment_update.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php index 1bf36c059..9a115c737 100644 --- a/app/Template/event/subtask_create.php +++ b/app/Template/event/subtask_create.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/subtask_delete.php b/app/Template/event/subtask_delete.php index 8ac11853b..7f0d6d589 100644 --- a/app/Template/event/subtask_delete.php +++ b/app/Template/event/subtask_delete.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php index 201402f6d..e566022e2 100644 --- a/app/Template/event/subtask_update.php +++ b/app/Template/event/subtask_update.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php index 7539cd0bc..405f8ac1e 100644 --- a/app/Template/event/task_assignee_change.php +++ b/app/Template/event/task_assignee_change.php @@ -10,7 +10,7 @@ = e('%s removed the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php index 90ff92074..1ac81ea9b 100644 --- a/app/Template/event/task_close.php +++ b/app/Template/event/task_close.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php index 017a5adab..9d0ff3586 100644 --- a/app/Template/event/task_create.php +++ b/app/Template/event/task_create.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php index d329529ad..7e58fdc18 100644 --- a/app/Template/event/task_file_create.php +++ b/app/Template/event/task_file_create.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($file['name']) ?>
diff --git a/app/Template/event/task_internal_link_create_update.php b/app/Template/event/task_internal_link_create_update.php index de257977c..4bc6ae9ac 100644 --- a/app/Template/event/task_internal_link_create_update.php +++ b/app/Template/event/task_internal_link_create_update.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>diff --git a/app/Template/event/task_internal_link_delete.php b/app/Template/event/task_internal_link_delete.php index e537bf815..3465fa571 100644 --- a/app/Template/event/task_internal_link_delete.php +++ b/app/Template/event/task_internal_link_delete.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php index f3155e47b..e7e5ec284 100644 --- a/app/Template/event/task_move_column.php +++ b/app/Template/event/task_move_column.php @@ -4,7 +4,7 @@ $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $this->text->e($task['column_title']) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>
= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php index ecdd02b60..48fbbb1e6 100644 --- a/app/Template/event/task_move_position.php +++ b/app/Template/event/task_move_position.php @@ -5,7 +5,7 @@ $task['position'], $this->text->e($task['column_title']) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php index fe9bfb55b..a467875b5 100644 --- a/app/Template/event/task_move_swimlane.php +++ b/app/Template/event/task_move_swimlane.php @@ -11,7 +11,7 @@ $this->text->e($task['swimlane_name']) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php index 548aa98f5..6d5252a1b 100644 --- a/app/Template/event/task_open.php +++ b/app/Template/event/task_open.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php index 7c7507c07..2608f6236 100644 --- a/app/Template/event/task_update.php +++ b/app/Template/event/task_update.php @@ -3,7 +3,7 @@ $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> - = $this->dt->datetime($date_creation) ?> + = $this->dt->datetime($date_creation) ?>= $this->text->e($task['title']) ?>
diff --git a/app/Template/header.php b/app/Template/header.php index a2b3fcb3a..033967db8 100644 --- a/app/Template/header.php +++ b/app/Template/header.php @@ -12,9 +12,9 @@ - + - +