diff --git a/CHANGELOG.md b/CHANGELOG.md index 6278f42a6..6fd31b832 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,4 +17,5 @@ Master branch ============= - fix error when interval is hour only +- layout of page "list exports" diff --git a/Resources/public/modules/export-list/export-list.scss b/Resources/public/modules/export-list/export-list.scss new file mode 100644 index 000000000..c1db247f1 --- /dev/null +++ b/Resources/public/modules/export-list/export-list.scss @@ -0,0 +1,21 @@ +.container-export { + margin-left: 1rem; + margin-right: 1rem; + + .export-list { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + + .export-list__element { + min-width: 18rem; + max-width: 20rem; + padding: 1rem; + margin: 1rem; + flex-grow: 1; + + border: 1px solid var(--chill-gray); + } + } +} \ No newline at end of file diff --git a/Resources/views/Export/layout.html.twig b/Resources/views/Export/layout.html.twig index 8a125d4f7..7eb8655d6 100644 --- a/Resources/views/Export/layout.html.twig +++ b/Resources/views/Export/layout.html.twig @@ -16,25 +16,21 @@ * along with this program. If not, see . #} -{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %} +{% extends "ChillMainBundle::layout.html.twig" %} {% block title %}{{ 'Exports list'|trans }}{% endblock %} -{% block vertical_menu_content %} - {{ chill_menu('export', { - 'layout': 'ChillMainBundle::Menu/export.html.twig', - }) }} -{% endblock %} -{% block layout_wvm_content %} - {% block export_content %} -

{{ 'Exports list'|trans }}

- +{% block content %} +
+

{{ 'Exports list'|trans }}

+ +
{% for export_alias,export in exports %} - +
+{% endblock %} diff --git a/Resources/views/UI/notification_user_counter.html.twig b/Resources/views/UI/notification_user_counter.html.twig index aa5e6bde1..e4e899ba6 100644 --- a/Resources/views/UI/notification_user_counter.html.twig +++ b/Resources/views/UI/notification_user_counter.html.twig @@ -1 +1 @@ -{% if nb > 0 %}{{ nb }}{% endif %} \ No newline at end of file +{% if nb > 0 %}{{ nb }}{% endif %} \ No newline at end of file diff --git a/chill.webpack.config.js b/chill.webpack.config.js index ba21e486b..9fb9200a7 100644 --- a/chill.webpack.config.js +++ b/chill.webpack.config.js @@ -28,6 +28,7 @@ require('./Resources/public/modules/download-report/index.js'); //require('./Resources/public/css/select2/select2.css'); require('select2/dist/css/select2.css'); require('./Resources/public/modules/select_interactive_loading/index.js'); +require('./Resources/public/modules/export-list/export-list.scss'); // img require('./Resources/public/img/favicon.ico');