From bf623e0e08d63dbafec7d98bd16abb0815295e83 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Fri, 3 Nov 2017 11:04:18 -0700 Subject: Improve dropdown for task description templates --- app/Helper/TaskHelper.php | 4 ++-- app/Locale/bs_BA/translations.php | 1 - app/Locale/ca_ES/translations.php | 1 - app/Locale/cs_CZ/translations.php | 1 - app/Locale/da_DK/translations.php | 1 - app/Locale/de_DE/translations.php | 1 - app/Locale/el_GR/translations.php | 1 - app/Locale/es_ES/translations.php | 1 - app/Locale/fi_FI/translations.php | 1 - app/Locale/fr_FR/translations.php | 1 - app/Locale/hr_HR/translations.php | 1 - app/Locale/hu_HU/translations.php | 1 - app/Locale/id_ID/translations.php | 1 - app/Locale/it_IT/translations.php | 1 - app/Locale/ja_JP/translations.php | 1 - app/Locale/ko_KR/translations.php | 1 - app/Locale/my_MY/translations.php | 1 - app/Locale/nb_NO/translations.php | 1 - app/Locale/nl_NL/translations.php | 1 - app/Locale/pl_PL/translations.php | 1 - app/Locale/pt_BR/translations.php | 1 - app/Locale/pt_PT/translations.php | 1 - app/Locale/ru_RU/translations.php | 1 - app/Locale/sr_Latn_RS/translations.php | 1 - app/Locale/sv_SE/translations.php | 1 - app/Locale/th_TH/translations.php | 1 - app/Locale/tr_TR/translations.php | 1 - app/Locale/vi_VN/translations.php | 1 - app/Locale/zh_CN/translations.php | 1 - app/Template/task_modification/show.php | 1 + 30 files changed, 3 insertions(+), 30 deletions(-) (limited to 'app') diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php index 43347a6d..cc164ce0 100644 --- a/app/Helper/TaskHelper.php +++ b/app/Helper/TaskHelper.php @@ -66,8 +66,8 @@ class TaskHelper extends Base $templates = $this->predefinedTaskDescriptionModel->getAll($projectId); if (! empty($templates)) { - $html = '
'; - $html .= ''.t('Description Templates').' '; + $html = '
'; + $html .= ''.t('Template for the task description').' '; $html .= '
    '; foreach ($templates as $template) { diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index f9e972e2..47b83f9b 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php index 68d01b83..019faca1 100644 --- a/app/Locale/ca_ES/translations.php +++ b/app/Locale/ca_ES/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 5ede8fbc..fc3c4152 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index 21ab41d6..e1ef628c 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 177fdadf..15086cf1 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index 86bbe7ac..044fe3ad 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 6970fa70..fa2933f2 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index c7030ca5..28d73cba 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index c3f0bb90..bb551eb8 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1355,6 +1355,5 @@ return array( 'Unable to update this template.' => 'Impossible de mettre à jour ce modèle.', 'Template removed successfully.' => 'Modèle supprimé avec succès.', 'Unable to remove this template.' => 'Impossible de supprimer ce modèle.', - 'Description Templates' => 'Modèles de description', 'Template for the task description' => 'Modèle pour la description des tâches', ); diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php index f7de65aa..adfde704 100644 --- a/app/Locale/hr_HR/translations.php +++ b/app/Locale/hr_HR/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index 8900b62f..65ccdc42 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index af772399..9ee0a603 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index f466d9b9..b2fdb4fe 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index ad1cabb7..34243a90 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index 8969f909..41aa9779 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 8e612928..ebc9a05f 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index f5f481e8..73326c35 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 1adb9e8a..c4214610 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 87d94490..c782b90f 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 1f9de451..50ccbfc7 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index cc7f0f2e..51691bea 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 5c54386c..b10a571e 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index d5a0818d..d6174448 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index ccba5e95..7073ef3f 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 21b9232f..b55cffef 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index bf2f7ff6..c9ea395a 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/vi_VN/translations.php b/app/Locale/vi_VN/translations.php index 1e8ba674..dc182b5e 100644 --- a/app/Locale/vi_VN/translations.php +++ b/app/Locale/vi_VN/translations.php @@ -1361,6 +1361,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index b215302f..eb415d5f 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1355,6 +1355,5 @@ return array( // 'Unable to update this template.' => '', // 'Template removed successfully.' => '', // 'Unable to remove this template.' => '', - // 'Description Templates' => '', // 'Template for the task description' => '', ); diff --git a/app/Template/task_modification/show.php b/app/Template/task_modification/show.php index ebe9f6fd..c7c41ddd 100644 --- a/app/Template/task_modification/show.php +++ b/app/Template/task_modification/show.php @@ -8,6 +8,7 @@
    task->renderTitleField($values, $errors) ?> task->renderDescriptionField($values, $errors) ?> + task->renderDescriptionTemplateDropdown($project['id']) ?> task->renderTagField($project, $tags) ?> hook->render('template:task:form:first-column', array('values' => $values, 'errors' => $errors)) ?> -- cgit v1.2.3