From 7e9a5849447fcae063b9fba1bd72bdcba1f45c4e Mon Sep 17 00:00:00 2001 From: nobohan Date: Mon, 7 May 2018 17:02:39 +0200 Subject: [PATCH] add action btns in the view page --- Resources/public/sass/_task.scss | 8 +++++--- Resources/translations/messages.fr.yml | 3 ++- Resources/views/SingleTask/show.html.twig | 14 ++++++++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Resources/public/sass/_task.scss b/Resources/public/sass/_task.scss index 0aa0a4c4a..308f9cbfd 100644 --- a/Resources/public/sass/_task.scss +++ b/Resources/public/sass/_task.scss @@ -29,17 +29,18 @@ div#single_task_warningInterval { } .bt-task { - display: block; + display: inline-block; height: 0; width: 8px; - padding-right: 3px;; } .bt-task-exchange { background: $chill-green; + color: #fff; } .bt-task-exchange:hover { background: $chill-green-dark; + color: #fff; } .bt-task-exchange::before { @@ -80,5 +81,6 @@ div#single_task_warningInterval { } .bt-dropdown:hover .bt-dropdown-content { - display: block; + display: inline-block; + width: min-content; } diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 7a4419bf8..dfb649782 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -37,6 +37,7 @@ User: Utilisateur 'View the task': 'Voir la tâche' 'Update the task': 'Mettre à jour la tâche' 'Remove task': 'Supprimer la tâche' +'Change task status': 'Changer le statut' 'Are you sure you want to remove the task about "%name%" ?': 'Êtes-vous sûr·e de vouloir supprimer la tâche de "%name%"?' 'See more': 'Voir plus' 'Associated tasks': 'Tâches associées' @@ -72,4 +73,4 @@ cancel: annuler 'The task has been updated': 'La tâche a été mise à jour' 'The transition is successfully applied': 'La transition a bien été effectuée' 'The transition could not be applied': "La transition n'a pas pu être appliquée" -'%number% tasks near deadline': '{0} Aucune tâche à échance|{1} Une tâche à échéance | ]1,Inf[ %count% tâches à échéance' \ No newline at end of file +'%number% tasks near deadline': '{0} Aucune tâche à échance|{1} Une tâche à échéance | ]1,Inf[ %count% tâches à échéance' diff --git a/Resources/views/SingleTask/show.html.twig b/Resources/views/SingleTask/show.html.twig index 0d0fcf2ca..4daced061 100644 --- a/Resources/views/SingleTask/show.html.twig +++ b/Resources/views/SingleTask/show.html.twig @@ -80,14 +80,24 @@ {{ 'Back to the list'|trans }} - {% if not is_granted('CHILL_TASK_TASK_UPDATE', task) %} +
  • +
    +  {{'Change task status'|trans}} +
    + {% for transition in workflow_transitions(task) %} + {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }} + {% endfor %} +
    +
    +
  • + {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
  • {{ 'Edit the task'|trans }}
  • {% endif %} - {% if not is_granted('CHILL_TASK_TASK_CREATE', task) %} + {% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
  • {{ 'Delete'|trans }}