diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-15 09:23:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-15 09:23:44 +0100 |
commit | d213219ec785db757dba455acd53480ab0d292fb (patch) | |
tree | f217aca8f706fab417b00881c4053bde2f7aca90 /src/Wallabag | |
parent | decf651bbdf0d21727769640bab85115081c92b9 (diff) | |
parent | a8c6f29f3ee51ccfcce2e24ec352d9d48a34fc56 (diff) | |
download | wallabag-d213219ec785db757dba455acd53480ab0d292fb.tar.gz wallabag-d213219ec785db757dba455acd53480ab0d292fb.tar.zst wallabag-d213219ec785db757dba455acd53480ab0d292fb.zip |
Merge pull request #2570 from wallabag/add-creation-date
Added creation date on entries view
Diffstat (limited to 'src/Wallabag')
4 files changed, 13 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 6871bbcf..d7e839b2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -462,7 +462,7 @@ flashes: | |||
462 | rss_token_updated: "Jeton RSS mis à jour" | 462 | rss_token_updated: "Jeton RSS mis à jour" |
463 | entry: | 463 | entry: |
464 | notice: | 464 | notice: |
465 | entry_already_saved: "Article déjà sauvergardé le %date%" | 465 | entry_already_saved: "Article déjà sauvegardé le %date%" |
466 | entry_saved: "Article enregistré" | 466 | entry_saved: "Article enregistré" |
467 | entry_saved_failed: "Article enregistré mais impossible de récupérer le contenu" | 467 | entry_saved_failed: "Article enregistré mais impossible de récupérer le contenu" |
468 | entry_updated: "Article mis à jour" | 468 | entry_updated: "Article mis à jour" |
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 0f1c010f..56a0faac 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 | |||
@@ -34,6 +34,11 @@ | |||
34 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | 34 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} |
35 | {% endif %} | 35 | {% endif %} |
36 | </span> | 36 | </span> |
37 | <span class="tool created-at"> | ||
38 | <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}"> | ||
39 | {{ entry.createdAt|date('Y-m-d') }} | ||
40 | </i> | ||
41 | </span> | ||
37 | </div> | 42 | </div> |
38 | 43 | ||
39 | <ul class="tools links"> | 44 | <ul class="tools links"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index a046f7cf..cd4ed3fa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -14,7 +14,9 @@ | |||
14 | <header class="w600p center mbm"> | 14 | <header class="w600p center mbm"> |
15 | <h1 class="logo"> | 15 | <h1 class="logo"> |
16 | {% block logo %} | 16 | {% block logo %} |
17 | <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /> | 17 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> |
18 | <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /> | ||
19 | </a> | ||
18 | {% endblock %} | 20 | {% endblock %} |
19 | </h1> | 21 | </h1> |
20 | </header> | 22 | </header> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig index 9f696d06..56442116 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig | |||
@@ -1,7 +1,10 @@ | |||
1 | <div class="card-action"> | 1 | <div class="card-action"> |
2 | <span class="reading-time grey-text"> | 2 | <span class="reading-time grey-text"> |
3 | <i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i> | 3 | <i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i> |
4 | {{ entry.readingTime / app.user.config.readingSpeed|round }} min | 4 | {{ entry.readingTime / app.user.config.readingSpeed|round }} min |
5 | |||
6 | <i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i> | ||
7 | <span class="hide-on-med-and-down"> {{ entry.createdAt|date('Y-m-d') }}</span> | ||
5 | </span> | 8 | </span> |
6 | 9 | ||
7 | <ul class="tools right"> | 10 | <ul class="tools right"> |