From 92b7dd3335a6572debeacfb5faa82c63a5e67888 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Fri, 8 Jun 2018 20:03:25 +0200 Subject: Some minor fixes --- .../templates/navigation/sidebar-menu.html.twig | 104 ++++++++++----------- .../templates/navigation/sidebar-user.html.twig | 18 ++-- .../admin/templates/navigation/sidebar.html.twig | 18 ++-- .../admin/templates/navigation/user-card.html.twig | 16 ++-- 4 files changed, 78 insertions(+), 78 deletions(-) (limited to 'main/app/sprinkles/admin/templates/navigation') diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig index 446f260..b2965e0 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar-menu.html.twig @@ -1,53 +1,53 @@ -{% block navigation %} - {% if checkAccess('uri_dashboard') %} -
  • - - {{ translate("DASHBOARD") }} - -
  • - {% endif %} - {% if checkAccess('uri_users') %} -
  • - - {{ translate("USER", 2) }} - -
  • - {% elseif checkAccess('uri_group', { - 'group': current_user.group - }) %} -
  • - - {{ translate("GROUP.MANAGE") }} - -
  • - {% endif %} - {% if checkAccess('uri_activities') %} -
  • - - {{ translate("ACTIVITY", 2) }} - -
  • - {% endif %} - {% if checkAccess('uri_roles') %} -
  • - - {{ translate("ROLE", 2) }} - -
  • - {% endif %} - {% if checkAccess('uri_permissions') %} -
  • - - {{ translate("PERMISSION", 2) }} - -
  • - {% endif %} - {% if checkAccess('uri_groups') %} -
  • - - {{ translate("GROUP", 2) }} - -
  • - {% endif %} +{% block navigation %} + {% if checkAccess('uri_dashboard') %} +
  • + + {{ translate("DASHBOARD") }} + +
  • + {% endif %} + {% if checkAccess('uri_users') %} +
  • + + {{ translate("USER", 2) }} + +
  • + {% elseif checkAccess('uri_group', { + 'group': current_user.group + }) %} +
  • + + {{ translate("GROUP.MANAGE") }} + +
  • + {% endif %} + {% if checkAccess('uri_activities') %} +
  • + + {{ translate("ACTIVITY", 2) }} + +
  • + {% endif %} + {% if checkAccess('uri_roles') %} +
  • + + {{ translate("ROLE", 2) }} + +
  • + {% endif %} + {% if checkAccess('uri_permissions') %} +
  • + + {{ translate("PERMISSION", 2) }} + +
  • + {% endif %} + {% if checkAccess('uri_groups') %} +
  • + + {{ translate("GROUP", 2) }} + +
  • + {% endif %} {% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig index 4b1881c..541fe99 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar-user.html.twig @@ -1,10 +1,10 @@ - -
    -
    - User Image -
    -
    -

    {{ current_user.first_name }} {{ current_user.last_name }}

    - {{ current_user.group.name }} -
    + +
    +
    + User Image +
    +
    +

    {{ current_user.first_name }} {{ current_user.last_name }}

    + {{ current_user.group.name }} +
    \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig index 59f87b0..f5465a0 100644 --- a/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/sidebar.html.twig @@ -1,10 +1,10 @@ -{% block sidebar_user %} - {% include 'navigation/sidebar-user.html.twig' %} -{% endblock %} - -{% block sidebar_menu %} - +{% block sidebar_user %} + {% include 'navigation/sidebar-user.html.twig' %} +{% endblock %} + +{% block sidebar_menu %} + {% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig index 8b40cd3..a844ce1 100644 --- a/main/app/sprinkles/admin/templates/navigation/user-card.html.twig +++ b/main/app/sprinkles/admin/templates/navigation/user-card.html.twig @@ -1,9 +1,9 @@ -{% extends "@account/navigation/user-card.html.twig" %} - -{% block userCard_menu %} - {% if checkAccess('uri_dashboard') %} - {{ translate("DASHBOARD") }} - {% endif %} - {{ parent() }} +{% extends "@account/navigation/user-card.html.twig" %} + +{% block userCard_menu %} + {% if checkAccess('uri_dashboard') %} + {{ translate("DASHBOARD") }} + {% endif %} + {{ parent() }} {% endblock %} \ No newline at end of file -- cgit v1.2.3