From caf8cb3323e4ef9af2f76b639785d083540d4687 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 19 Mar 2016 16:51:25 -0400 Subject: Improve board tooltips --- app/Locale/bs_BA/translations.php | 2 +- app/Locale/cs_CZ/translations.php | 2 +- app/Locale/de_DE/translations.php | 2 +- app/Template/board/task_footer.php | 11 +++--- app/Template/board/tooltip_comments.php | 2 +- app/Template/board/tooltip_external_links.php | 38 +++++++++++---------- app/Template/board/tooltip_files.php | 38 +++++++++++---------- app/Template/board/tooltip_subtasks.php | 34 +++++++++++-------- app/Template/board/tooltip_tasklinks.php | 48 ++++++++++++++++----------- assets/css/app.css | 2 +- assets/css/print.css | 2 +- assets/css/src/comment.css | 5 --- assets/css/src/table.css | 4 +++ assets/css/src/task.css | 1 - assets/css/src/tooltip.css | 25 +------------- 15 files changed, 108 insertions(+), 108 deletions(-) diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index 8cd774a1..c9abcd08 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 6aa433ee..08836dec 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/de_DE/translations.php b/app/Locale/de_DE/translations.php index 9b26eaba..cc6028fd 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/Template/board/task_footer.php b/app/Template/board/task_footer.php index 7d651a79..b20e4a3e 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -39,6 +39,13 @@
+ + + + text->e($task['score']) ?> + + + @@ -80,10 +87,6 @@ - - text->e($task['score']) ?> - - text->e($task['time_estimated']).'h' ?> diff --git a/app/Template/board/tooltip_comments.php b/app/Template/board/tooltip_comments.php index 1db07356..a1071848 100644 --- a/app/Template/board/tooltip_comments.php +++ b/app/Template/board/tooltip_comments.php @@ -1,4 +1,4 @@ -
+
render('comment/show', array( 'comment' => $comment, diff --git a/app/Template/board/tooltip_external_links.php b/app/Template/board/tooltip_external_links.php index 24cd1d88..65331864 100644 --- a/app/Template/board/tooltip_external_links.php +++ b/app/Template/board/tooltip_external_links.php @@ -1,20 +1,22 @@ - - - - - - - +
+
- - - + + + - -
- - - text->e($link['title']) ?> - - text->e($link['dependency_label']) ?> -
\ No newline at end of file + + + + + + + text->e($link['title']) ?> + + + text->e($link['dependency_label']) ?> + + + + +
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php index 8ee18626..5ade5b5b 100644 --- a/app/Template/board/tooltip_files.php +++ b/app/Template/board/tooltip_files.php @@ -1,18 +1,20 @@ - - - - - - - - - -
- - text->e($file['name']) ?> -
- url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> - -   url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> - -
\ No newline at end of file +
+ + + + + + + + + +
+ + text->e($file['name']) ?> +
+ url->link(t('download'), 'FileViewer', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + +   url->link(t('open file'), 'FileViewer', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id']), false, 'popover') ?> + +
+
diff --git a/app/Template/board/tooltip_subtasks.php b/app/Template/board/tooltip_subtasks.php index 126a319f..0322d373 100644 --- a/app/Template/board/tooltip_subtasks.php +++ b/app/Template/board/tooltip_subtasks.php @@ -1,14 +1,22 @@ - - - - - + + +
- subtask->toggleStatus($subtask, $task['project_id']) ?> - - +
+ + + + + + + + + - - -
+ subtask->toggleStatus($subtask, $task['project_id']) ?> + + text->e($subtask['name'] ?: $subtask['username']) ?> - -
+ + + +
+
diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php index cabe43d8..6424c39d 100644 --- a/app/Template/board/tooltip_tasklinks.php +++ b/app/Template/board/tooltip_tasklinks.php @@ -1,24 +1,34 @@ -