From b154f5db6530d74651df8bae5951e834f5d12d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sat, 19 Aug 2017 20:11:45 +0200
Subject: [PATCH] improve layout of list

---
 Resources/views/Activity/edit.html.twig |  14 ++++++++----
 Resources/views/Activity/list.html.twig |  29 ++++++++++++++++--------
 Resources/views/Activity/show.html.twig |   7 +++++-
 Test/Fixtures/App/.DS_Store             | Bin 6148 -> 0 bytes
 Test/Fixtures/App/app/.DS_Store         | Bin 6148 -> 0 bytes
 5 files changed, 35 insertions(+), 15 deletions(-)
 delete mode 100644 Test/Fixtures/App/.DS_Store
 delete mode 100644 Test/Fixtures/App/app/.DS_Store

diff --git a/Resources/views/Activity/edit.html.twig b/Resources/views/Activity/edit.html.twig
index c0e082920..0c52cadf4 100644
--- a/Resources/views/Activity/edit.html.twig
+++ b/Resources/views/Activity/edit.html.twig
@@ -38,10 +38,16 @@
     
 
     {{ form_widget(edit_form) }}
-        <div class="grid-12 centered sticky-form-buttons">
-            <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Save activity'|trans }}</button>
-            <button class="sc-button red margin-10" type="reset"><i class="fa fa-eraser"></i> {{ 'Reset form'|trans }}</button>
-        </div>
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': entity.person.id } ) }}" class="sc-button bt-cancel">
+                    {{ 'Cancel'|trans }}
+                </a>
+            </li>
+            <li>
+                <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
+            </li>
+        </ul>
     {{ form_end(edit_form) }}
 
     {# {{ form(delete_form) }} #}
diff --git a/Resources/views/Activity/list.html.twig b/Resources/views/Activity/list.html.twig
index d2d53d64c..1379d3472 100644
--- a/Resources/views/Activity/list.html.twig
+++ b/Resources/views/Activity/list.html.twig
@@ -26,7 +26,10 @@
     <h2>{{ 'Activity list' |trans }}</h2>
     
     {% if activities|length == 0 %}
-        <p class="chill-no-data-statement">{{ "There isn't any activities."|trans }}</p>
+        <p class="chill-no-data-statement">
+            {{ "There isn't any activities."|trans }} 
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create button-small no-content"></a>
+        </p>
     {% else %}
     <table class="records_list">
         <thead>
@@ -54,17 +57,21 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button">{{ 'show'|trans|capitalize }}</a>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-show has-hidden">
+                                
+                            </a>
                         </li>
                         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
                         <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-update">{{ 'Edit' | trans }}</a>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-update has-hidden">
+                                
+                            </a>
                         </li>
                         {% endif %}
                         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
                         <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete">
-                                {{ 'Delete'|trans }}
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete has-hidden">
+                                
                             </a>
                         </li>
                         {% endif %}
@@ -75,9 +82,11 @@
     </table>
     {% endif %}
     
-    <p>
-        <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-            {{ 'Add a new activity' | trans }}
-        </a>
-    </p>
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create">
+                {{ 'Add a new activity' | trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig
index db769ee18..5f3b00b9f 100644
--- a/Resources/views/Activity/show.html.twig
+++ b/Resources/views/Activity/show.html.twig
@@ -41,9 +41,14 @@
     </dl>
 
     <ul class="record_actions">
+        <li class="cancel">
+            <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person.id } ) }}">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
         <li>
         <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">
-            <i class="fa fa-pencil"></i> {{ 'Edit the activity'|trans }}
+            {{ 'Edit the activity'|trans }}
         </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
diff --git a/Test/Fixtures/App/.DS_Store b/Test/Fixtures/App/.DS_Store
deleted file mode 100644
index a00f962abeadbc07d074195d25166f1626619cdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5Z-O8ru7n0LGY5R;GxAzud&vnP^ehMN=-<h3nd9nYLODi*~jqzF$B?f
z@KL-uv%3~c_2NOK%!Ju*c6KIVzJ=WkV~p2_UWGA}F=l`w=87<UBe;$_BRTEifS@Le
zBex&AFnf2SnP_tSM+R{3^2}ioi`>!I{p*W3DVN`PE?-z!Tr!HKWqiz)(pjq)j#`P6
z4CA^pIF&Qu`L4E`PSX3dkHWA&u^snV_@l15wjTzGBLaW$CAHHQfftVI;V|&xPD{P7
zExe@HHP@R1{{m8*PT(JlSh%7ul1rnAPuJWSk1OT!wpFQC(`{>9tASnJsimp;WEh)U
zyL*QxQF?WKb9;CH@c8_q_JCvAD60x4<LksCgBTzNh=Dm~Kp%p}@*LMlr4a+f!0#Bq
z^T7f|v^8c5<<S9yYykiZ;Fbb5_7a$5X|y$F3Sk9=t5iUh%5{suRXX@B9cOFI6smN_
zb@RdXm$~jxxcoZ2-;&{s+X`tU28e-a2J&iZ;{AW{bN@e`L^EQ57?>*tc%jj1)S)DO
zx6TxYcdZ3_4vK<tnZij581gEHSiFiiK&61+LIcp&m?;Dg2>l318fYK}{*-|aDpX#P

diff --git a/Test/Fixtures/App/app/.DS_Store b/Test/Fixtures/App/app/.DS_Store
deleted file mode 100644
index 160f0c174dcf116cfbbb3e721ad8c751ba4cc45a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKO-sW-5Pe&FsCX%O@t8lL!G92I^(0bI@7lDWqBi8C=q*3pH#19Vi9&mkA~Rw3
z&Cbs3X5W--7eE*_vvXhwU_ce@9kTgBWL&f(z334PI!A>XC7w{=tP|~yePlptcZ?|(
zd}^%MufVg`F=st<+Vi5G-ZWKRGGl@V#?D#m3Mt+hQ8K2XJ)yP0E5~x3FU2KuU+~5!
z#ghIH%otI!C$rkfDOXz0OLfhfqf2UyFGk-pSKd!nyr%b)cEc?3rnuk?1yO!`g1hYM
zHtuRm9`><}{!Y$-GvEyD!~oB1k-?Fnx6Xhw;0&x7kncl670e>GhWhDXqgMc8pKcY}
za+i>tBw`k^HRK2-SSry{L%d=HOQ%1HaaqLH(9#ifWzG{<4)KN(bana@4M)ffy>$kh
zflUSutUHwR|LXVq|7Mc+oB?OxUojB+<Gb;QTZ(6EXLEAaCe%l&h{Uyqs}ve~6f;(i
c;uES0{fQXFEMjX&55@loC=K2?1AofEH^qlYy8r+H