From 7c4bdea324d8074ffcc3fa353fcfd85ee8066634 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 14 Feb 2015 21:03:25 -0500 Subject: Add board filter: collapse/expand tasks --- app/Locale/da_DK/translations.php | 2 + app/Locale/de_DE/translations.php | 2 + app/Locale/es_ES/translations.php | 2 + app/Locale/fi_FI/translations.php | 2 + app/Locale/fr_FR/translations.php | 2 + app/Locale/hu_HU/translations.php | 2 + app/Locale/it_IT/translations.php | 2 + app/Locale/ja_JP/translations.php | 2 + app/Locale/pl_PL/translations.php | 2 + app/Locale/pt_BR/translations.php | 2 + app/Locale/ru_RU/translations.php | 2 + app/Locale/sv_SE/translations.php | 2 + app/Locale/th_TH/translations.php | 2 + app/Locale/zh_CN/translations.php | 2 + app/Template/board/filters.php | 8 ++ app/Template/board/show.php | 3 +- app/Template/board/swimlane.php | 8 +- app/Template/board/task.php | 148 ++++++++++--------------------------- app/Template/board/task_footer.php | 45 +++++++++++ app/Template/board/task_public.php | 26 +++++++ 20 files changed, 152 insertions(+), 114 deletions(-) create mode 100644 app/Template/board/task_footer.php create mode 100644 app/Template/board/task_public.php (limited to 'app') diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index b6186a33..44d3c9f8 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index f954ce78..e768c33c 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 60a90c9a..997d0d50 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 42054646..facbafdd 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 26372c48..a6981662 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -724,4 +724,6 @@ return array( '<1h' => '<1h', '%dh' => '%dh', '%b %e' => '%e %b', + 'Expand tasks' => 'Déplier les tâches', + 'Collapse tasks' => 'Replier les tâches', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 487492b2..8407ca55 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index f395caff..dc369ba3 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index ab62128c..e6cfe83e 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 688230fa..c1583cd8 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index d7759fc8..30c4dca3 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 0afd3643..ebaca4fc 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index c9a9b041..6a6d0973 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 502b1135..f78f198a 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 75690708..45d9203a 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -722,4 +722,6 @@ return array( // '<1h' => '', // '%dh' => '', // '%b %e' => '', + // 'Expand tasks' => '', + // 'Collapse tasks' => '', ); diff --git a/app/Template/board/filters.php b/app/Template/board/filters.php index 0e9c4d5f..db2108ab 100644 --- a/app/Template/board/filters.php +++ b/app/Template/board/filters.php @@ -46,5 +46,13 @@
  • +
  • + + + + +
  • \ No newline at end of file diff --git a/app/Template/board/show.php b/app/Template/board/show.php index 5fbb576c..dc524737 100644 --- a/app/Template/board/show.php +++ b/app/Template/board/show.php @@ -1,4 +1,3 @@ - @@ -25,4 +24,4 @@ )) ?> -
    + \ No newline at end of file diff --git a/app/Template/board/swimlane.php b/app/Template/board/swimlane.php index f0a00fc1..ec5272f3 100644 --- a/app/Template/board/swimlane.php +++ b/app/Template/board/swimlane.php @@ -26,13 +26,13 @@ e($column['title']) ?> - + - + - + (/e($column['task_limit']) ?>) @@ -65,7 +65,7 @@ - render('board/task', array( + render($not_editable ? 'board/task_public' : 'board/task', array( 'project' => $project, 'task' => $task, 'categories' => $categories, diff --git a/app/Template/board/task.php b/app/Template/board/task.php index 638078c3..5f73a5c2 100644 --- a/app/Template/board/task.php +++ b/app/Template/board/task.php @@ -1,31 +1,3 @@ - - -
    - - a('#'.$task['id'], 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> - - - - () - - - -  -  - - - - - - - - - -
    - a($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> -
    - - -
    -