1 files changed, 50 insertions, 27 deletions
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index daba29e4..15002632 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -7,37 +7,60 @@
    <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="input-field col s12">
+                    <div class="col s6">
                        <p class="help">{{ 'user.description'|trans|raw }}</p>
+                    </div>
+                    <div class="col s6">
+                        <div class="input-field">
+                            <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 %}
-                        <table class="bordered">
+                                {{ form_widget(searchForm.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
-                            <thead>
-                                <tr>
+                                {{ form_rest(searchForm) }}
-                                    <th>{{ 'user.form.username_label'|trans }}</th>
+                            </form>
-                                    <th>{{ 'user.form.email_label'|trans }}</th>
+                        </div>
-                                    <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>
+                    <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>
+                    {% if users.getNbPages > 1 %}
+                        {{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                    {% endif %}
                </div>
            </div>
        </div>

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index daba29e4..15002632 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -7,37 +7,60 @@
7	<div class="row">	7	<div class="row">
8	<div class="col s12">	8	<div class="col s12">
9	<div class="card-panel">	9	<div class="card-panel">
		10	{% if users.getNbPages > 1 %}
		11	{{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
		12	{% endif %}
10	<div class="row">	13	<div class="row">
11	<div class="input-field col s12">	14	<div class="col s6">
12	<p class="help">{{ 'user.description'\|trans\|raw }}</p>	15	<p class="help">{{ 'user.description'\|trans\|raw }}</p>
		16	</div>
		17	<div class="col s6">
		18	<div class="input-field">
		19	<form name="search_users" method="GET" action="{{ path('user_index')}}">
		20	{% if form_errors(searchForm) %}
		21	<span class="black-text">{{ form_errors(searchForm) }}</span>
		22	{% endif %}
		23
		24	{% if form_errors(searchForm.term) %}
		25	<span class="black-text">{{ form_errors(searchForm.term) }}</span>
		26	{% endif %}
13		27
14	<table class="bordered">	28	{{ form_widget(searchForm.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
15	<thead>	29
16	<tr>	30	{{ form_rest(searchForm) }}
17	<th>{{ 'user.form.username_label'\|trans }}</th>	31	</form>
18	<th>{{ 'user.form.email_label'\|trans }}</th>	32	</div>
19	<th>{{ 'user.form.last_login_label'\|trans }}</th>
20	<th>{{ 'user.list.actions'\|trans }}</th>
21	</tr>
22	</thead>
23	<tbody>
24	{% for user in users %}
25	<tr>
26	<td>{{ user.username }}</td>
27	<td>{{ user.email }}</td>
28	<td>{% if user.lastLogin %}{{ user.lastLogin\|date('Y-m-d H:i:s') }}{% endif %}</td>
29	<td>
30	<a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'\|trans }}</a>
31	</td>
32	</tr>
33	{% endfor %}
34	</tbody>
35	</table>
36	<br />
37	<p>
38	<a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'\|trans }}</a>
39	</p>
40	</div>	33	</div>
		34
		35	<table class="bordered">
		36	<thead>
		37	<tr>
		38	<th>{{ 'user.form.username_label'\|trans }}</th>
		39	<th>{{ 'user.form.email_label'\|trans }}</th>
		40	<th>{{ 'user.form.last_login_label'\|trans }}</th>
		41	<th>{{ 'user.list.actions'\|trans }}</th>
		42	</tr>
		43	</thead>
		44	<tbody>
		45	{% for user in users %}
		46	<tr>
		47	<td>{{ user.username }}</td>
		48	<td>{{ user.email }}</td>
		49	<td>{% if user.lastLogin %}{{ user.lastLogin\|date('Y-m-d H:i:s') }}{% endif %}</td>
		50	<td>
		51	<a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'\|trans }}</a>
		52	</td>
		53	</tr>
		54	{% endfor %}
		55	</tbody>
		56	</table>
		57	<br />
		58	<p>
		59	<a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'\|trans }}</a>
		60	</p>
		61	{% if users.getNbPages > 1 %}
		62	{{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
		63	{% endif %}
41	</div>	64	</div>
42	</div>	65	</div>
43	</div>	66	</div>