aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/UserBundle/Resources/views/Manage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-02 15:27:58 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2017-05-02 15:30:32 +0200
commitb5b6877976bc32f23e51c2fb0f3f973f0d571b10 (patch)
treeba12ea034fa9cbef65858c0106e03fded3830649 /src/Wallabag/UserBundle/Resources/views/Manage
parentd01dc5a81e7fde37d98fe6b10b9329b53add5b6a (diff)
downloadwallabag-b5b6877976bc32f23e51c2fb0f3f973f0d571b10.tar.gz
wallabag-b5b6877976bc32f23e51c2fb0f3f973f0d571b10.tar.zst
wallabag-b5b6877976bc32f23e51c2fb0f3f973f0d571b10.zip
Merged list and search methods
Diffstat (limited to 'src/Wallabag/UserBundle/Resources/views/Manage')
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig14
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Manage/search_form.html.twig15
2 files changed, 13 insertions, 16 deletions
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 @@
16 </div> 16 </div>
17 <div class="col s6"> 17 <div class="col s6">
18 <div class="input-field"> 18 <div class="input-field">
19 {{ render(controller("WallabagUserBundle:Manage:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} 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 %}
27
28 {{ form_widget(searchForm.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
29
30 {{ form_rest(searchForm) }}
31 </form>
20 </div> 32 </div>
21 </div> 33 </div>
22 34
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 @@
1<form name="search_users" method="GET" action="{{ path('user-search')}}">
2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %}
5
6 {% if form_errors(form.term) %}
7 <span class="black-text">{{ form_errors(form.term) }}</span>
8 {% endif %}
9
10 <i class="material-icons prefix">search</i>
11 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
12 <label for="search_user_term" class="active">{{ 'user.search.label' | trans }}</label>
13
14 {{ form_rest(form) }}
15</form>