Added random feature

This commit is contained in:
Nicolas Lœuillet
2017-12-22 15:44:00 +01:00
committed by Jeremy Benoist
parent c73025ad8b
commit 09ef25c3c3
18 changed files with 169 additions and 10 deletions

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Artikel markeret som favorit'
entry_unstarred: 'Artikel ikke længere markeret som favorit'
entry_deleted: 'Artikel slettet'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
# tag_added: 'Tag added'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Eintrag favorisiert'
entry_unstarred: 'Eintrag defavorisiert'
entry_deleted: 'Eintrag gelöscht'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Tag hinzugefügt'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Entry starred'
entry_unstarred: 'Entry unstarred'
entry_deleted: 'Entry deleted'
no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Tag added'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Artículo marcado como favorito'
entry_unstarred: 'Artículo desmarcado como favorito'
entry_deleted: 'Artículo eliminado'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Etiqueta añadida'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'مقاله برگزیده شد'
entry_unstarred: 'مقاله نابرگزیده شد'
entry_deleted: 'مقاله پاک شد'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'برچسب افزوده شد'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: "Article ajouté dans les favoris"
entry_unstarred: "Article retiré des favoris"
entry_deleted: "Article supprimé"
no_random_entry: "Aucun article correspond aux critères n'a été trouvé"
tag:
notice:
tag_added: "Tag ajouté"

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Contenuto segnato come preferito'
entry_unstarred: 'Contenuto rimosso dai preferiti'
entry_deleted: 'Contenuto eliminato'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Etichetta aggiunta'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Article ajustat dins los favorits'
entry_unstarred: 'Article quitat dels favorits'
entry_deleted: 'Article suprimit'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Etiqueta ajustada'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Wpis oznaczony gwiazdką'
entry_unstarred: 'Wpis odznaczony gwiazdką'
entry_deleted: 'Wpis usunięty'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Tag dodany'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Entrada destacada'
entry_unstarred: 'Entrada não destacada'
entry_deleted: 'Entrada apagada'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Tag adicionada'

View File

@ -590,6 +590,7 @@ flashes:
entry_starred: 'Articol adăugat la favorite'
entry_unstarred: 'Articol șters de la favorite'
entry_deleted: 'Articol șters'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
# tag_added: 'Tag added'

View File

@ -555,6 +555,7 @@ flashes:
entry_starred: 'Запись помечена звездочкой'
entry_unstarred: 'Пометка звездочкой у записи убрана'
entry_deleted: 'Запись удалена'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Тег добавлен'

View File

@ -588,6 +588,7 @@ flashes:
entry_starred: 'รายการที่แสดง'
entry_unstarred: 'รายการที่ไม่ได้แสดง'
entry_deleted: 'รายการที่ถูกลบ'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'แท็กที่เพิ่ม'

View File

@ -568,6 +568,7 @@ flashes:
entry_starred: 'Makale favorilere eklendi'
entry_unstarred: 'Makale favorilerden çıkartıldı'
entry_deleted: 'Makale silindi'
# no_random_entry: 'No article with these criterias was found'
tag:
notice:
tag_added: 'Etiket eklendi'

View File

@ -20,11 +20,15 @@
{% block content %}
{% set currentRoute = app.request.attributes.get('_route') %}
{% if currentRoute == 'homepage' %}
{% set currentRoute = 'unread' %}
{% endif %}
{% set listMode = app.user.config.listMode %}
<div class="results">
<div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
<div class="pagination">
<a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-24">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a>
<a href="{{ path(currentRoute ~ '_random') }}">random</a>
{% if app.user.config.rssToken %}
{% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %}
{% endif %}
@ -89,9 +93,6 @@
{% set currentTag = null %}
{% if tag is defined %}
{% set currentTag = tag %}
{% endif %}
{% if currentRoute == 'homepage' %}
{% set currentRoute = 'unread' %}
{% endif %}
<h2>{{ 'entry.list.export_title'|trans }}</h2>
<a href="javascript: void(null);" id="download-form-close" class="close-button--popup close-button">&times;</a>

View File

@ -21,10 +21,14 @@
{% block content %}
{% set listMode = app.user.config.listMode %}
{% set currentRoute = app.request.attributes.get('_route') %}
{% if currentRoute == 'homepage' %}
{% set currentRoute = 'unread' %}
{% endif %}
<div class="results">
<div class="nb-results">
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
<a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
<a href="{{ path(currentRoute ~ '_random') }}">random</a>
{% if app.user.config.rssToken %}
{% include "@WallabagCore/themes/common/Entry/_rss_link.html.twig" %}
{% endif %}
@ -59,9 +63,6 @@
{% set currentTag = null %}
{% if tag is defined %}
{% set currentTag = tag.slug %}
{% endif %}
{% if currentRoute == 'homepage' %}
{% set currentRoute = 'unread' %}
{% endif %}
<h4 class="center">{{ 'entry.list.export_title'|trans }}</h4>
<ul>