aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-11-10 15:23:53 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-11-19 19:17:30 +0100
commit49b042dfdf33a0efd3c838e1476754e6019730d2 (patch)
tree6db14479ee9573cfdc44d435c0cc6d56bdae0c74
parent398de40517356981a9fe1b9185f5f9e5e498c346 (diff)
downloadwallabag-49b042dfdf33a0efd3c838e1476754e6019730d2.tar.gz
wallabag-49b042dfdf33a0efd3c838e1476754e6019730d2.tar.zst
wallabag-49b042dfdf33a0efd3c838e1476754e6019730d2.zip
Added translations and currentRoute parameter
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php6
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php22
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig2
15 files changed, 57 insertions, 8 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index fc1697be..8c13255e 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -27,7 +27,7 @@ class EntryController extends Controller
27 * 27 *
28 * @return \Symfony\Component\HttpFoundation\Response 28 * @return \Symfony\Component\HttpFoundation\Response
29 */ 29 */
30 public function searchFormAction(Request $request, $page) 30 public function searchFormAction(Request $request, $page, $currentRoute)
31 { 31 {
32 $form = $this->createForm(SearchEntryType::class); 32 $form = $this->createForm(SearchEntryType::class);
33 33
@@ -39,6 +39,7 @@ class EntryController extends Controller
39 39
40 return $this->render('WallabagCoreBundle:Entry:search_form.html.twig', [ 40 return $this->render('WallabagCoreBundle:Entry:search_form.html.twig', [
41 'form' => $form->createView(), 41 'form' => $form->createView(),
42 'currentRoute' => $currentRoute,
42 ]); 43 ]);
43 } 44 }
44 45
@@ -269,10 +270,11 @@ class EntryController extends Controller
269 { 270 {
270 $repository = $this->get('wallabag_core.entry_repository'); 271 $repository = $this->get('wallabag_core.entry_repository');
271 $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : ''); 272 $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
273 $currentRoute = (!is_null($request->get('currentRoute')) ? $request->get('currentRoute') : '');
272 274
273 switch ($type) { 275 switch ($type) {
274 case 'search': 276 case 'search':
275 $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm); 277 $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute);
276 278
277 break; 279 break;
278 case 'untagged': 280 case 'untagged':
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 8f23164f..51cfe4d1 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -90,18 +90,30 @@ class EntryRepository extends EntityRepository
90 * 90 *
91 * @param int $userId 91 * @param int $userId
92 * @param string $term 92 * @param string $term
93 * @param strint $currentRoute
93 * 94 *
94 * @return QueryBuilder 95 * @return QueryBuilder
95 */ 96 */
96 public function getBuilderForSearchByUser($userId, $term) 97 public function getBuilderForSearchByUser($userId, $term, $currentRoute)
97 { 98 {
98 return $this 99 $qb = $this
99 ->getBuilderByUser($userId) 100 ->getBuilderByUser($userId);
100 ->andWhere('e.content LIKE :term')->setParameter('term', '%'.$term.'%') 101
101 ->orWhere('e.title LIKE :term')->setParameter('term', '%'.$term.'%') 102 if ('starred' === $currentRoute) {
103 $qb->andWhere('e.isStarred = true');
104 } elseif ('unread' === $currentRoute) {
105 $qb->andWhere('e.isArchived = false');
106 } elseif ('archive' === $currentRoute) {
107 $qb->andWhere('e.isArchived = true');
108 }
109
110 $qb
111 ->andWhere('e.content LIKE :term OR e.title LIKE :term')->setParameter('term', '%'.$term.'%')
102 ->leftJoin('e.tags', 't') 112 ->leftJoin('e.tags', 't')
103 ->groupBy('e.id') 113 ->groupBy('e.id')
104 ->having('count(t.id) = 0'); 114 ->having('count(t.id) = 0');
115
116 return $qb;
105 } 117 }
106 118
107 /** 119 /**
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index b456fff0..d6c294a4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -162,6 +162,7 @@ entry:
162 # archived: 'Archived entries' 162 # archived: 'Archived entries'
163 # filtered: 'Filtered entries' 163 # filtered: 'Filtered entries'
164 # filtered_tags: 'Filtered by tags:' 164 # filtered_tags: 'Filtered by tags:'
165 # filtered_search: 'Filtered by search:'
165 # untagged: 'Untagged entries' 166 # untagged: 'Untagged entries'
166 list: 167 list:
167 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 168 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 # page_title: 'Edit an entry' 234 # page_title: 'Edit an entry'
232 # title_label: 'Title' 235 # title_label: 'Title'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 08ed1a11..8a67e0df 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'Archivierte Einträge' 162 archived: 'Archivierte Einträge'
163 filtered: 'Gefilterte Einträge' 163 filtered: 'Gefilterte Einträge'
164 filtered_tags: 'Gefiltert nach Tags:' 164 filtered_tags: 'Gefiltert nach Tags:'
165 # filtered_search: 'Filtered by search:'
165 untagged: 'Nicht getaggte Einträge' 166 untagged: 'Nicht getaggte Einträge'
166 list: 167 list:
167 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.' 168 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'https://website.de' 228 placeholder: 'https://website.de'
228 form_new: 229 form_new:
229 url_label: URL 230 url_label: URL
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Eintrag bearbeiten' 234 page_title: 'Eintrag bearbeiten'
232 title_label: 'Titel' 235 title_label: 'Titel'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 5507ccae..3876725e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'Artículos archivados' 162 archived: 'Artículos archivados'
163 filtered: 'Artículos filtrados' 163 filtered: 'Artículos filtrados'
164 # filtered_tags: 'Filtered by tags:' 164 # filtered_tags: 'Filtered by tags:'
165 # filtered_search: 'Filtered by search:'
165 # untagged: 'Untagged entries' 166 # untagged: 'Untagged entries'
166 list: 167 list:
167 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.' 168 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Editar un artículo' 234 page_title: 'Editar un artículo'
232 title_label: 'Título' 235 title_label: 'Título'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index ba8a9c35..301668e3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'مقاله‌های بایگانی‌شده' 162 archived: 'مقاله‌های بایگانی‌شده'
163 filtered: 'مقاله‌های فیلترشده' 163 filtered: 'مقاله‌های فیلترشده'
164 # filtered_tags: 'Filtered by tags:' 164 # filtered_tags: 'Filtered by tags:'
165 # filtered_search: 'Filtered by search:'
165 # untagged: 'Untagged entries' 166 # untagged: 'Untagged entries'
166 list: 167 list:
167 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.' 168 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: نشانی 230 url_label: نشانی
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'ویرایش مقاله' 234 page_title: 'ویرایش مقاله'
232 title_label: 'عنوان' 235 title_label: 'عنوان'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 2932f2fd..d5c00e52 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -162,6 +162,7 @@ entry:
162 archived: "Articles lus" 162 archived: "Articles lus"
163 filtered: "Articles filtrés" 163 filtered: "Articles filtrés"
164 filtered_tags: "Articles filtrés par tags :" 164 filtered_tags: "Articles filtrés par tags :"
165 filtered_search: 'Articles filtrés par une recherche :'
165 untagged: "Article sans tag" 166 untagged: "Article sans tag"
166 list: 167 list:
167 number_on_the_page: "{0} Il n’y a pas d’articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." 168 number_on_the_page: "{0} Il n’y a pas d’articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
@@ -227,6 +228,8 @@ entry:
227 placeholder: "http://website.com" 228 placeholder: "http://website.com"
228 form_new: 229 form_new:
229 url_label: "Adresse" 230 url_label: "Adresse"
231 search:
232 placeholder: "Que recherchez-vous ?"
230 edit: 233 edit:
231 page_title: "Éditer un article" 234 page_title: "Éditer un article"
232 title_label: "Titre" 235 title_label: "Titre"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 538e25a6..4be99a27 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'Contenuti archiviati' 162 archived: 'Contenuti archiviati'
163 filtered: 'Contenuti filtrati' 163 filtered: 'Contenuti filtrati'
164 # filtered_tags: 'Filtered by tags:' 164 # filtered_tags: 'Filtered by tags:'
165 # filtered_search: 'Filtered by search:'
165 # untagged: 'Untagged entries' 166 # untagged: 'Untagged entries'
166 list: 167 list:
167 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti." 168 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Modifica voce' 234 page_title: 'Modifica voce'
232 title_label: 'Titolo' 235 title_label: 'Titolo'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 6f415c3b..5ded91f9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'Articles legits' 162 archived: 'Articles legits'
163 filtered: 'Articles filtrats' 163 filtered: 'Articles filtrats'
164 filtered_tags: 'Filtats per etiquetas:' 164 filtered_tags: 'Filtats per etiquetas:'
165 # filtered_search: 'Filtered by search:'
165 untagged: 'Articles sens etiqueta' 166 untagged: 'Articles sens etiqueta'
166 list: 167 list:
167 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles." 168 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Modificar un article' 234 page_title: 'Modificar un article'
232 title_label: 'Títol' 235 title_label: 'Títol'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index df5ab7e5..38fc4ceb 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'Zarchiwizowane wpisy' 162 archived: 'Zarchiwizowane wpisy'
163 filtered: 'Odfiltrowane wpisy' 163 filtered: 'Odfiltrowane wpisy'
164 filtered_tags: 'Filtrowane po tagach:' 164 filtered_tags: 'Filtrowane po tagach:'
165 # filtered_search: 'Filtered by search:'
165 untagged: 'Odtaguj wpisy' 166 untagged: 'Odtaguj wpisy'
166 list: 167 list:
167 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' 168 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Edytuj wpis' 234 page_title: 'Edytuj wpis'
232 title_label: 'Tytuł' 235 title_label: 'Tytuł'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 1c1c9a78..4084469c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -162,6 +162,7 @@ entry:
162 archived: 'Entradas arquivadas' 162 archived: 'Entradas arquivadas'
163 filtered: 'Entradas filtradas' 163 filtered: 'Entradas filtradas'
164 filtered_tags: 'Filtrar por tags:' 164 filtered_tags: 'Filtrar por tags:'
165 # filtered_search: 'Filtered by search:'
165 untagged: 'Entradas sem tags' 166 untagged: 'Entradas sem tags'
166 list: 167 list:
167 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.' 168 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Editar uma entrada' 234 page_title: 'Editar uma entrada'
232 title_label: 'Título' 235 title_label: 'Título'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 8da04d95..a6a7e146 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -162,6 +162,7 @@ entry:
162 # archived: 'Archived entries' 162 # archived: 'Archived entries'
163 # filtered: 'Filtered entries' 163 # filtered: 'Filtered entries'
164 # filtered_tags: 'Filtered by tags:' 164 # filtered_tags: 'Filtered by tags:'
165 # filtered_search: 'Filtered by search:'
165 # untagged: 'Untagged entries' 166 # untagged: 'Untagged entries'
166 list: 167 list:
167 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 168 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 # page_title: 'Edit an entry' 234 # page_title: 'Edit an entry'
232 # title_label: 'Title' 235 # title_label: 'Title'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 8d94044c..630ad0ca 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -162,6 +162,7 @@ entry:
162 # archived: 'Archived entries' 162 # archived: 'Archived entries'
163 # filtered: 'Filtered entries' 163 # filtered: 'Filtered entries'
164 # filtered_tags: 'Filtered by tags:' 164 # filtered_tags: 'Filtered by tags:'
165 # filtered_search: 'Filtered by search:'
165 # untagged: 'Untagged entries' 166 # untagged: 'Untagged entries'
166 list: 167 list:
167 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.' 168 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
@@ -227,6 +228,8 @@ entry:
227 placeholder: 'http://website.com' 228 placeholder: 'http://website.com'
228 form_new: 229 form_new:
229 url_label: Url 230 url_label: Url
231 search:
232 # placeholder: 'What are you looking for?'
230 edit: 233 edit:
231 page_title: 'Makaleyi düzenle' 234 page_title: 'Makaleyi düzenle'
232 title_label: 'Başlık' 235 title_label: 'Başlık'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
index bba6adb1..f25de94d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
@@ -7,6 +7,8 @@
7 <span class="black-text">{{ form_errors(form.term) }}</span> 7 <span class="black-text">{{ form_errors(form.term) }}</span>
8 {% endif %} 8 {% endif %}
9 9
10 <input type="hidden" name="currentRoute" value="{{ currentRoute }}" />
11
10 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} 12 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }}
11 13
12 {{ form_rest(form) }} 14 {{ form_rest(form) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 9437a2a8..551486e0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -107,7 +107,7 @@
107 </ul> 107 </ul>
108 </div> 108 </div>
109 <div class="input-field nav-panel-search" style="display: none"> 109 <div class="input-field nav-panel-search" style="display: none">
110 {{ render(controller("WallabagCoreBundle:Entry:searchForm")) }} 110 {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
111 <label for="search" class="active"><i class="material-icons search">search</i></label> 111 <label for="search" class="active"><i class="material-icons search">search</i></label>
112 <i class="material-icons close">clear</i> 112 <i class="material-icons close">clear</i>
113 </div> 113 </div>