diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss index c3fe6d65c..5158a826e 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss @@ -64,7 +64,7 @@ ul.record_actions { .sticky-form { background-color: $white; - padding: 1em; + padding-top: 1.25em; margin: -1em; box-shadow: 0 -20px 20px -20px rgba($chill-gray, .5); @include sticky-bottom; diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig index 2404178b2..df63cc848 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/edit.html.twig @@ -3,77 +3,82 @@ {% block title %}{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}{% endblock %} {% block admin_content -%} -
{{ 'Circle'|trans }} | +{{ 'Role'|trans }} | +{{ 'Actions'|trans }} | +|||
---|---|---|---|---|---|
{{ 'Circle'|trans }} | -{{ 'Role'|trans }} | -{{ 'Actions'|trans }} | ++ {%- if role_scope.scope is not null -%} + + {{ role_scope.scope.name|localize_translatable_string }} + + {%- else -%} + N/A + {%- endif -%} + | +
+ {{ role_scope.role|trans }}
+ {% if expanded_roles[role_scope.role]|length > 1 %}
+
+ {{ 'Which implies'|trans }} :
+ {% for role in expanded_roles[role_scope.role] %}
+ {% if role != role_scope.role %}
+ {{ role|trans }}
+ {% if not loop.last %}, {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+ |
+ + {{ form_start(delete_role_scopes_form[role_scope.id]) }} + {{ form_widget(delete_role_scopes_form[role_scope.id].submit, { 'attr': { 'class': 'btn btn-remove' } } ) }} + {{ form_end(delete_role_scopes_form[role_scope.id]) }} + |
- {%- if role_scope.scope is not null -%} - - {{ role_scope.scope.name|localize_translatable_string }} - - {%- else -%} - N/A - {%- endif -%} - | -
- {{ role_scope.role|trans }}
- {% if expanded_roles[role_scope.role]|length > 1 %}
-
- {{ 'Which implies'|trans }} :
- {% for role in expanded_roles[role_scope.role] %}
- {% if role != role_scope.role %}
- {{ role|trans }}
- {% if not loop.last %}, {% endif %}
- {% endif %}
- {% endfor %}
-
- {% endif %}
- |
- - {{ form_start(delete_role_scopes_form[role_scope.id]) }} - {{ form_widget(delete_role_scopes_form[role_scope.id].submit, { 'attr': { 'class': 'btn btn-remove' } } ) }} - {{ form_end(delete_role_scopes_form[role_scope.id]) }} - | -
{{ 'This group does not provide any permission'|trans }}
+ {%- endif -%} - {%- else -%} -{{ 'This group does not provide any permission'|trans }}
- {%- endif -%} +