From 5aff866ed8ad0a0a965b147f08abac89139ee6ab 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 21:48:36 +0200
Subject: [PATCH] adapt layout to new rules

---
 Resources/views/Report/edit.html.twig             | 12 ++++++++----
 Resources/views/Report/list.html.twig             | 10 ++++------
 Resources/views/Report/new.html.twig              | 11 ++++++++---
 .../views/Report/select_report_type.html.twig     | 15 +++++++++++----
 Resources/views/Report/view.html.twig             | 14 +++++++++++---
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/Resources/views/Report/edit.html.twig b/Resources/views/Report/edit.html.twig
index 18009675a..47a7e4215 100644
--- a/Resources/views/Report/edit.html.twig
+++ b/Resources/views/Report/edit.html.twig
@@ -29,10 +29,14 @@
     {{ form_row(edit_form.cFData) }}
 
     {{ 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 report'|trans }}</button>
-            <button class="sc-button red margin-10" type="reset"><i class="fa fa-eraser"></i> {{ 'Reset report'|trans }}</button>
-        </div>
+        <ul class="sticky-form-buttons record_actions">
+            <li class="cancel">
+                <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <li>
+            <li>
+            <button class="sc-button bt-save" type="submit">{{ 'Save report'|trans }}</button>
+            </li>
+        </ul>
     {{ form_end(edit_form) }}
 {% endblock %}
 
diff --git a/Resources/views/Report/list.html.twig b/Resources/views/Report/list.html.twig
index 8849f1832..d9d603e10 100644
--- a/Resources/views/Report/list.html.twig
+++ b/Resources/views/Report/list.html.twig
@@ -25,9 +25,8 @@
     <h1>{{ 'Report list'|trans }}</h1>
     
     {% if reports|length == 0 %}
-        <p style="text-align:center;">
+        <p>
             <span class="chill-no-data-statement">{{ "No report registered for this person."|trans }}</span>
-            <a href="{{ path('report_select_type', { 'person_id' : person.id } ) }}">{{ 'Create a new report'|trans }}</a>
         </p>
     {% else %}
     <table class="" style="width:100%">
@@ -36,7 +35,7 @@
                 <th class="chill-red">{{ 'Date' | trans }}</th>
                 <th class="chill-green">{{ 'Report type' | trans }}</th>
                 <th class="chill-orange">{{ 'Circle' | trans }}</th>
-                <th>{{ 'Actions'|trans }}</th>
+                <th>&nbsp;</th>
             </tr>
         </thead>
         <tbody>
@@ -49,12 +48,12 @@
                     <ul class="record_actions">
                         {% if is_granted('CHILL_REPORT_SEE', report) %}
                         <li>
-                            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="sc-button bt-view">{{ 'View the report' | trans | capitalize }}</a>
+                            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="sc-button bt-view"></a>
                         </li>
                         {% endif %}
                         {% if is_granted('CHILL_REPORT_UPDATE', report) %}
                             <li>
-                        <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="sc-button bt-update">{{ 'Update' | trans }}</a>
+                        <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}" class="sc-button bt-update"></a>
                             </li>
                         {% endif %}
                     </ul>
@@ -73,7 +72,6 @@
     <ul class="record_actions">
         <li>
             <a href="{{ path('report_select_type', { 'person_id' : person.id } ) }}" class="sc-button bt-new">
-                <i class="fa fa-plus"></i>
                 {{ 'Create a new report'|trans }}
             </a>
         </li>
diff --git a/Resources/views/Report/new.html.twig b/Resources/views/Report/new.html.twig
index 744dca41c..8589601ae 100644
--- a/Resources/views/Report/new.html.twig
+++ b/Resources/views/Report/new.html.twig
@@ -27,9 +27,14 @@
     {{ form_row(form.date) }}
     {{ form_row(form.scope) }}
     {{ form_row(form.cFData) }}
-        <div class="grid-12 centered sticky-form-buttons">
-            <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add report'|trans }}</button>
-        </div>
+        <ul class="sticky-form-buttons record_actions">
+            <li class="cancel">
+                <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+            <li>
+            <li>
+            <button class="sc-button bt-create" type="submit"> {{ 'Add report'|trans }}</button>
+            </li>
+        </ul>
     {{ form_end(form) }}
 {% endblock %}
 
diff --git a/Resources/views/Report/select_report_type.html.twig b/Resources/views/Report/select_report_type.html.twig
index 52432883b..3297d5ef7 100644
--- a/Resources/views/Report/select_report_type.html.twig
+++ b/Resources/views/Report/select_report_type.html.twig
@@ -24,10 +24,17 @@
 
 {{ form_start(form) }}
     {{ form_widget(form.cFGroup) }}
-    <button class="sc-button green" type="submit">
-        <i class="fa fa-plus"></i>
-        {{ 'Create a new report'|trans }}
-    </button>
+    
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+        <li>
+        <button class="sc-button green" type="submit">
+            <i class="fa fa-plus"></i>
+            {{ 'Create a new report'|trans }}
+        </button>
+        </li>
+    </ul>
 {{ form_end(form) }}
  
 {% endblock %}
diff --git a/Resources/views/Report/view.html.twig b/Resources/views/Report/view.html.twig
index 3a6fde97f..286313366 100644
--- a/Resources/views/Report/view.html.twig
+++ b/Resources/views/Report/view.html.twig
@@ -43,7 +43,15 @@
     <dl class="chill_report_view_data">
     {{ chill_custom_fields_group_widget(entity.cFData, entity.cFGroup) }}
     </dl>
-    {% if is_granted('CHILL_REPORT_UPDATE', entity) %}
-    <a class="sc-button bt-update" href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}"><i class="fa fa-pencil"></i> {{ 'Update the report' | trans }}</a>
-    {% endif %}
+    
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('report_list', { 'person_id': person.id } ) }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+        <li>
+        {% if is_granted('CHILL_REPORT_UPDATE', entity) %}
+        <li>
+        <a class="sc-button bt-edit" href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}">{{ 'Update the report' | trans }}</a>
+        </li>
+        {% endif %}
+    </ul>
 {% endblock %}