AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move avatar to the top right corner

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Template/board/task_avatar.php Normal file
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 ?>

20
app/Template/board/task_footer.php
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'])): ?> <?php if (! empty($task['category_id'])): ?>
<div class="task-board-category-container"> <div class="task-board-category-container">
<span class="task-board-category"> <span class="task-board-category">

14
app/Template/board/task_private.php
View File

@@ -44,18 +44,18 @@
</span> </span>
<?php endif ?> <?php endif ?>
<?= $this->render('board/task_avatar', array('task' => $task)) ?>
<?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?> <?= $this->hook->render('template:board:private:task:before-title', array('task' => $task)) ?>
<div class="task-board-title">
<span 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')) ?> <?= $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->hook->render('template:board:private:task:after-title', array('task' => $task)) ?>
<?= $this->render('board/task_footer', array( <?= $this->render('board/task_footer', array(
'task' => $task, 'task' => $task,
'not_editable' => $not_editable, 'not_editable' => $not_editable,
'project' => $project, 'project' => $project,
)) ?> )) ?>
</div> </div>
<?php endif ?> <?php endif ?>

8
app/Template/board/task_public.php
View File

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

2
assets/css/app.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/print.css
View File

File diff suppressed because one or more lines are too long

35
assets/css/src/task.css
View File

@@ -47,27 +47,21 @@ div.task-board-status-closed {
font-weight: bold; font-weight: bold;
} }
.task-board-title a:hover {
text-decoration: underline;
}
.task-board-title {
margin-left: 5px;
font-size: 1.15em;
}
.task-board-collapsed { .task-board-collapsed {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.task-board-change-assignee:hover { /* title one the card */
opacity: 0.6; .task-board-title {
font-size: 1.2em;
margin-top: 5px;
margin-bottom: 8px;
} }
.task-board-change-assignee { .task-board-title a:hover {
cursor: pointer; text-decoration: underline;
} }
/* category label */ /* category label */
@@ -91,7 +85,16 @@ div.task-board-status-closed {
/* avatars on the card */ /* avatars on the card */
.task-board-avatars { .task-board-avatars {
margin-top: 5px; text-align: right;
float: right;
}
.task-board-change-assignee:hover {
opacity: 0.6;
}
.task-board-change-assignee {
cursor: pointer;
} }
/* task icons footer */ /* task icons footer */
@@ -138,7 +141,7 @@ span.task-board-date-overdue {
span.task-board-age-total { span.task-board-age-total {
border: #666 1px solid; border: #666 1px solid;
padding: 1px 2px 1px 2px; padding: 1px 3px 1px 3px;
border-top-left-radius: 3px; border-top-left-radius: 3px;
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;
} }
@@ -147,7 +150,7 @@ span.task-board-age-column {
border: #666 1px solid; border: #666 1px solid;
border-left: none; border-left: none;
margin-left: -5px; margin-left: -5px;
padding: 1px 2px 1px 2px; padding: 1px 3px 1px 3px;
border-top-right-radius: 3px; border-top-right-radius: 3px;
border-bottom-right-radius: 3px; border-bottom-right-radius: 3px;
} }