diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 7cd3f5479..eaa11e3d6 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -524,6 +524,7 @@ div.exports-list { flex-basis: 33%; @include media-breakpoint-down(lg) { flex-basis: 50%; } @include media-breakpoint-down(sm) { flex-basis: 100%; } + div:last-child, p:last-child { margin-top: auto; } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig index b86f617b4..873ace4ac 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig @@ -52,20 +52,18 @@

{{ 'Ungrouped exports'|trans }}

{% endif %} -
+
{% for export_alias,export in grouped_exports['_'] %} - -
-
-
-

{{ export.title|trans }}

-

{{ export.description|trans }}

-

- - {{ 'Create an export'|trans }} - -

-
+ +
+
+

{{ export.title|trans }}

+

{{ export.description|trans }}

+

+ + {{ 'Create an export'|trans }} + +

diff --git a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig index 937d42201..98cfd6281 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig @@ -3,6 +3,7 @@ {% block title %}{{ 'saved_export.Edit'|trans }}{% endblock %} {% block content %} +

{{ block('title') }}

{{ form_start(form) }} @@ -18,4 +19,5 @@ {{ form_end(form) }} +
{% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig index 17792ecd2..50e6f5a5f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig @@ -3,7 +3,7 @@ {% block title %}{{ 'saved_export.My saved exports'|trans }}{% endblock %} {% block content %} -
+
{{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }} @@ -16,26 +16,25 @@ {% for group, saveds in grouped_exports %} {% if group != '_' %}

{{ group }}

-
+
{% for s in saveds %} -
-
-
-

{{ s.saved.title }}

-

{{ s.export.title|trans }}

- -
- {{ s.saved.description|chill_markdown_to_html }} -
- -
{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}
- +
+
+

{{ s.export.title|trans }}

+

{{ s.saved.title }}

+ +
{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}
+ +
+ {{ s.saved.description|chill_markdown_to_html }} +
+ +
-
@@ -48,29 +47,26 @@

{{ 'Ungrouped exports'|trans }}

{% endif %} -
+
{% for saveds in grouped_exports['_']|default([]) %} {% for s in saveds %} -
-
-
-
-

{{ s.saved.title }}

-

{{ s.export.title|trans }}

- -
- {{ s.saved.description|chill_markdown_to_html }} -
- -
{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}
- -
    -
  • -
  • -
  • -
- -
+
+
+

{{ s.export.title|trans }}

+

{{ s.saved.title }}

+ +
{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}
+ +
+ {{ s.saved.description|chill_markdown_to_html }} +
+ +
+
    +
  • +
  • +
  • +
diff --git a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig index 037adb0fc..317f53e42 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig @@ -3,6 +3,7 @@ {% block title %}{{ 'saved_export.New'|trans }}{% endblock %} {% block content %} +

{{ block('title') }}

{{ form_start(form) }} @@ -18,4 +19,5 @@ {{ form_end(form) }} +
{% endblock %} \ No newline at end of file