Merge pull request #3011 from wallabag/2.3

[github/wallabag/wallabag.git] / src / Wallabag / UserBundle / Resources / views / Manage / index.html.twig

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index abc028521b12be4fea0303b1fe451b510491cbb8..15002632cfaabaf5c9b353d55281e0aa2b86ba6a 100644 (file)
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -7,13 +7,28 @@
     <div class="row">
         <div class="col s12">
             <div class="card-panel">
+                {% if users.getNbPages > 1 %}
+                    {{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                {% endif %}
                 <div class="row">
                     <div class="col s6">
                         <p class="help">{{ 'user.description'|trans|raw }}</p>
                     </div>
                     <div class="col s6">
                         <div class="input-field">
-                            {{ render(controller("WallabagUserBundle:Manage:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
+                            <form name="search_users" method="GET" action="{{ path('user_index')}}">
+                                {% if form_errors(searchForm) %}
+                                    <span class="black-text">{{ form_errors(searchForm) }}</span>
+                                {% endif %}
+
+                                {% if form_errors(searchForm.term) %}
+                                    <span class="black-text">{{ form_errors(searchForm.term) }}</span>
+                                {% endif %}
+
+                                {{ form_widget(searchForm.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
+
+                                {{ form_rest(searchForm) }}
+                            </form>
                         </div>
                     </div>
 
@@ -22,7 +37,7 @@
                             <tr>
                                 <th>{{ 'user.form.username_label'|trans }}</th>
                                 <th>{{ 'user.form.email_label'|trans }}</th>
-                                <th>{{ 'user.form2017-03-10 16:51:07.last_login_label'|trans }}</th>
+                                <th>{{ 'user.form.last_login_label'|trans }}</th>
                                 <th>{{ 'user.list.actions'|trans }}</th>
                             </tr>
                         </thead>
@@ -43,6 +58,9 @@
                     <p>
                         <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
                     </p>
+                    {% if users.getNbPages > 1 %}
+                        {{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                    {% endif %}
                 </div>
             </div>
         </div>