From 3742f4b06c50fbc60ec499920a5079b77743dbe8 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Tue, 2 Jun 2015 05:24:38 +0300 Subject: [PATCH] Fix #16. --- .../Resources/public/css/main.css | 4 + .../Resources/views/User/show.html.twig | 115 ++++++++++-------- 2 files changed, 66 insertions(+), 53 deletions(-) diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css b/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css index 2818740..167a190 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css +++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/public/css/main.css @@ -38,6 +38,10 @@ body > .container { margin-top: 30px; } +.user-subscriptions-log { + margin-top: 30px; +} + h4.panel-title a { text-decoration: none; } diff --git a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/User/show.html.twig b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/User/show.html.twig index 6d3f344..947131a 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/Resources/views/User/show.html.twig +++ b/src/Skobkin/Bundle/PointToolsBundle/Resources/views/User/show.html.twig @@ -9,68 +9,77 @@
-
-
- -
-
- + {% if subscribers|length > 0 %} +
+
+ +
+
+ +
-
+ {% else %} + + {% endif %}
-
-
-
- -
-
- - - - - - - - - - {% for event in log %} +
+ {% if log|length > 0 %} +
{{ 'User'|trans }}{{ 'Action'|trans }}{{ 'Date'|trans }}
+ - - - + + + - {% endfor %} - -
- @{{ event.subscriber.login }} - - - - {# Use DateTime helper: https://sonata-project.org/bundles/intl/master/doc/reference/datetime.html #} - {{ event.date|date('H:i:s d F Y') }} - {{ 'User'|trans }}{{ 'Action'|trans }}{{ 'Date'|trans }}
+ + + {% for event in log %} + + + @{{ event.subscriber.login }} + + + + + + {# Use DateTime helper: https://sonata-project.org/bundles/intl/master/doc/reference/datetime.html #} + {{ event.date|date('H:i:s d F Y') }} + + + {% endfor %} + + +
-
+ {% else %} + + {% endif %}
+ {% endblock %}