Improve activity stream layout

This commit is contained in:
Frederic Guillot 2016-03-19 16:22:00 -04:00
parent 84b4139988
commit 6351cb0e27
41 changed files with 96 additions and 106 deletions

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Utrošeno 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 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?',
'I want to receive notifications for:' => 'Želim dobijati obavještenja za:',
'All tasks' => 'Sve zadatke',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Verbrauchte 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 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)',
'I want to receive notifications for:' => 'Chci dostávat upozornění na:',
'All tasks' => 'Všechny úkoly',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
// 'I want to receive notifications for:' => '',
// 'All tasks' => '',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Verbrauchte 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 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)',
'I want to receive notifications for:' => 'Ich möchte Benachrichtigungen erhalten für:',
'All tasks' => 'Alle Aufgaben',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Ο χρόνος που πέρασε έχει αλλάξει: %sh',
'Time estimated changed: %sh' => 'Ο εκτιμώμενος χρόνος άλλαξε: %sh',
'The field "%s" have been updated' => 'Το πεδίο « %s » έχει ενημερωθεί',
'The description has been modified' => 'Η περιγραφή έχει ενημερωθεί',
'The description has been modified:' => 'Η περιγραφή έχει ενημερωθεί',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Σίγουρα θέλετε να κλείσετε την εργασία « %s » και την υπο-εργασία ?',
'I want to receive notifications for:' => 'Επιθυμώ να λαμβάνω ενημερώσεις για :',
'All tasks' => 'Όλες οι εργασίες',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Se ha cambiado el tiempo empleado: %sh',
'Time estimated changed: %sh' => 'Se ha cambiado el tiempo estimado: %sh',
'The field "%s" have been updated' => 'Se ha actualizado el campo "%s"',
'The description has been modified' => 'Se ha modificado la descripción',
'The description has been modified:' => 'Se ha modificado la descripción',
'Do you really want to close the task "%s" as well as all subtasks?' => '¿De verdad que quiere cerra la tarea "%s" así como todas las subtareas?',
'I want to receive notifications for:' => 'Deseo recibir notificaciones para:',
'All tasks' => 'Todas las tareas',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
// 'I want to receive notifications for:' => '',
// 'All tasks' => '',

View File

@ -732,7 +732,7 @@ return array(
'Time spent changed: %sh' => 'Le temps passé a été changé : %sh',
'Time estimated changed: %sh' => 'Le temps estimé a été changé : %sh',
'The field "%s" have been updated' => 'Le champ « %s » a été mis à jour',
'The description has been modified' => 'La description a été modifiée',
'The description has been modified:' => 'La description a été modifiée',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Voulez-vous vraiment fermer la tâche « %s » ainsi que toutes ses sous-tâches ?',
'I want to receive notifications for:' => 'Je veux reçevoir les notifications pour :',
'All tasks' => 'Toutes les Tâches',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
// 'I want to receive notifications for:' => '',
// 'All tasks' => '',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Waktu yang dihabiskan berubah : %sh',
'Time estimated changed: %sh' => 'Perkiraan waktu berubah : %sh',
'The field "%s" have been updated' => 'Field « %s » telah diperbaharui',
'The description has been modified' => 'Deskripsi telah dimodifikasi',
'The description has been modified:' => 'Deskripsi telah dimodifikasi',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Apakah anda yakin akan menutup tugas « %s » beserta semua sub-tugasnya ?',
'I want to receive notifications for:' => 'Saya ingin menerima pemberitahuan untuk :',
'All tasks' => 'Semua tugas',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Tempo trascorso modificato: %sh',
'Time estimated changed: %sh' => 'Tempo stimato modificato: %sh',
'The field "%s" have been updated' => 'Il campo %s è stato aggiornato',
'The description has been modified' => 'La descrizione è stata modificata',
'The description has been modified:' => 'La descrizione è stata modificata',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Vuoi veramente chiudere il task "%s" e i relativi sotto-task?',
'I want to receive notifications for:' => 'Voglio ricevere le notifiche per:',
'All tasks' => 'Tutti i task',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
// 'I want to receive notifications for:' => '',
// 'All tasks' => '',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Waktu yang dihabiskan berubah : %sh',
'Time estimated changed: %sh' => 'Perkiraan waktu berubah : %sh',
'The field "%s" have been updated' => 'Field « %s » telah diperbaharui',
'The description has been modified' => 'Deskripsi telah dimodifikasi',
'The description has been modified:' => 'Deskripsi telah dimodifikasi',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Apakah anda yakin akan menutup tugas « %s » beserta semua sub-tugasnya ?',
'I want to receive notifications for:' => 'Saya ingin menerima pemberitahuan untuk :',
'All tasks' => 'Semua tugas',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
'I want to receive notifications for:' => 'Jeg vil motta varslinger om:',
'All tasks' => 'Alle oppgaver',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
'I want to receive notifications for:' => 'Ik wil notificaties ontvangen voor:',
'All tasks' => 'Alle taken',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
'I want to receive notifications for:' => 'Wysyłaj powiadomienia dla:',
'All tasks' => 'Wszystkich zadań',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'O tempo despendido foi mudado: %sh',
'Time estimated changed: %sh' => 'O tempo estimado foi mudado/ %sh',
'The field "%s" have been updated' => 'O campo "%s" foi atualizada',
'The description has been modified' => 'A descrição foi modificada',
'The description has been modified:' => 'A descrição foi modificada',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Você realmente deseja finalizar a tarefa "%s" e todas as suas subtarefas?',
'I want to receive notifications for:' => 'Eu quero receber as notificações para:',
'All tasks' => 'Todas as tarefas',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'O tempo despendido foi mudado: %sh',
'Time estimated changed: %sh' => 'O tempo estimado foi mudado/ %sh',
'The field "%s" have been updated' => 'O campo "%s" foi actualizada',
'The description has been modified' => 'A descrição foi modificada',
'The description has been modified:' => 'A descrição foi modificada',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Tem a certeza que quer fechar a tarefa "%s" e todas as suas sub-tarefas?',
'I want to receive notifications for:' => 'Eu quero receber as notificações para:',
'All tasks' => 'Todas as tarefas',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Изменение количества затраченного времени: %sh',
'Time estimated changed: %sh' => 'Ожидаемый срок изменен: %sh',
'The field "%s" have been updated' => 'Поле "%s" ,было изменено',
'The description has been modified' => 'Описание было изменено',
'The description has been modified:' => 'Описание было изменено',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Вы действительно хотите закрыть задачу "%s", а также все подзадачи?',
'I want to receive notifications for:' => 'Я хочу получать уведомления для:',
'All tasks' => 'Все задачи',

View File

@ -730,7 +730,7 @@ return array(
// 'Time spent changed: %sh' => '',
// 'Time estimated changed: %sh' => '',
// 'The field "%s" have been updated' => '',
// 'The description has been modified' => '',
// 'The description has been modified:' => '',
// 'Do you really want to close the task "%s" as well as all subtasks?' => '',
// 'I want to receive notifications for:' => '',
// 'All tasks' => '',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Spenderad tid har ändrats: %sh',
'Time estimated changed: %sh' => 'Tidsuppskattning ändrad: %sh',
'The field "%s" have been updated' => 'Fältet "%s" har uppdaterats',
'The description has been modified' => 'Beskrivningen har modifierats',
'The description has been modified:' => 'Beskrivningen har modifierats',
'Do you really want to close the task "%s" as well as all subtasks?' => 'Vill du verkligen stänga uppgiften "%s" och alla deluppgifter?',
'I want to receive notifications for:' => 'Jag vill få notiser för:',
'All tasks' => 'Alla uppgifter',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'เวลาที่ใช้ในการเปลี่ยน: %s ชม.',
'Time estimated changed: %sh' => 'เวลาโดยประมาณในการเปลี่ยน: %s ชม.',
'The field "%s" have been updated' => 'ฟิลด์ "%s" ถูกปรับปรุง',
'The description has been modified' => 'คำอธิบายถูกแก้ไข',
'The description has been modified:' => 'คำอธิบายถูกแก้ไข',
'Do you really want to close the task "%s" as well as all subtasks?' => 'คุณต้องการปิดงาน "%s" เช่นเดียวกับงานย่อยทั้งหมด?',
'I want to receive notifications for:' => 'ฉันต้องการรับการแจ้งเตือนสำหรับ:',
'All tasks' => 'ทุกงาน',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => 'Harcanan zaman değiştirildi: %sh',
'Time estimated changed: %sh' => 'Tahmini süre değiştirildi: %sh',
'The field "%s" have been updated' => '"%s" hanesi değiştirildi',
'The description has been modified' => 'Açıklama değiştirildi',
'The description has been modified:' => 'Açıklama değiştirildi',
'Do you really want to close the task "%s" as well as all subtasks?' => '"%s" görevini ve tüm alt görevlerini kapatmak istediğinize emin misiniz?',
'I want to receive notifications for:' => 'Bununla ilgili bildirimler almak istiyorum:',
'All tasks' => 'Tüm görevler',

View File

@ -730,7 +730,7 @@ return array(
'Time spent changed: %sh' => '时间花费已变更:%sh',
'Time estimated changed: %sh' => '时间预估已变更:%sh',
'The field "%s" have been updated' => '"%s"字段已更新',
'The description has been modified' => '描述已更改',
'The description has been modified:' => '描述已更改',
'Do you really want to close the task "%s" as well as all subtasks?' => '你是否要移除所有子任务的同时父任务"%s"',
'I want to receive notifications for:' => '我想接收以下相关通知:',
'All tasks' => '所有任务',

View File

@ -3,8 +3,9 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<em><?= $this->text->e($task['title']) ?></em><br/>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<div class="markdown"><?= $this->text->markdown($comment['comment']) ?></div>
</div>
</div>

View File

@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<em><?= $this->text->e($task['title']) ?></em><br/>
</div>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -1,32 +1,19 @@
<?php if (empty($events)): ?>
<p class="alert"><?= t('There is no activity yet.') ?></p>
<?php else: ?>
<?php foreach ($events as $event): ?>
<div class="activity-event">
<p class="activity-datetime">
<?php if ($this->text->contains($event['event_name'], 'subtask')): ?>
<i class="fa fa-tasks"></i>
<?php elseif ($this->text->contains($event['event_name'], 'task.move')): ?>
<i class="fa fa-arrows-alt"></i>
<?php elseif ($this->text->contains($event['event_name'], 'task')): ?>
<i class="fa fa-newspaper-o"></i>
<?php elseif ($this->text->contains($event['event_name'], 'comment')): ?>
<i class="fa fa-comments-o"></i>
<?php endif ?>
&nbsp;<?= $this->dt->datetime($event['date_creation']) ?>
</p>
<div class="activity-content">
<?= $this->avatar->render(
$event['creator_id'],
$event['author_username'],
$event['author_name'],
$event['email']
) ?>
<?= $this->avatar->render(
$event['creator_id'],
$event['author_username'],
$event['author_name'],
$event['email']
) ?>
<div class="activity-content">
<?= $event['event_content'] ?>
</div>
</div>
<?php endforeach ?>
<?php endif ?>
<?php endif ?>

View File

@ -3,9 +3,10 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<p><em><?= $this->text->e($task['title']) ?></em></p>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<ul>
<li>

View File

@ -3,9 +3,10 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<div class="activity-description">
<p><em><?= $this->text->e($task['title']) ?></em></p>
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<ul>
<li>

View File

@ -10,7 +10,8 @@
<?php else: ?>
<?= e('%s remove the assignee of the task %s', $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>
<?php endif ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($file['name']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($file['name']) ?></p>
</div>

View File

@ -4,7 +4,8 @@
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
$this->text->e($task['column_title'])
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -5,7 +5,8 @@
$task['position'],
$this->text->e($task['column_title'])
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -11,7 +11,8 @@
$this->text->e($task['swimlane_name'])
) ?>
<?php endif ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -3,7 +3,8 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
</p>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
</div>

View File

@ -3,12 +3,13 @@
$this->text->e($author),
$this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))
) ?>
<span class="activity-date"><?= $this->dt->datetime($date_creation) ?></span>
</p>
<p class="activity-description">
<em><?= $this->text->e($task['title']) ?></em>
<div class="activity-description">
<p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
<?php if (isset($changes)): ?>
<div class="activity-changes">
<?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
</div>
<?php endif ?>
</p>
</div>

View File

@ -68,7 +68,7 @@
</ul>
<?php if (! empty($changes['description'])): ?>
<p><?= t('The description has been modified') ?></p>
<p><strong><?= t('The description has been modified:') ?></strong></p>
<div class="markdown"><?= $this->text->markdown($task['description']) ?></div>
<?php endif ?>
<?php endif ?>

File diff suppressed because one or more lines are too long

View File

@ -1,51 +1,41 @@
/* activity */
.activity-event {
margin-bottom: 20px;
margin-bottom: 15px;
padding: 10px;
}
.activity-datetime {
.activity-event:hover {
background: #fafafa;
}
.activity-date {
margin-left: 10px;
font-weight: normal;
color: #999;
font-size: 0.85em;
font-size: 0.8em;
}
.activity-content {
margin-top: 10px;
margin-left: 20px;
padding-left: 20px;
border-left: 2px solid #666;
margin-left: 55px;
}
.activity-title {
font-weight: bold;
color: #000;
border-bottom: 1px dotted #efefef;
}
.activity-description {
font-size: 0.9em;
color: #aaa;
padding-top: 5px;
}
.activity-description ul {
font-size: 0.95em;
color: #555;
margin-top: 10px;
}
.activity-description li {
margin-left: 40px;
list-style-type: circle;
color: #555;
}
.activity-description .markdown {
.activity-description ul {
margin-top: 10px;
color: #555;
}
.activity-changes {
margin-top: 10px;
font-size: 0.85em;
}
.activity-changes ul {
margin-left: 25px;
margin-left: 20px;
}