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

Improve card icons alignment on board

Browse Source
This commit is contained in:
Frederic Guillot
2017-02-11 14:29:44 -05:00
parent 49b3eeca2c
commit 28052edb22
7 changed files with 108 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -3,6 +3,7 @@ Version 1.0.39 (unreleased)
Improvements: Improvements:
* Improve card icons alignment on board
* Adjust modal dialog width on mobile devices * Adjust modal dialog width on mobile devices
* Add priority column in list view * Add priority column in list view
* Change wording for project status (use "closed" instead of "inactive") * Change wording for project status (use "closed" instead of "inactive")

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

@@ -29,84 +29,95 @@
<?php endif ?> <?php endif ?>
<div class="task-board-icons"> <div class="task-board-icons">
<?php if ($task['score']): ?> <div class="task-board-icons-row">
<span class="task-score" title="<?= t('Complexity') ?>"> <?php if ($task['reference']): ?>
<i class="fa fa-trophy"></i> <span class="task-board-reference" title="<?= t('Reference') ?>">
<?= $this->text->e($task['score']) ?> <?= $this->text->e($task['reference']) ?>
</span> </span>
<?php endif ?> <?php endif ?>
</div>
<?php if (! empty($task['date_due'])): ?> <div class="task-board-icons-row">
<?php if (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?> <?php if ($task['is_milestone'] == 1): ?>
<span class="task-board-date task-board-date-today"> <span title="<?= t('Milestone') ?>">
<?php elseif (time() > $task['date_due']): ?> <i class="fa fa-flag flag-milestone"></i>
<span class="task-board-date task-board-date-overdue"> </span>
<?php else: ?>
<span class="task-board-date">
<?php endif ?> <?php endif ?>
<i class="fa fa-calendar"></i>
<?= $this->dt->date($task['date_due']) ?>
</span>
<?php endif ?>
<?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PENDING): ?> <?php if ($task['score']): ?>
<span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span> <span class="task-score" title="<?= t('Complexity') ?>">
<?php endif ?> <i class="fa fa-trophy"></i>
<?= $this->text->e($task['score']) ?>
</span>
<?php endif ?>
<?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?> <?php if (! empty($task['time_estimated']) || ! empty($task['time_spent'])): ?>
<span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span> <span class="task-time-estimated" title="<?= t('Time spent and estimated') ?>">
<?php endif ?> <?= $this->text->e($task['time_spent']) ?>/<?= $this->text->e($task['time_estimated']) ?>h
</span>
<?php endif ?>
<?php if (! empty($task['nb_links'])): ?> <?php if (! empty($task['date_due'])): ?>
<span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span> <span class="task-board-date
<?php endif ?> <?php if (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?>
task-board-date-today
<?php elseif (time() > $task['date_due']): ?>
task-board-date-overdue
<?php endif ?>
">
<i class="fa fa-calendar"></i>
<?= $this->dt->date($task['date_due']) ?>
</span>
<?php endif ?>
</div>
<div class="task-board-icons-row">
<?php if (! empty($task['nb_external_links'])): ?> <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PENDING): ?>
<span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span> <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['nb_subtasks'])): ?> <?php if ($task['recurrence_status'] == \Kanboard\Model\TaskModel::RECURRING_STATUS_PROCESSED): ?>
<span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span> <span title="<?= t('Recurrence') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['nb_files'])): ?> <?php if (! empty($task['nb_links'])): ?>
<span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span> <span title="<?= t('Links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork fa-fw"></i><?= $task['nb_links'] ?></span>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['nb_comments'])): ?> <?php if (! empty($task['nb_external_links'])): ?>
<span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span> <span title="<?= t('External links') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'externallinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-external-link fa-fw"></i><?= $task['nb_external_links'] ?></span>
<?php endif ?> <?php endif ?>
<?php if (! empty($task['description'])): ?> <?php if (! empty($task['nb_subtasks'])): ?>
<span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"> <span title="<?= t('Sub-Tasks') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-bars"></i>&nbsp;<?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?></span>
<i class="fa fa-file-text-o"></i> <?php endif ?>
</span>
<?php endif ?>
<?php if (! empty($task['time_estimated']) || ! empty($task['time_spent'])): ?> <?php if (! empty($task['nb_files'])): ?>
<span class="task-time-estimated" title="<?= t('Time spent and estimated') ?>"> <span title="<?= t('Attachments') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-paperclip"></i>&nbsp;<?= $task['nb_files'] ?></span>
<?= $this->text->e($task['time_spent']) ?>/<?= $this->text->e($task['time_estimated']) ?>h <?php endif ?>
</span>
<?php endif ?>
<?php if ($task['is_milestone'] == 1): ?> <?php if (! empty($task['nb_comments'])): ?>
<span title="<?= t('Milestone') ?>"> <span title="<?= $task['nb_comments'] == 1 ? t('%d comment', $task['nb_comments']) : t('%d comments', $task['nb_comments']) ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-comment-o"></i>&nbsp;<?= $task['nb_comments'] ?></span>
<i class="fa fa-flag flag-milestone"></i> <?php endif ?>
</span>
<?php endif ?>
<?= $this->hook->render('template:board:task:icons', array('task' => $task)) ?> <?php if (! empty($task['description'])): ?>
<span title="<?= t('Description') ?>" class="tooltip" data-href="<?= $this->url->href('BoardTooltipController', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<i class="fa fa-file-text-o"></i>
</span>
<?php endif ?>
<?= $this->task->formatPriority($project, $task) ?> <?php if ($task['is_active'] == 1): ?>
<div class="task-board-age">
<span title="<?= t('Task age in days')?>" class="task-board-age-total"><?= $this->dt->age($task['date_creation']) ?></span>
<span title="<?= t('Days in this column')?>" class="task-board-age-column"><?= $this->dt->age($task['date_moved']) ?></span>
</div>
<?php else: ?>
<span class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></span>
<?php endif ?>
<?php if ($task['is_active'] == 1): ?> <?= $this->task->formatPriority($project, $task) ?>
<div class="task-board-age">
<span title="<?= t('Task age in days')?>" class="task-board-age-total"><?= $this->dt->age($task['date_creation']) ?></span> <?= $this->hook->render('template:board:task:icons', array('task' => $task)) ?>
<span title="<?= t('Days in this column')?>" class="task-board-age-column"><?= $this->dt->age($task['date_moved']) ?></span> </div>
</div>
<?php else: ?>
<span class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></span>
<?php endif ?>
</div> </div>
<?= $this->hook->render('template:board:task:footer', array('task' => $task)) ?> <?= $this->hook->render('template:board:task:footer', array('task' => $task)) ?>

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

@@ -32,20 +32,21 @@
</div> </div>
<?php else: ?> <?php else: ?>
<div class="task-board-expanded"> <div class="task-board-expanded">
<div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse fa-2x"></i></div> <div class="task-board-header">
<?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?> <?php if ($this->user->hasProjectAccess('TaskModificationController', 'edit', $task['project_id'])): ?>
<?= $this->render('task/dropdown', array('task' => $task)) ?> <?= $this->render('task/dropdown', array('task' => $task)) ?>
<?php else: ?> <?php else: ?>
<strong><?= '#'.$task['id'] ?></strong> <strong><?= '#'.$task['id'] ?></strong>
<?php endif ?> <?php endif ?>
<?php if ($task['reference']): ?> <?php if (! empty($task['owner_id'])): ?>
<span class="task-board-reference" title="<?= t('Reference') ?>"> <span class="task-board-assignee">
(<?= $task['reference'] ?>) <?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
</span> </span>
<?php endif ?> <?php endif ?>
<?= $this->render('board/task_avatar', array('task' => $task)) ?> <?= $this->render('board/task_avatar', array('task' => $task)) ?>
</div>
<?= $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"> <div class="task-board-title">
@@ -53,6 +54,8 @@
</div> </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)) ?>
<div class="task-board-saving-icon" style="display: none;"><i class="fa fa-spinner fa-pulse fa-2x"></i></div>
<?= $this->render('board/task_footer', array( <?= $this->render('board/task_footer', array(
'task' => $task, 'task' => $task,
'not_editable' => $not_editable, 'not_editable' => $not_editable,

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

@@ -1,14 +1,15 @@
<div class="task-board color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>"> <div class="task-board color-<?= $task['color_id'] ?> <?= $task['date_modification'] > time() - $board_highlight_period ? 'task-board-recent' : '' ?>">
<div class="task-board-header">
<?= $this->url->link('#'.$task['id'], 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
<?= $this->url->link('#'.$task['id'], 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> <?php if (! empty($task['owner_id'])): ?>
<span class="task-board-assignee">
<?= $this->text->e($task['assignee_name'] ?: $task['assignee_username']) ?>
</span>
<?php endif ?>
<?php if ($task['reference']): ?> <?= $this->render('board/task_avatar', array('task' => $task)) ?>
<span class="task-board-reference" title="<?= t('Reference') ?>"> </div>
(<?= $task['reference'] ?>)
</span>
<?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"> <div class="task-board-title">

2
assets/css/app.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
assets/sass/_task_board.sass
View File

@@ -7,6 +7,7 @@
padding: 2px padding: 2px
word-wrap: break-word word-wrap: break-word
font-size: size('compact') font-size: size('compact')
border-radius: 6px
div div
&.task-board-recent &.task-board-recent
@@ -21,8 +22,6 @@ div
text-decoration: none text-decoration: none
.dropdown-menu .dropdown-menu
font-weight: bold font-weight: bold
.task-score
font-weight: bold
.task-board-collapsed .task-board-collapsed
overflow: hidden overflow: hidden

9
assets/sass/_task_board_icons.sass
View File

@@ -2,16 +2,19 @@
.task-board-icons .task-board-icons
font-size: size('small') font-size: size('small')
margin-top: 7px
text-align: right text-align: right
margin-top: 4px
margin-bottom: 2px
a a
opacity: 0.5 opacity: 0.5
span span
opacity: 0.5 opacity: 0.5
margin-left: 2px margin-left: 4px
a:hover, span:hover a:hover, span:hover
opacity: 1.0 opacity: 1.0
.task-board-icons-row
line-height: 22px
.task-score
font-weight: 500
.flag-milestone .flag-milestone
color: green color: green