summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-03-19 16:22:00 -0400
committerFrederic Guillot <fred@kanboard.net>2016-03-19 16:22:00 -0400
commit6351cb0e27eea05a2b0a8063b8b0df0abc49896d (patch)
tree18359aa87b4dfc4ea437d26d6f67a5c7d7f23efe /app
parent84b4139988dfdcb48fc0729429a34c11f46fe08e (diff)
Improve activity stream layout
Diffstat (limited to 'app')
-rw-r--r--app/Locale/bs_BA/translations.php2
-rw-r--r--app/Locale/cs_CZ/translations.php2
-rw-r--r--app/Locale/da_DK/translations.php2
-rw-r--r--app/Locale/de_DE/translations.php2
-rw-r--r--app/Locale/el_GR/translations.php2
-rw-r--r--app/Locale/es_ES/translations.php2
-rw-r--r--app/Locale/fi_FI/translations.php2
-rw-r--r--app/Locale/fr_FR/translations.php2
-rw-r--r--app/Locale/hu_HU/translations.php2
-rw-r--r--app/Locale/id_ID/translations.php2
-rw-r--r--app/Locale/it_IT/translations.php2
-rw-r--r--app/Locale/ja_JP/translations.php2
-rw-r--r--app/Locale/my_MY/translations.php2
-rw-r--r--app/Locale/nb_NO/translations.php2
-rw-r--r--app/Locale/nl_NL/translations.php2
-rw-r--r--app/Locale/pl_PL/translations.php2
-rw-r--r--app/Locale/pt_BR/translations.php2
-rw-r--r--app/Locale/pt_PT/translations.php2
-rw-r--r--app/Locale/ru_RU/translations.php2
-rw-r--r--app/Locale/sr_Latn_RS/translations.php2
-rw-r--r--app/Locale/sv_SE/translations.php2
-rw-r--r--app/Locale/th_TH/translations.php2
-rw-r--r--app/Locale/tr_TR/translations.php2
-rw-r--r--app/Locale/zh_CN/translations.php2
-rw-r--r--app/Template/event/comment_create.php5
-rw-r--r--app/Template/event/comment_update.php5
-rw-r--r--app/Template/event/events.php29
-rw-r--r--app/Template/event/subtask_create.php3
-rw-r--r--app/Template/event/subtask_update.php3
-rw-r--r--app/Template/event/task_assignee_change.php7
-rw-r--r--app/Template/event/task_close.php7
-rw-r--r--app/Template/event/task_create.php7
-rw-r--r--app/Template/event/task_file_create.php7
-rw-r--r--app/Template/event/task_move_column.php7
-rw-r--r--app/Template/event/task_move_position.php7
-rw-r--r--app/Template/event/task_move_swimlane.php7
-rw-r--r--app/Template/event/task_open.php7
-rw-r--r--app/Template/event/task_update.php7
-rw-r--r--app/Template/task/changes.php2
39 files changed, 79 insertions, 79 deletions
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index a3847755..8cd774a1 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -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',
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index 8c808967..6aa433ee 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -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',
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index 5a5606af..8e686ee4 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -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' => '',
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index b69d247d..9b26eaba 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -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',
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 00ae2200..1f58fb69 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -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' => 'Όλες οι εργασίες',
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 6e51ed04..c0dd268a 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -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',
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index b0d1c9e1..48b6d659 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -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' => '',
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 1755f990..43e8bc53 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -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',
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 2eb1372d..53e8ace5 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -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' => '',
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index dbbf4db5..b4b8dcd4 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -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',
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index afde8265..bba629cb 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -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',
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 77dbeaed..e4b41c93 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -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' => '',
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index 8eac45be..fc1447e9 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -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',
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index fba22ffe..003ca856 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -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',
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 67546e17..4fce1c33 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -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',
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 747cd2c8..87201bd0 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -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ń',
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 62063891..2c9412b6 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -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',
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 7cd266bc..31a56882 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -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',
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 780d54b3..989317a7 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -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' => 'Все задачи',
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 45098222..e63a106c 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -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' => '',
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 39cd25be..26952355 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -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',
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 36dd641c..12f374b6 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -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' => 'ทุกงาน',
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index d1c1b6d3..2dc611e4 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -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',
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 816269b2..dadedc5b 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -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' => '所有任务',
diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index 43c521cf..9869c94b 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -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> \ No newline at end of file
+</div>
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php
index 80a33031..19420cf9 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -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> \ No newline at end of file
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index 6bef8df4..ef651321 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -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 ?> \ No newline at end of file
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index ae6ddd44..7e41d5c9 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -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>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index 1d560fb0..9fea4fe8 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -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>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index 6964a50e..db78e7df 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div> \ No newline at end of file
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index 2ba77156..04157b0d 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 21facc9e..6e26cdb8 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php
index 837f5dc0..0d8e545d 100644
--- a/app/Template/event/task_file_create.php
+++ b/app/Template/event/task_file_create.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($file['name']) ?></p>
+</div>
diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php
index b9ae65cc..0a78bca7 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php
index dbe73f4b..eeadfa02 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php
index b0635a06..a190bc0a 100644
--- a/app/Template/event/task_move_swimlane.php
+++ b/app/Template/event/task_move_swimlane.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index ce92bb18..d9cd90b3 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -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> \ No newline at end of file
+<div class="activity-description">
+ <p class="activity-task-title"><?= $this->text->e($task['title']) ?></p>
+</div>
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index 83f1661b..07b94ff8 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -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> \ No newline at end of file
+</div>
diff --git a/app/Template/task/changes.php b/app/Template/task/changes.php
index 779bdfa9..9d36f09f 100644
--- a/app/Template/task/changes.php
+++ b/app/Template/task/changes.php
@@ -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 ?> \ No newline at end of file