From: Jeremy Benoist Date: Tue, 15 Nov 2016 08:23:44 +0000 (+0100) Subject: Merge pull request #2570 from wallabag/add-creation-date X-Git-Tag: 2.1.4~7 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d213219ec785db757dba455acd53480ab0d292fb;hp=decf651bbdf0d21727769640bab85115081c92b9;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2570 from wallabag/add-creation-date Added creation date on entries view --- diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 4c3e4ce3..4dfa8790 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -413,7 +413,8 @@ footer a { margin-bottom: 2em; } -.estimatedTime .reading-time { +.reading-time, +.created-at { color: #999; font-style: italic; font-weight: normal; diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 48a7420a..408fe14c 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -644,10 +644,9 @@ a.original { margin: 0 auto; } -#article aside .tools li { +article aside .tools li { display: inline-flex; vertical-align: middle; - margin: auto 10px; } #article aside .tools a { 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: rss_token_updated: "Jeton RSS mis à jour" entry: notice: - entry_already_saved: "Article déjà sauvergardé le %date%" + entry_already_saved: "Article déjà sauvegardé le %date%" entry_saved: "Article enregistré" entry_saved_failed: "Article enregistré mais impossible de récupérer le contenu" 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 @@ {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} {% endif %} + + + {{ entry.createdAt|date('Y-m-d') }} + +