From c37515f880bd05b86e3e848cc184018295ec1920 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 27 Apr 2017 15:58:32 +0200
Subject: Add filter to users management page

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../Resources/views/Manage/index.html.twig         | 61 ++++++++++++----------
 .../Resources/views/Manage/search_form.html.twig   | 15 ++++++
 2 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index daba29e4..abc02852 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -8,36 +8,41 @@
         <div class="col s12">
             <div class="card-panel">
                 <div class="row">
-                    <div class="input-field col s12">
+                    <div class="col s6">
                         <p class="help">{{ 'user.description'|trans|raw }}</p>
-
-                        <table class="bordered">
-                            <thead>
-                                <tr>
-                                    <th>{{ 'user.form.username_label'|trans }}</th>
-                                    <th>{{ 'user.form.email_label'|trans }}</th>
-                                    <th>{{ 'user.form.last_login_label'|trans }}</th>
-                                    <th>{{ 'user.list.actions'|trans }}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                            {% for user in users %}
-                                <tr>
-                                    <td>{{ user.username }}</td>
-                                    <td>{{ user.email }}</td>
-                                    <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
-                                    <td>
-                                        <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                        <br />
-                        <p>
-                            <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
-                        </p>
                     </div>
+                    <div class="col s6">
+                        <div class="input-field">
+                            {{ render(controller("WallabagUserBundle:Manage:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
+                        </div>
+                    </div>
+
+                    <table class="bordered">
+                        <thead>
+                            <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.list.actions'|trans }}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        {% for user in users %}
+                            <tr>
+                                <td>{{ user.username }}</td>
+                                <td>{{ user.email }}</td>
+                                <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
+                                <td>
+                                    <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    <br />
+                    <p>
+                        <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
+                    </p>
                 </div>
             </div>
         </div>
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
new file mode 100644
index 00000000..f59388d0
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
@@ -0,0 +1,15 @@
+<form name="search" method="GET" action="{{ path('user-search')}}">
+    {% if form_errors(form) %}
+        <span class="black-text">{{ form_errors(form) }}</span>
+    {% endif %}
+
+    {% if form_errors(form.term) %}
+        <span class="black-text">{{ form_errors(form.term) }}</span>
+    {% endif %}
+
+    <i class="material-icons prefix">search</i>
+    {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
+    <label for="search_user_term" class="active">{{ 'user.search.label' | trans }}</label>
+
+    {{ form_rest(form) }}
+</form>
-- 
cgit v1.2.3


From 50cfd8108b8e318fd28564d2e9d30943ab12aac0 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 27 Apr 2017 16:23:54 +0200
Subject: Add pagination

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index abc02852..7a76f157 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -7,6 +7,9 @@
     <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>
@@ -22,7 +25,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 +46,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>
-- 
cgit v1.2.3


From a2daa32d0c6f71aa8553aed3c6ed58d7aa861baa Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 27 Apr 2017 16:40:18 +0200
Subject: Fix tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
index f59388d0..1d4df204 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
@@ -1,4 +1,4 @@
-<form name="search" method="GET" action="{{ path('user-search')}}">
+<form name="search_users" method="GET" action="{{ path('user-search')}}">
     {% if form_errors(form) %}
         <span class="black-text">{{ form_errors(form) }}</span>
     {% endif %}
-- 
cgit v1.2.3


From b5b6877976bc32f23e51c2fb0f3f973f0d571b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 2 May 2017 15:27:58 +0200
Subject: Merged list and search methods

---
 .../UserBundle/Resources/views/Manage/index.html.twig     | 14 +++++++++++++-
 .../Resources/views/Manage/search_form.html.twig          | 15 ---------------
 2 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index 7a76f157..15002632 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -16,7 +16,19 @@
                     </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>
 
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
deleted file mode 100644
index 1d4df204..00000000
--- a/src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-<form name="search_users" method="GET" action="{{ path('user-search')}}">
-    {% if form_errors(form) %}
-        <span class="black-text">{{ form_errors(form) }}</span>
-    {% endif %}
-
-    {% if form_errors(form.term) %}
-        <span class="black-text">{{ form_errors(form.term) }}</span>
-    {% endif %}
-
-    <i class="material-icons prefix">search</i>
-    {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
-    <label for="search_user_term" class="active">{{ 'user.search.label' | trans }}</label>
-
-    {{ form_rest(form) }}
-</form>
-- 
cgit v1.2.3