From 1215fde1c69c5d4579b823552c5253750e9699a9 Mon Sep 17 00:00:00 2001 From: Moreau Elise <moreau.elise13@gmail.com> Date: Thu, 22 Oct 2020 10:58:28 +0200 Subject: [PATCH] add route to group's messages in group view --- templates/group/group_view.twig | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/templates/group/group_view.twig b/templates/group/group_view.twig index c0effee..b472c11 100644 --- a/templates/group/group_view.twig +++ b/templates/group/group_view.twig @@ -12,11 +12,18 @@ <div class="description" id="description"> <p>{{group.description}}</p> </div> - {% if session.userId %} - <a href="/groups/{{group.getId}}/messages">Messages</a> - {% endif %} <div class="extra content" id="icons_users"> <div class="ui small basic icon buttons"> + {% if session.userId %} + <button class="ui button"> + <a href="/groups/{{group.getId}}/messages"><i class="envelope icon"></i></a> + </button> + {% endif %} + {% if session.userId and group.hasUser(session.userId) == false %} + <form action="/groups/{{group.getId}}/users/add" method="post"> + <button type="submit" class="ui button"><i class="user plus icon"></i></button> + </form> + {% endif %} {% if group.checkAdmin(session.userId) %} <form action="/groups/{{group.getId}}/modify" method="get"> <button type="submit" class="ui button"><i class="edit icon"></i></button> @@ -26,11 +33,6 @@ </form> <button class="ui button" id="add-user-button"><i class="user plus icon"></i> Add a member </button> {% endif %} - {% if session.userId and group.hasUser(session.userId) == false %} - <form action="/groups/{{group.getId}}/users/add" method="post"> - <button type="submit" class="ui button"><i class="user plus icon"></i></button> - </form> - {% endif %} </div> </div> </div> -- GitLab