Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix flex-bloc look in exports list and saved exports

Browse Source
This commit is contained in:
Mathieu Jaumotte 2022-11-15 22:01:35 +01:00
parent 434ef075da
commit a39f547907
5 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss
View File

@ -524,6 +524,7 @@ div.exports-list {
flex-basis: 33%; flex-basis: 33%;
@include media-breakpoint-down(lg) { flex-basis: 50%; } @include media-breakpoint-down(lg) { flex-basis: 50%; }
@include media-breakpoint-down(sm) { flex-basis: 100%; } @include media-breakpoint-down(sm) { flex-basis: 100%; }
div:last-child,
p:last-child { p:last-child {
margin-top: auto; margin-top: auto;
} }

24
src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig
View File

@ -52,20 +52,18 @@
<h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2> <h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2>
{% endif %} {% endif %}
<div class="row ungrouped"> <div class="row flex-bloc">
{% for export_alias,export in grouped_exports['_'] %} {% for export_alias,export in grouped_exports['_'] %}
<div class="col-6 col-md-4 mb-3"> <div class="item-bloc">
<div class="card"> <div class="item-row card-body">
<div class="card-body"> <h2 class="card-title">{{ export.title|trans }}</h2>
<h2 class="card-title">{{ export.title|trans }}</h2> <p class="card-text my-3">{{ export.description|trans }}</p>
<p class="card-text">{{ export.description|trans }}</p> <p>
<p> <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
<a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}"> {{ 'Create an export'|trans }}
{{ 'Create an export'|trans }} </a>
</a> </p>
</p>
</div>
</div> </div>
</div> </div>

2
src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig
View File

@ -3,6 +3,7 @@
{% block title %}{{ 'saved_export.Edit'|trans }}{% endblock %} {% block title %}{{ 'saved_export.Edit'|trans }}{% endblock %}
{% block content %} {% block content %}
<div class="col-10">
<h1>{{ block('title') }}</h1> <h1>{{ block('title') }}</h1>
{{ form_start(form) }} {{ form_start(form) }}
@ -18,4 +19,5 @@
</li> </li>
</ul> </ul>
{{ form_end(form) }} {{ form_end(form) }}
</div>
{% endblock %} {% endblock %}

68
src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig
View File

@ -3,7 +3,7 @@
{% block title %}{{ 'saved_export.My saved exports'|trans }}{% endblock %} {% block title %}{{ 'saved_export.My saved exports'|trans }}{% endblock %}
{% block content %} {% block content %}
<div class="col-md-10"> <div class="col-md-10 exports-list">
{{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }} {{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }}
@ -16,26 +16,25 @@
{% for group, saveds in grouped_exports %} {% for group, saveds in grouped_exports %}
{% if group != '_' %} {% if group != '_' %}
<h2 class="display-6">{{ group }}</h2> <h2 class="display-6">{{ group }}</h2>
<div class="row grouped"> <div class="row flex-bloc">
{% for s in saveds %} {% for s in saveds %}
<div class="col-6 col-md-4 mb-3"> <div class="item-bloc">
<div class="card"> <div class="item-row card-body">
<div class="card-body"> <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
<h2 class="card-title">{{ s.saved.title }}</h2> <h2 class="card-title">{{ s.saved.title }}</h2>
<p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
<div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
<div class="card-text">
{{ s.saved.description|chill_markdown_to_html }} <div class="card-text my-3">
</div> {{ s.saved.description|chill_markdown_to_html }}
</div>
<div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
<div>
<ul class="record_actions"> <ul class="record_actions">
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li> <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li> <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li>
<li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li> <li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
@ -48,29 +47,26 @@
<h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2> <h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2>
{% endif %} {% endif %}
<div class="row ungrouped"> <div class="row flex-bloc">
{% for saveds in grouped_exports['_']|default([]) %} {% for saveds in grouped_exports['_']|default([]) %}
{% for s in saveds %} {% for s in saveds %}
<div class="col-6 col-md-4 mb-3"> <div class="item-bloc">
<div class="col-6 col-md-4 mb-3"> <div class="item-row card-body">
<div class="card"> <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
<div class="card-body"> <h2 class="card-title">{{ s.saved.title }}</h2>
<h2 class="card-title">{{ s.saved.title }}</h2>
<p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p> <div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div>
<div class="card-text"> <div class="card-text my-3">
{{ s.saved.description|chill_markdown_to_html }} {{ s.saved.description|chill_markdown_to_html }}
</div> </div>
<div class="createdBy">{{ 'saved_export.Created on %date%'|trans({'%date%': s.saved.createdAt|format_datetime('long', 'short')}) }}</div> <div>
<ul class="record_actions">
<ul class="record_actions"> <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li>
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_delete', {'id': s.saved.id }) }}" class="btn btn-delete"></a></li> <li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li>
<li><a href="{{ chill_path_add_return_path('chill_main_export_saved_edit', {'id': s.saved.id }) }}" class="btn btn-edit"></a></li> <li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li>
<li><a href="{{ path('chill_main_export_generate_from_saved', { id: s.saved.id }) }}" class="btn btn-action"><i class="fa fa-cog"></i></a></li> </ul>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

2
src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig
View File

@ -3,6 +3,7 @@
{% block title %}{{ 'saved_export.New'|trans }}{% endblock %} {% block title %}{{ 'saved_export.New'|trans }}{% endblock %}
{% block content %} {% block content %}
<div class="col-10">
<h1>{{ block('title') }}</h1> <h1>{{ block('title') }}</h1>
{{ form_start(form) }} {{ form_start(form) }}
@ -18,4 +19,5 @@
</li> </li>
</ul> </ul>
{{ form_end(form) }} {{ form_end(form) }}
</div>
{% endblock %} {% endblock %}