diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
17 files changed, 47 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 4cf69916..5a770dff 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Tilføj ny artikel' | 37 | add_new_entry: 'Tilføj ny artikel' |
38 | search: 'Søg' | 38 | search: 'Søg' |
39 | filter_entries: 'Filtrer artikler' | 39 | filter_entries: 'Filtrer artikler' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | # export: 'Export' | 41 | # export: 'Export' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Indtast søgning' | 43 | input_label: 'Indtast søgning' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Artikel markeret som favorit' | 591 | entry_starred: 'Artikel markeret som favorit' |
591 | entry_unstarred: 'Artikel ikke længere markeret som favorit' | 592 | entry_unstarred: 'Artikel ikke længere markeret som favorit' |
592 | entry_deleted: 'Artikel slettet' | 593 | entry_deleted: 'Artikel slettet' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | # tag_added: 'Tag added' | 597 | # tag_added: 'Tag added' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 10981788..2ae8f08e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Neuen Artikel hinzufügen' | 37 | add_new_entry: 'Neuen Artikel hinzufügen' |
38 | search: 'Suche' | 38 | search: 'Suche' |
39 | filter_entries: 'Artikel filtern' | 39 | filter_entries: 'Artikel filtern' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportieren' | 41 | export: 'Exportieren' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Suchbegriff hier eingeben' | 43 | input_label: 'Suchbegriff hier eingeben' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Eintrag favorisiert' | 591 | entry_starred: 'Eintrag favorisiert' |
591 | entry_unstarred: 'Eintrag defavorisiert' | 592 | entry_unstarred: 'Eintrag defavorisiert' |
592 | entry_deleted: 'Eintrag gelöscht' | 593 | entry_deleted: 'Eintrag gelöscht' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Tag hinzugefügt' | 597 | tag_added: 'Tag hinzugefügt' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 95e10faf..d1d74159 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Add a new entry' | 37 | add_new_entry: 'Add a new entry' |
38 | search: 'Search' | 38 | search: 'Search' |
39 | filter_entries: 'Filter entries' | 39 | filter_entries: 'Filter entries' |
40 | random_entry: Jump to a random entry from that list | ||
40 | export: 'Export' | 41 | export: 'Export' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Enter your search here' | 43 | input_label: 'Enter your search here' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Entry starred' | 591 | entry_starred: 'Entry starred' |
591 | entry_unstarred: 'Entry unstarred' | 592 | entry_unstarred: 'Entry unstarred' |
592 | entry_deleted: 'Entry deleted' | 593 | entry_deleted: 'Entry deleted' |
594 | no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Tag added' | 597 | tag_added: 'Tag added' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index c95bee5b..741d3e9f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Añadir un nuevo artículo' | 37 | add_new_entry: 'Añadir un nuevo artículo' |
38 | search: 'Buscar' | 38 | search: 'Buscar' |
39 | filter_entries: 'Filtrar los artículos' | 39 | filter_entries: 'Filtrar los artículos' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportar' | 41 | export: 'Exportar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Introduzca su búsqueda aquí' | 43 | input_label: 'Introduzca su búsqueda aquí' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Artículo marcado como favorito' | 591 | entry_starred: 'Artículo marcado como favorito' |
591 | entry_unstarred: 'Artículo desmarcado como favorito' | 592 | entry_unstarred: 'Artículo desmarcado como favorito' |
592 | entry_deleted: 'Artículo eliminado' | 593 | entry_deleted: 'Artículo eliminado' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Etiqueta añadida' | 597 | tag_added: 'Etiqueta añadida' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 4fde53dd..2ef5dd52 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'افزودن مقالهٔ تازه' | 37 | add_new_entry: 'افزودن مقالهٔ تازه' |
38 | search: 'جستجو' | 38 | search: 'جستجو' |
39 | filter_entries: 'فیلترکردن مقالهها' | 39 | filter_entries: 'فیلترکردن مقالهها' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'برونبری' | 41 | export: 'برونبری' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'جستجوی خود را اینجا بنویسید:' | 43 | input_label: 'جستجوی خود را اینجا بنویسید:' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'مقاله برگزیده شد' | 591 | entry_starred: 'مقاله برگزیده شد' |
591 | entry_unstarred: 'مقاله نابرگزیده شد' | 592 | entry_unstarred: 'مقاله نابرگزیده شد' |
592 | entry_deleted: 'مقاله پاک شد' | 593 | entry_deleted: 'مقاله پاک شد' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'برچسب افزوده شد' | 597 | tag_added: 'برچسب افزوده شد' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index edf3ac35..7a2029b4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: "Sauvegarder un nouvel article" | 37 | add_new_entry: "Sauvegarder un nouvel article" |
38 | search: "Rechercher" | 38 | search: "Rechercher" |
39 | filter_entries: "Filtrer les articles" | 39 | filter_entries: "Filtrer les articles" |
40 | random_entry: Aller à un article aléatoire de cette liste | ||
40 | export: "Exporter" | 41 | export: "Exporter" |
41 | search_form: | 42 | search_form: |
42 | input_label: "Saisissez votre terme de recherche" | 43 | input_label: "Saisissez votre terme de recherche" |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: "Article ajouté dans les favoris" | 591 | entry_starred: "Article ajouté dans les favoris" |
591 | entry_unstarred: "Article retiré des favoris" | 592 | entry_unstarred: "Article retiré des favoris" |
592 | entry_deleted: "Article supprimé" | 593 | entry_deleted: "Article supprimé" |
594 | no_random_entry: "Aucun article correspond aux critères n'a été trouvé" | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: "Tag ajouté" | 597 | tag_added: "Tag ajouté" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index f178ddbf..3a459445 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Aggiungi un nuovo contenuto' | 37 | add_new_entry: 'Aggiungi un nuovo contenuto' |
38 | search: 'Cerca' | 38 | search: 'Cerca' |
39 | filter_entries: 'Filtra contenuti' | 39 | filter_entries: 'Filtra contenuti' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Esporta' | 41 | export: 'Esporta' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Inserisci qui la tua ricerca' | 43 | input_label: 'Inserisci qui la tua ricerca' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Contenuto segnato come preferito' | 591 | entry_starred: 'Contenuto segnato come preferito' |
591 | entry_unstarred: 'Contenuto rimosso dai preferiti' | 592 | entry_unstarred: 'Contenuto rimosso dai preferiti' |
592 | entry_deleted: 'Contenuto eliminato' | 593 | entry_deleted: 'Contenuto eliminato' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Etichetta aggiunta' | 597 | tag_added: 'Etichetta aggiunta' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index a1220f52..9df9e645 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Enregistrar un novèl article' | 37 | add_new_entry: 'Enregistrar un novèl article' |
38 | search: 'Cercar' | 38 | search: 'Cercar' |
39 | filter_entries: 'Filtrar los articles' | 39 | filter_entries: 'Filtrar los articles' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportar' | 41 | export: 'Exportar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Picatz vòstre mot-clau a cercar aquí' | 43 | input_label: 'Picatz vòstre mot-clau a cercar aquí' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Article ajustat dins los favorits' | 591 | entry_starred: 'Article ajustat dins los favorits' |
591 | entry_unstarred: 'Article quitat dels favorits' | 592 | entry_unstarred: 'Article quitat dels favorits' |
592 | entry_deleted: 'Article suprimit' | 593 | entry_deleted: 'Article suprimit' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Etiqueta ajustada' | 597 | tag_added: 'Etiqueta ajustada' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index b6f7faf7..684c40e2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Dodaj nowy wpis' | 37 | add_new_entry: 'Dodaj nowy wpis' |
38 | search: 'Szukaj' | 38 | search: 'Szukaj' |
39 | filter_entries: 'Filtruj wpisy' | 39 | filter_entries: 'Filtruj wpisy' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Eksportuj' | 41 | export: 'Eksportuj' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Wpisz swoje zapytanie tutaj' | 43 | input_label: 'Wpisz swoje zapytanie tutaj' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Wpis oznaczony gwiazdką' | 591 | entry_starred: 'Wpis oznaczony gwiazdką' |
591 | entry_unstarred: 'Wpis odznaczony gwiazdką' | 592 | entry_unstarred: 'Wpis odznaczony gwiazdką' |
592 | entry_deleted: 'Wpis usunięty' | 593 | entry_deleted: 'Wpis usunięty' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Tag dodany' | 597 | tag_added: 'Tag dodany' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 78df254f..7932d7ab 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Adicionar uma nova entrada' | 37 | add_new_entry: 'Adicionar uma nova entrada' |
38 | search: 'Pesquisa' | 38 | search: 'Pesquisa' |
39 | filter_entries: 'Filtrar entradas' | 39 | filter_entries: 'Filtrar entradas' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Exportar' | 41 | export: 'Exportar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Digite aqui sua pesquisa' | 43 | input_label: 'Digite aqui sua pesquisa' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Entrada destacada' | 591 | entry_starred: 'Entrada destacada' |
591 | entry_unstarred: 'Entrada não destacada' | 592 | entry_unstarred: 'Entrada não destacada' |
592 | entry_deleted: 'Entrada apagada' | 593 | entry_deleted: 'Entrada apagada' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | tag_added: 'Tag adicionada' | 597 | tag_added: 'Tag adicionada' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 8312ca15..4d091f03 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Introdu un nou articol' | 37 | add_new_entry: 'Introdu un nou articol' |
38 | search: 'Căutare' | 38 | search: 'Căutare' |
39 | filter_entries: 'Filtrează articolele' | 39 | filter_entries: 'Filtrează articolele' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | # export: 'Export' | 41 | # export: 'Export' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Introdu căutarea ta' | 43 | input_label: 'Introdu căutarea ta' |
@@ -590,6 +591,7 @@ flashes: | |||
590 | entry_starred: 'Articol adăugat la favorite' | 591 | entry_starred: 'Articol adăugat la favorite' |
591 | entry_unstarred: 'Articol șters de la favorite' | 592 | entry_unstarred: 'Articol șters de la favorite' |
592 | entry_deleted: 'Articol șters' | 593 | entry_deleted: 'Articol șters' |
594 | # no_random_entry: 'No article with these criterias was found' | ||
593 | tag: | 595 | tag: |
594 | notice: | 596 | notice: |
595 | # tag_added: 'Tag added' | 597 | # tag_added: 'Tag added' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index f14aad12..cc327ae4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -36,6 +36,7 @@ menu: | |||
36 | add_new_entry: 'Добавить новую запись' | 36 | add_new_entry: 'Добавить новую запись' |
37 | search: 'Поиск' | 37 | search: 'Поиск' |
38 | filter_entries: 'Фильтр записей' | 38 | filter_entries: 'Фильтр записей' |
39 | # random_entry: Jump to a random entry from that list | ||
39 | export: 'Экспорт' | 40 | export: 'Экспорт' |
40 | search_form: | 41 | search_form: |
41 | input_label: 'Введите текст для поиска' | 42 | input_label: 'Введите текст для поиска' |
@@ -555,6 +556,7 @@ flashes: | |||
555 | entry_starred: 'Запись помечена звездочкой' | 556 | entry_starred: 'Запись помечена звездочкой' |
556 | entry_unstarred: 'Пометка звездочкой у записи убрана' | 557 | entry_unstarred: 'Пометка звездочкой у записи убрана' |
557 | entry_deleted: 'Запись удалена' | 558 | entry_deleted: 'Запись удалена' |
559 | # no_random_entry: 'No article with these criterias was found' | ||
558 | tag: | 560 | tag: |
559 | notice: | 561 | notice: |
560 | tag_added: 'Тег добавлен' | 562 | tag_added: 'Тег добавлен' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 7dbb1399..148aa541 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'เพิ่มรายการใหม่' | 37 | add_new_entry: 'เพิ่มรายการใหม่' |
38 | search: 'ค้นหา' | 38 | search: 'ค้นหา' |
39 | filter_entries: 'ตัวกรองรายการ' | 39 | filter_entries: 'ตัวกรองรายการ' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'นำข้อมูลออก' | 41 | export: 'นำข้อมูลออก' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'ค้นหาที่นี้' | 43 | input_label: 'ค้นหาที่นี้' |
@@ -588,6 +589,7 @@ flashes: | |||
588 | entry_starred: 'รายการที่แสดง' | 589 | entry_starred: 'รายการที่แสดง' |
589 | entry_unstarred: 'รายการที่ไม่ได้แสดง' | 590 | entry_unstarred: 'รายการที่ไม่ได้แสดง' |
590 | entry_deleted: 'รายการที่ถูกลบ' | 591 | entry_deleted: 'รายการที่ถูกลบ' |
592 | # no_random_entry: 'No article with these criterias was found' | ||
591 | tag: | 593 | tag: |
592 | notice: | 594 | notice: |
593 | tag_added: 'แท็กที่เพิ่ม' | 595 | tag_added: 'แท็กที่เพิ่ม' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index b4bc04d0..6fb9852a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -37,6 +37,7 @@ menu: | |||
37 | add_new_entry: 'Yeni bir makale ekle' | 37 | add_new_entry: 'Yeni bir makale ekle' |
38 | search: 'Ara' | 38 | search: 'Ara' |
39 | filter_entries: 'Filtrele' | 39 | filter_entries: 'Filtrele' |
40 | # random_entry: Jump to a random entry from that list | ||
40 | export: 'Dışa Aktar' | 41 | export: 'Dışa Aktar' |
41 | search_form: | 42 | search_form: |
42 | input_label: 'Aramak istediğiniz herhangi bir şey yazın' | 43 | input_label: 'Aramak istediğiniz herhangi bir şey yazın' |
@@ -568,6 +569,7 @@ flashes: | |||
568 | entry_starred: 'Makale favorilere eklendi' | 569 | entry_starred: 'Makale favorilere eklendi' |
569 | entry_unstarred: 'Makale favorilerden çıkartıldı' | 570 | entry_unstarred: 'Makale favorilerden çıkartıldı' |
570 | entry_deleted: 'Makale silindi' | 571 | entry_deleted: 'Makale silindi' |
572 | # no_random_entry: 'No article with these criterias was found' | ||
571 | tag: | 573 | tag: |
572 | notice: | 574 | notice: |
573 | tag_added: 'Etiket eklendi' | 575 | tag_added: 'Etiket eklendi' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 832112be..fb296c9d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -20,6 +20,9 @@ | |||
20 | 20 | ||
21 | {% block content %} | 21 | {% block content %} |
22 | {% set currentRoute = app.request.attributes.get('_route') %} | 22 | {% set currentRoute = app.request.attributes.get('_route') %} |
23 | {% if currentRoute == 'homepage' %} | ||
24 | {% set currentRoute = 'unread' %} | ||
25 | {% endif %} | ||
23 | {% set listMode = app.user.config.listMode %} | 26 | {% set listMode = app.user.config.listMode %} |
24 | <div class="results"> | 27 | <div class="results"> |
25 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | 28 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> |
@@ -28,6 +31,9 @@ | |||
28 | {% if app.user.config.rssToken %} | 31 | {% if app.user.config.rssToken %} |
29 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} | 32 | {% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %} |
30 | {% endif %} | 33 | {% endif %} |
34 | {% if currentRoute in ['unread', 'starred', 'archive', 'untagged', 'all'] %} | ||
35 | <a href="{{ path('random_entry', { 'type': currentRoute }) }}"><i class="btn-clickable material-icons md-24 js-random-action">casino</i></a> | ||
36 | {% endif %} | ||
31 | <i class="btn-clickable download-btn material-icons md-24 js-export-action">file_download</i> | 37 | <i class="btn-clickable download-btn material-icons md-24 js-export-action">file_download</i> |
32 | <i class="btn-clickable filter-btn material-icons md-24 js-filters-action">filter_list</i> | 38 | <i class="btn-clickable filter-btn material-icons md-24 js-filters-action">filter_list</i> |
33 | {% if entries.getNbPages > 1 %} | 39 | {% if entries.getNbPages > 1 %} |
@@ -90,9 +96,6 @@ | |||
90 | {% if tag is defined %} | 96 | {% if tag is defined %} |
91 | {% set currentTag = tag %} | 97 | {% set currentTag = tag %} |
92 | {% endif %} | 98 | {% endif %} |
93 | {% if currentRoute == 'homepage' %} | ||
94 | {% set currentRoute = 'unread' %} | ||
95 | {% endif %} | ||
96 | <h2>{{ 'entry.list.export_title'|trans }}</h2> | 99 | <h2>{{ 'entry.list.export_title'|trans }}</h2> |
97 | <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">×</a> | 100 | <a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">×</a> |
98 | <ul> | 101 | <ul> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 742dd330..067c8975 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -21,6 +21,9 @@ | |||
21 | {% block content %} | 21 | {% block content %} |
22 | {% set listMode = app.user.config.listMode %} | 22 | {% set listMode = app.user.config.listMode %} |
23 | {% set currentRoute = app.request.attributes.get('_route') %} | 23 | {% set currentRoute = app.request.attributes.get('_route') %} |
24 | {% if currentRoute == 'homepage' %} | ||
25 | {% set currentRoute = 'unread' %} | ||
26 | {% endif %} | ||
24 | <div class="results"> | 27 | <div class="results"> |
25 | <div class="nb-results"> | 28 | <div class="nb-results"> |
26 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | 29 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} |
@@ -60,9 +63,6 @@ | |||
60 | {% if tag is defined %} | 63 | {% if tag is defined %} |
61 | {% set currentTag = tag.slug %} | 64 | {% set currentTag = tag.slug %} |
62 | {% endif %} | 65 | {% endif %} |
63 | {% if currentRoute == 'homepage' %} | ||
64 | {% set currentRoute = 'unread' %} | ||
65 | {% endif %} | ||
66 | <h4 class="center">{{ 'entry.list.export_title'|trans }}</h4> | 66 | <h4 class="center">{{ 'entry.list.export_title'|trans }}</h4> |
67 | <ul> | 67 | <ul> |
68 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub', 'tag' : currentTag }) }}">EPUB</a></li>{% endif %} | 68 | {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub', 'tag' : currentTag }) }}">EPUB</a></li>{% endif %} |
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 052a8c01..b9c45567 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -46,6 +46,8 @@ | |||
46 | {% set activeRoute = 'starred' %} | 46 | {% set activeRoute = 'starred' %} |
47 | {% elseif currentRoute == 'unread' or currentRoute == 'homepage' or currentRouteFromQueryParams == 'unread' %} | 47 | {% elseif currentRoute == 'unread' or currentRoute == 'homepage' or currentRouteFromQueryParams == 'unread' %} |
48 | {% set activeRoute = 'unread' %} | 48 | {% set activeRoute = 'unread' %} |
49 | {% elseif currentRoute == 'untagged' %} | ||
50 | {% set activeRoute = 'untagged' %} | ||
49 | {% endif %} | 51 | {% endif %} |
50 | 52 | ||
51 | <li class="bold {% if activeRoute == 'unread' %}active{% endif %}"> | 53 | <li class="bold {% if activeRoute == 'unread' %}active{% endif %}"> |
@@ -113,6 +115,13 @@ | |||
113 | <i class="material-icons">search</i> | 115 | <i class="material-icons">search</i> |
114 | </a> | 116 | </a> |
115 | </li> | 117 | </li> |
118 | {% if activeRoute %} | ||
119 | <li id="button_random"> | ||
120 | <a class="waves-effect tooltipped js-random-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.random_entry'|trans }}" href="{{ path('random_entry', { 'type': activeRoute }) }}"> | ||
121 | <i class="material-icons">casino</i> | ||
122 | </a> | ||
123 | </li> | ||
124 | {% endif %} | ||
116 | <li id="button_filters"> | 125 | <li id="button_filters"> |
117 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> | 126 | <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters"> |
118 | <i class="material-icons">filter_list</i> | 127 | <i class="material-icons">filter_list</i> |
@@ -125,7 +134,7 @@ | |||
125 | </li> | 134 | </li> |
126 | </ul> | 135 | </ul> |
127 | </div> | 136 | </div> |
128 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }} | 137 | {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': currentRoute})) }} |
129 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} | 138 | {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }} |
130 | </div> | 139 | </div> |
131 | </nav> | 140 | </nav> |