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

Swap category and avatar on the card

Browse Source
This commit is contained in:
Frederic Guillot
2016-03-19 15:25:48 -04:00
parent da10f3cf96
commit 0a18e28db4
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Template/board/task_footer.php
View File

@@ -1,23 +1,3 @@
<?php if (! empty($task['category_id'])): ?>
<div class="task-board-category-container">
<span class="task-board-category">
<?php if ($not_editable): ?>
<?= $this->text->e($task['category_name']) ?>
<?php else: ?>
<?= $this->url->link(
$this->text->e($task['category_name']),
'boardPopover',
'changeCategory',
array('task_id' => $task['id'], 'project_id' => $task['project_id']),
false,
'popover' . (! empty($task['category_description']) ? ' tooltip' : ''),
! empty($task['category_description']) ? $this->text->markdown($task['category_description']) : t('Change category')
) ?>
<?php endif ?>
</span>
</div>
<?php endif ?>
<?php if (! empty($task['owner_id'])): ?> <?php if (! empty($task['owner_id'])): ?>
<div class="task-board-avatars"> <div class="task-board-avatars">
<span <span
@@ -38,6 +18,26 @@
</div> </div>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['category_id'])): ?>
<div class="task-board-category-container">
<span class="task-board-category">
<?php if ($not_editable): ?>
<?= $this->text->e($task['category_name']) ?>
<?php else: ?>
<?= $this->url->link(
$this->text->e($task['category_name']),
'boardPopover',
'changeCategory',
array('task_id' => $task['id'], 'project_id' => $task['project_id']),
false,
'popover' . (! empty($task['category_description']) ? ' tooltip' : ''),
! empty($task['category_description']) ? $this->text->markdown($task['category_description']) : t('Change category')
) ?>
<?php endif ?>
</span>
</div>
<?php endif ?>
<div class="task-board-icons"> <div class="task-board-icons">
<?php if (! empty($task['date_due'])): ?> <?php if (! empty($task['date_due'])): ?>
<span class="task-board-date <?= time() > $task['date_due'] ? 'task-board-date-overdue' : '' ?>"> <span class="task-board-date <?= time() > $task['date_due'] ? 'task-board-date-overdue' : '' ?>">

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

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

@@ -63,11 +63,12 @@ div.task-board-status-closed {
/* category label */ /* category label */
.task-board-category-container { .task-board-category-container {
margin-top: 8px; text-align: right;
margin-bottom: 8px;
} }
.task-board-category { .task-board-category {
font-weight: bold; font-weight: 500;
color: #000; color: #000;
border: 1px solid #555; border: 1px solid #555;
padding: 1px 2px 1px 2px; padding: 1px 2px 1px 2px;
@@ -80,7 +81,7 @@ div.task-board-status-closed {
/* avatars on the card */ /* avatars on the card */
.task-board-avatars { .task-board-avatars {
text-align: right; margin-top: 5px;
} }
/* task icons footer */ /* task icons footer */