Improve board tooltips

This commit is contained in:
Frederic Guillot
2016-03-19 16:51:25 -04:00
parent 6351cb0e27
commit caf8cb3323
15 changed files with 108 additions and 108 deletions

View File

@@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Utrošeno vrijeme je promijenjeno: %sh', 'Time spent changed: %sh' => 'Utrošeno vrijeme je promijenjeno: %sh',
'Time estimated changed: %sh' => 'Očekivano vrijeme je promijenjeno: %sh', 'Time estimated changed: %sh' => 'Očekivano vrijeme je promijenjeno: %sh',
'The field "%s" have been updated' => 'Polje "%s" je ažurirano', 'The field "%s" have been updated' => 'Polje "%s" je ažurirano',
'The description has been modified:' => 'Promijenjen opis', 'The description has been modified:' => 'Promijenjen opis:',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Da li zaista želiš zatvoriti zadatak "%s" kao i sve pod-zadatke?', 'Do you really want to close the task "%s" as well as all subtasks?' => 'Da li zaista želiš zatvoriti zadatak "%s" kao i sve pod-zadatke?',
'I want to receive notifications for:' => 'Želim dobijati obavještenja za:', 'I want to receive notifications for:' => 'Želim dobijati obavještenja za:',
'All tasks' => 'Sve zadatke', 'All tasks' => 'Sve zadatke',

View File

@@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Verbrauchte Zeit geändert: %sh', 'Time spent changed: %sh' => 'Verbrauchte Zeit geändert: %sh',
'Time estimated changed: %sh' => 'Geschätzte Zeit geändert: %sh', 'Time estimated changed: %sh' => 'Geschätzte Zeit geändert: %sh',
'The field "%s" have been updated' => 'Das Feld "%s" wurde verändert', 'The field "%s" have been updated' => 'Das Feld "%s" wurde verändert',
'The description has been modified:' => 'Die Beschreibung wurde geändert', 'The description has been modified:' => 'Die Beschreibung wurde geändert:',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Soll die Aufgabe "%s" wirklich geschlossen werden? (einschließlich Teilaufgaben)', 'Do you really want to close the task "%s" as well as all subtasks?' => 'Soll die Aufgabe "%s" wirklich geschlossen werden? (einschließlich Teilaufgaben)',
'I want to receive notifications for:' => 'Chci dostávat upozornění na:', 'I want to receive notifications for:' => 'Chci dostávat upozornění na:',
'All tasks' => 'Všechny úkoly', 'All tasks' => 'Všechny úkoly',

View File

@@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Verbrauchte Zeit geändert: %sh', 'Time spent changed: %sh' => 'Verbrauchte Zeit geändert: %sh',
'Time estimated changed: %sh' => 'Geschätzte Zeit geändert: %sh', 'Time estimated changed: %sh' => 'Geschätzte Zeit geändert: %sh',
'The field "%s" have been updated' => 'Das Feld "%s" wurde verändert', 'The field "%s" have been updated' => 'Das Feld "%s" wurde verändert',
'The description has been modified:' => 'Die Beschreibung wurde geändert', 'The description has been modified:' => 'Die Beschreibung wurde geändert:',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Soll die Aufgabe "%s" wirklich geschlossen werden? (einschließlich Teilaufgaben)', 'Do you really want to close the task "%s" as well as all subtasks?' => 'Soll die Aufgabe "%s" wirklich geschlossen werden? (einschließlich Teilaufgaben)',
'I want to receive notifications for:' => 'Ich möchte Benachrichtigungen erhalten für:', 'I want to receive notifications for:' => 'Ich möchte Benachrichtigungen erhalten für:',
'All tasks' => 'Alle Aufgaben', 'All tasks' => 'Alle Aufgaben',

View File

@@ -39,6 +39,13 @@
<?php endif ?> <?php endif ?>
<div class="task-board-icons"> <div class="task-board-icons">
<?php if ($task['score']): ?>
<span class="task-score" title="<?= t('Complexity') ?>">
<i class="fa fa-trophy"></i>
<?= $this->text->e($task['score']) ?>
</span>
<?php endif ?>
<?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' : '' ?>">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
@@ -80,10 +87,6 @@
</span> </span>
<?php endif ?> <?php endif ?>
<?php if ($task['score']): ?>
<span class="task-score"><?= $this->text->e($task['score']) ?></span>
<?php endif ?>
<?php if (! empty($task['time_estimated'])): ?> <?php if (! empty($task['time_estimated'])): ?>
<span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->text->e($task['time_estimated']).'h' ?></span> <span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->text->e($task['time_estimated']).'h' ?></span>
<?php endif ?> <?php endif ?>

View File

@@ -1,4 +1,4 @@
<div class="comment-tooltip"> <div class="tooltip-large">
<?php foreach ($comments as $comment): ?> <?php foreach ($comments as $comment): ?>
<?= $this->render('comment/show', array( <?= $this->render('comment/show', array(
'comment' => $comment, 'comment' => $comment,

View File

@@ -1,20 +1,22 @@
<table class="table-striped table-small"> <div class="tooltip-large">
<tr> <table>
<th class="column-20"><?= t('Type') ?></th>
<th class="column-80"><?= t('Title') ?></th>
<th class="column-10"><?= t('Dependency') ?></th>
</tr>
<?php foreach ($links as $link): ?>
<tr> <tr>
<td> <th class="column-20"><?= t('Type') ?></th>
<?= $link['type'] ?> <th class="column-70"><?= t('Title') ?></th>
</td> <th class="column-10"><?= t('Dependency') ?></th>
<td>
<a href="<?= $link['url'] ?>" target="_blank"><?= $this->text->e($link['title']) ?></a>
</td>
<td>
<?= $this->text->e($link['dependency_label']) ?>
</td>
</tr> </tr>
<?php endforeach ?> <?php foreach ($links as $link): ?>
</table> <tr>
<td>
<?= $link['type'] ?>
</td>
<td>
<a href="<?= $link['url'] ?>" target="_blank"><?= $this->text->e($link['title']) ?></a>
</td>
<td>
<?= $this->text->e($link['dependency_label']) ?>
</td>
</tr>
<?php endforeach ?>
</table>
</div>

View File

@@ -1,18 +1,20 @@
<table class="table-small"> <div class="tooltip-large">
<?php foreach ($files as $file): ?> <table>
<tr> <?php foreach ($files as $file): ?>
<th> <tr>
<i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i> <th>
<?= $this->text->e($file['name']) ?> <i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i>
</th> <?= $this->text->e($file['name']) ?>
</tr> </th>
<tr> </tr>
<td> <tr>
<i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> <td>
<?php if ($file['is_image'] == 1): ?> <i class="fa fa-download fa-fw"></i><?= $this->url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
&nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> <?php if ($file['is_image'] == 1): ?>
<?php endif ?> &nbsp;<i class="fa fa-eye"></i> <?= $this->url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?>
</td> <?php endif ?>
</tr> </td>
<?php endforeach ?> </tr>
</table> <?php endforeach ?>
</table>
</div>

View File

@@ -1,14 +1,22 @@
<table class="table-stripped"> <div class="tooltip-large">
<?php foreach ($subtasks as $subtask): ?> <table>
<tr> <tr>
<td class="column-80"> <th class="column-80"><?= t('Subtask') ?></th>
<?= $this->subtask->toggleStatus($subtask, $task['project_id']) ?> <th><?= t('Assignee') ?></th>
</td> </tr>
<td> <?php foreach ($subtasks as $subtask): ?>
<?php if (! empty($subtask['username'])): ?> <tr>
<td>
<?= $this->subtask->toggleStatus($subtask, $task['project_id']) ?>
</td>
<td>
<?php if (! empty($subtask['username'])): ?>
<?= $this->text->e($subtask['name'] ?: $subtask['username']) ?> <?= $this->text->e($subtask['name'] ?: $subtask['username']) ?>
<?php endif ?> <?php else: ?>
</td> <?= t('Not assigned') ?>
</tr> <?php endif ?>
<?php endforeach ?> </td>
</table> </tr>
<?php endforeach ?>
</table>
</div>

View File

@@ -1,24 +1,34 @@
<div class="tooltip-tasklinks"> <div class="tooltip-large">
<dl> <table>
<?php foreach ($links as $label => $grouped_links): ?> <?php foreach ($links as $label => $grouped_links): ?>
<dt><strong><?= t($label) ?></strong></dt> <tr>
<th colspan="4"><?= t($label) ?></th>
</tr>
<?php foreach ($grouped_links as $link): ?> <?php foreach ($grouped_links as $link): ?>
<dd> <tr>
<span class="progress"><?= $this->task->getProgress($link).'%' ?></span> <td class="column-10">
<?= $this->url->link( <?= $this->task->getProgress($link).'%' ?>
$this->text->e('#'.$link['task_id'].' '.$link['title']), </td>
'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), <td class="column-60">
false, <?= $this->url->link(
$link['is_active'] ? '' : 'task-link-closed' $this->text->e('#'.$link['task_id'].' '.$link['title']),
) ?> 'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']),
<?php if (! empty($link['task_assignee_username'])): ?> false,
[<?= $this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>] $link['is_active'] ? '' : 'task-link-closed'
<?php endif ?> ) ?>
<?php if ($task['project_id'] != $link['project_id']): ?> </td>
(<i><?= $link['project_name'] ?></i>) <td>
<?php endif ?> <?php if (! empty($link['task_assignee_username'])): ?>
</dd> <?= $this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>
<?php else: ?>
<?= t('Not assigned') ?>
<?php endif ?>
</td>
<td>
<?= $link['project_name'] ?>
</td>
</tr>
<?php endforeach ?> <?php endforeach ?>
<?php endforeach ?> <?php endforeach ?>
</dl> </table>
</div> </div>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -80,8 +80,3 @@
height: 80px; height: 80px;
width: 500px; width: 500px;
} }
/* comment board tooltip */
.comment-tooltip {
min-width: 550px;
}

View File

@@ -126,6 +126,10 @@ th a:hover {
width: 70%; width: 70%;
} }
.column-80 {
width: 70%;
}
.draggable-row-handle { .draggable-row-handle {
cursor: move; cursor: move;
color: #dedede; color: #dedede;

View File

@@ -119,7 +119,6 @@ span.task-board-date-overdue {
/* task score */ /* task score */
.task-board .task-score { .task-board .task-score {
font-weight: bold; font-weight: bold;
font-size: 1.1em;
} }
/* task age */ /* task age */

View File

@@ -61,7 +61,7 @@ div.ui-tooltip {
} }
.tooltip-large { .tooltip-large {
width: 550px; width: 600px;
} }
.ui-tooltip-content .markdown p { .ui-tooltip-content .markdown p {
@@ -72,26 +72,3 @@ div.ui-tooltip {
color: #999; color: #999;
font-size: 0.95em; font-size: 0.95em;
} }
.ui-tooltip ul {
margin-left: 20px;
}
.ui-tooltip dl {
margin: -5px 0 0 0;
padding: 0;
}
.ui-tooltip dt {
margin-top: 5px;
}
.ui-tooltip dd {
margin-left: 0;
}
.ui-tooltip .progress {
display: inline-block;
min-width: 3em;
text-align: right;
}