Merge branch '111_exports_suite' into testing

src/Bundle/ChillMainBundle/Resources/views/Export/_navbar.html.twig

@@ -0,0 +1,12 @@
+<ul class="nav nav-pills justify-content-center">
+    <li class="nav-item">
+        <a href="{{ chill_path_forward_return_path('chill_main_export_index') }}" class="nav-link {% if current == 'common' %}active{% endif %}">
+            {{ 'Exports list'|trans }}
+        </a>
+    </li>
+    <li class="nav-item">
+        <a href="{{ chill_path_forward_return_path('chill_main_export_saved_list_my') }}" class="nav-link {% if current == 'my' %}active{% endif %}">
+            {{ 'saved_export.My saved exports'|trans }}
+        </a>
+    </li>
+</ul>

src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig

@@ -49,5 +49,14 @@ window.addEventListener("DOMContentLoaded", function(e) {
              data-download-text="{{ "Download your report"|trans|escape('html_attr') }}"
         ><span id="waiting_text">{{ "Waiting for your report"|trans ~ '...' }}</span></div>
 
-    </div>
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel"><a href="{{ chill_return_path_or('chill_main_export_index') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a></li>
+
+            {% if not app.request.query.has('prevent_save') %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_main_export_save_from_key', { alias: alias, key: app.request.query.get('key')}) }}" class="btn btn-save">{{ 'Save'|trans }}</a>
+                </li>
+            {% endif %}
+        </ul>
+</div>
 {% endblock content %}

src/Bundle/ChillMainBundle/Resources/views/Export/layout.html.twig

@@ -22,9 +22,11 @@
 
 
 {% block content %}
+
+    {{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'common'}) }}
+
     <div class="col-md-10">
-        <h1>{{ 'Exports list'|trans }}</h1>
-        
+
         <div class="container mt-4">
             
             {% for group, exports in grouped_exports %}{%  if group != '_' %}
@@ -32,13 +34,17 @@
                 <div class="row grouped">
                     {% for export_alias, export in exports %}
                     <div class="col-6 col-md-4 mb-3">
-                        <h2>{{ export.title|trans }}</h2>
-                        <p>{{ export.description|trans }}</p>
-                        <p>
-                            <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
-                                {{ 'Create an export'|trans }}
-                            </a>
-                        </p>
+                        <div class="card">
+                            <div class="card-body">
+                                <h2 class="card-title">{{ export.title|trans }}</h2>
+                                <p class="card-text">{{ export.description|trans }}</p>
+                                <p>
+                                    <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                                        {{ 'Create an export'|trans }}
+                                    </a>
+                                </p>
+                            </div>
+                        </div>
                     </div>
                     {% endfor %}
                 </div>
@@ -52,13 +58,17 @@
             {% for export_alias,export in grouped_exports['_'] %}
                 
                 <div class="col-6 col-md-4 mb-3">
-                    <h2>{{ export.title|trans }}</h2>
-                    <p>{{ export.description|trans }}</p>
-                    <p>
-                        <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
-                            {{ 'Create an export'|trans }}
-                        </a>
-                    </p>
+                    <div class="card">
+                        <div class="card-body">
+                            <h2 class="card-title">{{ export.title|trans }}</h2>
+                            <p class="card-text">{{ export.description|trans }}</p>
+                            <p>
+                                <a class="btn btn-action" href="{{ path('chill_main_export_new', { 'alias': export_alias } ) }}">
+                                    {{ 'Create an export'|trans }}
+                                </a>
+                            </p>
+                        </div>
+                    </div>
                 </div>
                 
             {% endfor %}

src/Bundle/ChillMainBundle/Resources/views/SavedExport/delete.html.twig

@@ -0,0 +1,25 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title 'saved_export.Delete saved ?'|trans %}
+
+{% block display_content %}
+<div class="col-10">
+    <h3>{{ saved_export.title }}</h3>
+    <p>{{ saved_export.description|chill_markdown_to_html }}</p>
+
+</div>
+{% endblock %}
+
+{% block content %}
+    <div class="container chill-md-10">
+        {{ include('@ChillMain/Util/confirmation_template.html.twig',
+            {
+                'title'             : 'saved_export.Delete saved ?'|trans,
+                'confirm_question'  : 'saved_export.Are you sure you want to delete this saved ?'|trans,
+                'display_content'   : block('display_content'),
+                'cancel_route'      : 'chill_main_export_saved_list_my',
+                'cancel_parameters' : {},
+                'form'              : delete_form
+            } ) }}
+    </div>
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/SavedExport/edit.html.twig

@@ -0,0 +1,21 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title %}{{ 'saved_export.Edit'|trans }}{% endblock %}
+
+{% block content %}
+    <h1>{{ block('title') }}</h1>
+
+    {{ form_start(form) }}
+    {{ form_row(form.title) }}
+    {{ form_row(form.description) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
+        </li>
+        <li>
+            <button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
+        </li>
+    </ul>
+    {{ form_end(form) }}
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/SavedExport/index.html.twig

@@ -0,0 +1,82 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title %}{{ 'saved_export.My saved exports'|trans }}{% endblock %}
+
+{% block content %}
+    <div class="col-md-10">
+
+        {{ include('@ChillMain/Export/_navbar.html.twig', {'current' : 'my'}) }}
+
+        <div class="container mt-4">
+
+            {% if total == 0 %}
+                <p class="chill-no-data-statement" >{{ 'saved_export.Any saved export'|trans }}</p>
+            {% endif %}
+
+            {% for group, saveds in grouped_exports %}
+                {% if group != '_' %}
+                    <h2 class="display-6">{{ group }}</h2>
+                    <div class="row grouped">
+                        {% for s in saveds %}
+                            <div class="col-6 col-md-4 mb-3">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h2 class="card-title">{{ s.saved.title }}</h2>
+                                        <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
+
+                                        <div class="card-text">
+                                            {{ 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>
+
+                                        <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_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>
+                                        </ul>
+
+                                    </div>
+                                </div>
+                            </div>
+                        {% endfor %}
+                    </div>
+                {% endif %}
+            {% endfor %}
+
+            {% if grouped_exports|keys|length > 1 and grouped_exports['_']|length > 0 %}
+                <h2 class="display-6">{{ 'Ungrouped exports'|trans }}</h2>
+            {% endif %}
+
+            <div class="row ungrouped">
+                {% for saveds in grouped_exports['_']|default([]) %}
+                    {% for s in saveds %}
+                        <div class="col-6 col-md-4 mb-3">
+                            <div class="col-6 col-md-4 mb-3">
+                                <div class="card">
+                                    <div class="card-body">
+                                        <h2 class="card-title">{{ s.saved.title }}</h2>
+                                        <p class="card-subtitle"><strong>{{ s.export.title|trans }}</strong></p>
+
+                                        <div class="card-text">
+                                            {{ 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>
+
+                                        <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_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>
+                                        </ul>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    {% endfor %}
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/SavedExport/new.html.twig

@@ -0,0 +1,21 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% block title %}{{ 'saved_export.New'|trans }}{% endblock %}
+
+{% block content %}
+    <h1>{{ block('title') }}</h1>
+
+    {{ form_start(form) }}
+    {{ form_row(form.title) }}
+    {{ form_row(form.description) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans }}</a>
+        </li>
+        <li>
+            <button type="submit" class="btn btn-save">{{ 'Save'|trans }}</button>
+        </li>
+    </ul>
+    {{ form_end(form) }}
+{% endblock %}