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

Move function to the right place (pull-request) and improve board task icons

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-14 18:55:55 -05:00
parent 8c8692cd4d
commit 23346d5e76
19 changed files with 173 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Core/Helper.php
View File

@@ -49,6 +49,33 @@ class Helper
return $this->container[$name];
}
/**
* Get the age of an item in quasi human readable format.
* It's in this format: <1h , NNh, NNd
*
* @access public
* @param integer $timestamp Unix timestamp of the artifact for which age will be calculated
* @param integer $now Compare with this timestamp (Default value is the current unix timestamp)
* @return string
*/
public function getTaskAge($timestamp, $now = null)
{
if ($now === null) {
$now = time();
}
$diff = $now - $timestamp;
if ($diff < 3600) {
return t('<1h');
}
else if ($diff < 86400) {
return t('%dh', $diff / 3600);
}
return t('%dd', ($now - $timestamp) / 86400);
}
/**
* Proxy cache helper for acl::isManagerActionAllowed()
*

3
app/Locale/da_DK/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/de_DE/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/es_ES/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/fi_FI/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/fr_FR/translations.php
View File

@@ -721,4 +721,7 @@ return array(
'fixes' => 'corrige',
'is fixed by' => 'est corrigée par',
'This task' => 'Cette tâche',
'<1h' => '<1h',
'%dh' => '%dh',
'%b %e' => '%e %b',
);

3
app/Locale/hu_HU/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/it_IT/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/ja_JP/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/pl_PL/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/pt_BR/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/ru_RU/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/sv_SE/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/th_TH/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

3
app/Locale/zh_CN/translations.php
View File

@@ -719,4 +719,7 @@ return array(
// 'fixes' => '',
// 'is fixed by' => '',
// 'This task' => '',
// '<1h' => '',
// '%dh' => '',
// '%b %e' => '',
);

66
app/Template/board/task.php
View File

@@ -20,10 +20,6 @@
<?php endif ?>
</span>
<?php if ($task['score']): ?>
<span class="task-score"><?= $this->e($task['score']) ?></span>
<?php endif ?>
<div class="task-board-title">
<?= $this->a($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
</div>
@@ -59,7 +55,7 @@
<span class="task-board-user <?= $this->userSession->isCurrentUser($task['owner_id']) ? 'task-board-current-user' : '' ?>">
<?= $this->a(
(! empty($task['owner_id']) ? t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) : t('Nobody assigned')),
(! empty($task['owner_id']) ? ($task['assignee_name'] ?: $task['assignee_username']) : t('Nobody assigned')),
'board',
'changeAssignee',
array('task_id' => $task['id'], 'project_id' => $task['project_id']),
@@ -68,13 +64,9 @@
t('Change assignee')
) ?>
</span>
<span title="<?= t('Task age in days')?>" class="task-days-age"><?= getAgeShort ($task['date_creation']) ?></span>
<span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= getAgeShort ($task['date_moved']) ?></span>
<?php if ($task['score']): ?>
<span class="task-score"><?= $this->e($task['score']) ?></span>
<?php endif ?>
<span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->getTaskAge($task['date_creation']) ?></span>
<span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->getTaskAge($task['date_moved']) ?></span>
<div class="task-board-title">
<?= $this->a($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
@@ -99,40 +91,34 @@
</div>
<?php endif ?>
<?php if (! empty($task['date_due']) || ! empty($task['nb_files']) || ! empty($task['nb_comments']) || ! empty($task['description']) || ! empty($task['nb_subtasks']) || ! empty($task['nb_links'])): ?>
<div class="task-board-footer">
<div class="task-board-icons">
<?php if (! empty($task['date_due'])): ?>
<div class="task-board-date <?= time() > $task['date_due'] ? 'task-board-date-overdue' : '' ?>">
<i class="fa fa-calendar"></i>&nbsp;<?= dt('%b %e, %Y', $task['date_due']) ?>
</div>
<span class="task-board-date <?= time() > $task['date_due'] ? 'task-board-date-overdue' : '' ?>">
<i class="fa fa-calendar"></i>&nbsp;<?= dt('%b %e', $task['date_due']) ?>
</span>
<?php endif ?>
<div class="task-board-icons">
<?php if (! empty($task['nb_links'])): ?>
<span title="<?= t('Links') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $task['nb_links'] ?> <i class="fa fa-code-fork"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_subtasks'])): ?>
<span title="<?= t('Sub-Tasks') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?> <i class="fa fa-bars"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_links'])): ?>
<span title="<?= t('Links') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $task['nb_links'] ?> <i class="fa fa-code-fork"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_files'])): ?>
<span title="<?= t('Attachments') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $task['nb_files'] ?> <i class="fa fa-paperclip"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_subtasks'])): ?>
<span title="<?= t('Sub-Tasks') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'subtasks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= round($task['nb_completed_subtasks']/$task['nb_subtasks']*100, 0).'%' ?> <i class="fa fa-bars"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_comments'])): ?>
<span title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $task['nb_comments'] ?> <i class="fa fa-comment-o"></i></span>
<?php endif ?>
<?php if (! empty($task['nb_files'])): ?>
<span title="<?= t('Attachments') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'attachments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $task['nb_files'] ?> <i class="fa fa-paperclip"></i></span>
<?php endif ?>
<?php if (! empty($task['description'])): ?>
<span title="<?= t('Description') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<i class="fa fa-file-text-o"></i>
</span>
<?php endif ?>
</div>
<?php if (! empty($task['nb_comments'])): ?>
<span title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'comments', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $task['nb_comments'] ?> <i class="fa fa-comment-o"></i></span>
<?php endif ?>
<?php if (! empty($task['description'])): ?>
<span title="<?= t('Description') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
<i class="fa fa-file-text-o"></i>
</span>
<?php endif ?>
</div>
<?php endif ?>
</div>

26
app/functions.php
View File

@@ -63,31 +63,9 @@ function dt($format, $timestamp)
* @todo Improve this function
* @return mixed
*/
function p($value, $t1, $t2) {
function p($value, $t1, $t2)
{
return $value > 1 ? $t2 : $t1;
}
/**
* Get the age of an item in quasi human readable format.
* It's in this format: <1h , NNh, NNd
*
* @access public
* @param int $time
* Unix timestamp of the artifact for which age will be calculated
* @param int $currenttime
* Comepare with timestamp. Default current unix timestamp
* @return string
*/
function getAgeShort($time, $currenttime = NULL) {
if (! $currenttime) {
$currenttime = time ();
}
$diff = $currenttime - $time;
if ($diff < 3600)
return "<1h";
elseif ($diff < 86400) {
return intval ( ($diff / 3600) ) . "h";
}
return intval ( ((floor ( $currenttime ) - floor ( $time )) / 86400) ) . "d";
}