Merge remote-tracking branch 'origin/master'

Resources/config/services.yml

@@ -23,6 +23,7 @@ services:
             - "@doctrine.orm.entity_manager"
             - "@security.token_storage"
             - "@chill.main.security.authorization.helper"
+            - "@chill_main.paginator_factory"
         calls:
             - ['setContainer', ["@service_container"]]
         tags:

Resources/views/Person/list.html.twig

@@ -18,6 +18,8 @@
 
 <p>{{ '%total% persons matching the search %pattern%'|transchoice( total, {'%pattern%': pattern, '%total%' : total}) }}</p>
 
+<p>{{ 'Results %start%-%end% of %total%'|trans({ '%start%' : start, '%end%': start + persons|length, '%total%' : total } ) }}</p>
+
 {% if persons|length > 0 %}
 
     <table>
@@ -55,4 +57,25 @@
             {% endfor %}
         </tbody>
     </table>
+            
+            <ul class="record_actions">
+                <li>
+                    <a href="{{ path('chill_person_new') }}" class="sc-button btn-create">
+                        {{ 'Add a person'|trans }}
+                    </a>
+                </li>
+                {% if preview == true and persons|length < total %}
+                <li>
+                    <a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="sc-button">
+                        {{ 'See all results'|trans }}
+                    </a>
+                </li>
+                {% endif %}
+            </ul>
+                        
 {% endif %}
+
+{% if preview == false %}
+{{ chill_pagination(paginator) }}
+{% endif %}
+