Move avatar to the top right corner

This commit is contained in:
Frederic Guillot
2016-03-24 21:21:22 -04:00
parent 3a06e0ab21
commit 4c8d5fbdc0
7 changed files with 51 additions and 49 deletions

View File

@@ -0,0 +1,19 @@
<?php if (! empty($task['owner_id'])): ?>
<div class="task-board-avatars">
<span
<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
class="task-board-assignee task-board-change-assignee"
data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<?php else: ?>
class="task-board-assignee">
<?php endif ?>
<?= $this->avatar->small(
$task['owner_id'],
$task['assignee_username'],
$task['assignee_name'],
$task['assignee_email'],
'avatar-inline'
) ?>
</span>
</div>
<?php endif ?>

View File

@@ -1,23 +1,3 @@
<?php if (! empty($task['owner_id'])): ?>
<div class="task-board-avatars">
<span
<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $task['project_id'])): ?>
class="task-board-assignee task-board-change-assignee"
data-url="<?= $this->url->href('BoardPopover', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<?php else: ?>
class="task-board-assignee">
<?php endif ?>
<?= $this->avatar->small(
$task['owner_id'],
$task['assignee_username'],
$task['assignee_name'],
$task['assignee_email'],
'avatar-inline'
) ?>
</span>
</div>
<?php endif ?>
<?php if (! empty($task['category_id'])): ?>
<div class="task-board-category-container">
<span class="task-board-category">

View File

@@ -44,18 +44,18 @@
</span>
<?php endif ?>
<?= $this->render('board/task_avatar', array('task' => $task)) ?>
<?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
<span class="task-board-title">
<div class="task-board-title">
<?= $this->url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
</span>
</div>
<?= $this->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
<?= $this->render('board/task_footer', array(
'task' => $task,
'not_editable' => $not_editable,
'project' => $project,
'task' => $task,
'not_editable' => $not_editable,
'project' => $project,
)) ?>
</div>
<?php endif ?>

View File

@@ -8,12 +8,12 @@
</span>
<?php endif ?>
<?= $this->render('board/task_avatar', array('task' => $task)) ?>
<?= $this->hook->render('template:board:public:task:before-title', array('task' => $task)) ?>
<span class="task-board-title">
<div class="task-board-title">
<?= $this->url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
</span>
</div>
<?= $this->hook->render('template:board:public:task:after-title', array('task' => $task)) ?>
<?= $this->render('board/task_footer', array(