From 39f27d6370c5d280375b2e1f93de464ecf5f4f96 Mon Sep 17 00:00:00 2001 From: Simounet Date: Mon, 6 Jun 2016 20:59:20 +0200 Subject: Handling socials links into a config file --- .../CoreBundle/Controller/FooterController.php | 26 ++++++++++++++ .../CoreBundle/Controller/StaticController.php | 3 +- .../DependencyInjection/WallabagCoreExtension.php | 1 + .../CoreBundle/Resources/config/parameters.yml | 12 +++++++ .../views/themes/baggy/Static/howto.html.twig | 10 +++--- .../views/themes/material/Static/howto.html.twig | 10 +++--- .../views/themes/material/footer.html.twig | 41 +++++++++++++++++++++ .../views/themes/material/layout.html.twig | 42 +--------------------- 8 files changed, 93 insertions(+), 52 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Controller/FooterController.php create mode 100644 src/Wallabag/CoreBundle/Resources/config/parameters.yml create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php new file mode 100644 index 00000000..de809332 --- /dev/null +++ b/src/Wallabag/CoreBundle/Controller/FooterController.php @@ -0,0 +1,26 @@ +container->getParameter('addons_url'); + $socialsUrl = $this->container->getParameter('socials_url'); + return $this->render( + 'WallabagCoreBundle::footer.html.twig', + [ + 'addonsUrl' => $addonsUrl, + 'socialsUrl' => $socialsUrl + ] + ); + } +} diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index b41302f8..f5fcabd8 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php @@ -12,9 +12,10 @@ class StaticController extends Controller */ public function howtoAction() { + $addonsUrl = $this->container->getParameter('addons_url'); return $this->render( 'WallabagCoreBundle:Static:howto.html.twig', - [] + ['addonsUrl' => $addonsUrl] ); } diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php index 84599f0d..7d08b73b 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php @@ -25,6 +25,7 @@ class WallabagCoreExtension extends Extension $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); + $loader->load('parameters.yml'); } public function getAlias() diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml new file mode 100644 index 00000000..43297261 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml @@ -0,0 +1,12 @@ +parameters: + addons_url: + firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/ + chrome: https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj + f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche + google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche + ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8 + windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646 + socials_url: + twitter: https://twitter.com/wallabagapp + google_plus: https://plus.google.com/+WallabagOrg/posts + facebook: https://facebook.com/Wallabag diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig index eab092c7..b529a0ac 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig @@ -11,14 +11,14 @@

{{ 'howto.top_menu.browser_addons'|trans }}

{{ 'howto.top_menu.mobile_apps'|trans }}

{{ 'howto.top_menu.bookmarklet'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 4354a6b7..6a177d6b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -18,17 +18,17 @@

{{ 'howto.top_menu.browser_addons'|trans }}
{{ 'howto.top_menu.mobile_apps'|trans }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig new file mode 100644 index 00000000..7cb19966 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig @@ -0,0 +1,41 @@ + 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 33d9e08f..a5c16792 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -122,45 +122,5 @@ {% endblock %} {% block footer %} - + {{ render(controller("WallabagCoreBundle:Footer:index")) }} {% endblock %} -- cgit v1.2.3 From f64472e9f86fad715e6616bc2932dffb8aed5a67 Mon Sep 17 00:00:00 2001 From: Simounet Date: Wed, 20 Jul 2016 19:30:29 +0200 Subject: FIX image inside a figure element max-width --- src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index b106d91a..b4e082d3 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css @@ -345,7 +345,8 @@ main ul.row { max-width: 40em; } -#article img { +#article img, +#article figure { max-width: 100%; height: auto; } -- cgit v1.2.3 From 0e1abf392c6d3cf235e2449c58e9d19d75ed53d7 Mon Sep 17 00:00:00 2001 From: Simounet Date: Wed, 20 Jul 2016 20:23:55 +0200 Subject: FIX image inside a figure element max-width (baggy theme) --- .../CoreBundle/Resources/public/themes/baggy/css/ratatouille.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css index b203cbb8..605eb641 100644 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css @@ -64,7 +64,7 @@ pre { max-width: 61.25em;/*980px*/ } -table, img { +table, img, figure { max-width: 100%; height :auto; } -- cgit v1.2.3 From 40288b7166d35ce8433c9720a5278356dac617aa Mon Sep 17 00:00:00 2001 From: Simounet Date: Wed, 20 Jul 2016 22:55:43 +0200 Subject: Chrome extension URL updated --- src/Wallabag/CoreBundle/Resources/config/parameters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml index 43297261..abd9ab68 100644 --- a/src/Wallabag/CoreBundle/Resources/config/parameters.yml +++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml @@ -1,7 +1,7 @@ parameters: addons_url: firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/ - chrome: https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj + chrome: https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8 -- cgit v1.2.3 From 57c608fa94cdc148f5fc48b7c1e984bbf507e34b Mon Sep 17 00:00:00 2001 From: Simounet Date: Wed, 20 Jul 2016 23:08:04 +0200 Subject: php-cs-fixer pass --- src/Wallabag/CoreBundle/Controller/FooterController.php | 5 +++-- src/Wallabag/CoreBundle/Controller/StaticController.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php index de809332..fd93c436 100644 --- a/src/Wallabag/CoreBundle/Controller/FooterController.php +++ b/src/Wallabag/CoreBundle/Controller/FooterController.php @@ -7,7 +7,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; class FooterController extends Controller { /** - * Display the footer + * Display the footer. * * @return \Symfony\Component\HttpFoundation\Response */ @@ -15,11 +15,12 @@ class FooterController extends Controller { $addonsUrl = $this->container->getParameter('addons_url'); $socialsUrl = $this->container->getParameter('socials_url'); + return $this->render( 'WallabagCoreBundle::footer.html.twig', [ 'addonsUrl' => $addonsUrl, - 'socialsUrl' => $socialsUrl + 'socialsUrl' => $socialsUrl, ] ); } diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index f5fcabd8..2a57f06f 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php @@ -13,6 +13,7 @@ class StaticController extends Controller public function howtoAction() { $addonsUrl = $this->container->getParameter('addons_url'); + return $this->render( 'WallabagCoreBundle:Static:howto.html.twig', ['addonsUrl' => $addonsUrl] -- cgit v1.2.3 From 75ac3e6289088d060eb77375f5fe904f02ce5988 Mon Sep 17 00:00:00 2001 From: charno6 Date: Sat, 23 Jul 2016 22:40:23 +0200 Subject: Fixed typo in entry:notice:entry_saved "Eintag" to "Eintrag" --- src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 89cbbbf8..c98cf0fc 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -396,7 +396,7 @@ flashes: entry: notice: entry_already_saved: 'Eintrag bereits am %date% gespeichert' - entry_saved: 'Eintag gespeichert' + entry_saved: 'Eintrag gespeichert' # entry_saved_failed: 'Failed to save entry' entry_updated: 'Eintrag aktualisiert' entry_reloaded: 'Eintrag neugeladen' -- cgit v1.2.3 From 8f5e220327138581446c6dfabb1f47a8042b4e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 18 May 2016 15:02:00 +0200 Subject: Fix form user display when 2FA is disabled --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 5a90f227..afd5b499 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -158,7 +158,7 @@ {% endif %} {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} -- cgit v1.2.3 From e49c62fac85ad2a2aa23023094fe81713a5a19c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 12 Aug 2016 13:55:30 +0200 Subject: Fix form user display for baggy theme --- .../CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index c51f90d2..a8abe8d3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -134,7 +134,8 @@ {% endif %} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} + {{ form_widget(form.user.save) }}

{{ 'config.tab_menu.password'|trans }}

-- cgit v1.2.3 From 0cecfa25367742907d4833d0b9d0e23d8046913d Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 17 Aug 2016 14:18:28 +0200 Subject: CS --- .../CoreBundle/Form/DataTransformer/StringToListTransformer.php | 2 +- src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 4 +++- src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php index b712ad15..cb4bee83 100644 --- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php +++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php @@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface private $separator; /** - * @param string $separator The separator used in the list. + * @param string $separator The separator used in the list */ public function __construct($separator = ',') { diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 74c53bf0..7d25cc80 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php @@ -21,7 +21,9 @@ class ConfigType extends AbstractType { $this->themes = array_combine( $themes, - array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes) + array_map(function ($s) { + return ucwords(strtolower(str_replace('-', ' ', $s))); + }, $themes) ); $this->languages = $languages; diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php index 14ef4a64..239d09ae 100644 --- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php +++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php @@ -25,7 +25,7 @@ class RuleBasedTagger /** * Add tags from rules defined by the user. * - * @param Entry $entry Entry to tag. + * @param Entry $entry Entry to tag */ public function tag(Entry $entry) { @@ -49,7 +49,7 @@ class RuleBasedTagger * * @param User $user * - * @return array A list of modified entries. + * @return array A list of modified entries */ public function tagAllForUser(User $user) { @@ -75,7 +75,7 @@ class RuleBasedTagger /** * Fetch a tag. * - * @param string $label The tag's label. + * @param string $label The tag's label * * @return Tag */ -- cgit v1.2.3 From 519ba0b5e71cd9b5abd620f682fd2296e6180af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 18 Aug 2016 11:58:35 +0200 Subject: Replaced favorite word/icon with star one Fix #2041 --- src/Wallabag/CoreBundle/Controller/EntryController.php | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 4 ++-- src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 2 +- .../Resources/views/themes/baggy/Entry/entry.html.twig | 4 ++-- .../Resources/views/themes/material/Entry/entries.html.twig | 2 +- .../Resources/views/themes/material/Entry/entry.html.twig | 10 +++++----- src/Wallabag/ImportBundle/Import/PocketImport.php | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 4eb314f7..775dfccd 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -357,7 +357,7 @@ class EntryController extends Controller } /** - * Changes favorite status for an entry. + * Changes star status for an entry. * * @param Request $request * @param Entry $entry diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 213d5790..dd655a4c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Tilbage' set_as_read: 'Marker som læst' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Marker som favorit' + set_as_starred: 'Marker som favorit' view_original_article: 'Originalartikel' # re_fetch_content: 'Re-fetch content' delete: 'Slet' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index c98cf0fc..6e3d097a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Zurück' set_as_read: 'Als gelesen markieren' set_as_unread: 'Als ungelesen markieren' - set_as_favorite: 'Favorisieren' + set_as_starred: 'Favorisieren' view_original_article: 'Original-Artikel' re_fetch_content: 'Inhalt neu laden' delete: 'Löschen' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index b65e4522..e3f67905 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -146,7 +146,7 @@ entry: reading_time_less_one_minute: 'estimated reading time: < 1 min' original_article: 'original' toogle_as_read: 'Toggle mark as read' - toogle_as_star: 'Toggle favorite' + toogle_as_star: 'Toggle star' delete: 'Delete' export_title: 'Export' filters: @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Back' set_as_read: 'Mark as read' set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorite' + set_as_starred: 'Toggle star' view_original_article: 'Original article' re_fetch_content: 'Re-fetch content' delete: 'Delete' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 75978f16..925f0fdd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Regrese a la página principal' set_as_read: 'Marcar como leído' set_as_unread: 'Marcar como no leído' - set_as_favorite: 'Marcar como favorito' + set_as_starred: 'Marcar como favorito' view_original_article: 'Artículo original' re_fetch_content: 'Redescargar el contenido' delete: 'Suprimir' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index db6e5960..9463dfc7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'بازگشت' set_as_read: 'خوانده‌شده' set_as_unread: 'به عنوان خوانده‌نشده علامت بزن' - set_as_favorite: 'برگزیده' + set_as_starred: 'برگزیده' view_original_article: 'مقالهٔ اصلی' re_fetch_content: 'مقاله‌ها را دوباره دریافت کن' delete: 'پاک کردن' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 94300596..35d23c1d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Retour' set_as_read: 'Marquer comme lu' set_as_unread: 'Marquer comme non lu' - set_as_favorite: 'Mettre en favori' + set_as_starred: 'Mettre en favori' view_original_article: 'Article original' re_fetch_content: 'Recharger le contenu' delete: 'Supprimer' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 00ed9c98..d4b0ef04 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -175,7 +175,7 @@ entry: back_to_homepage: 'Indietro' set_as_read: 'Segna come già letto' set_as_unread: 'Segna come da leggere' - set_as_favorite: 'Segna come preferito' + set_as_starred: 'Segna come preferito' view_original_article: 'Contenuto originale' re_fetch_content: 'Ri-ottieni pagina' delete: 'Elimina' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index c81c852b..d777357b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Tornar' set_as_read: 'Marcar coma legit' set_as_unread: 'Marcar coma pas legit' - set_as_favorite: 'Metre en favori' + set_as_starred: 'Metre en favori' view_original_article: 'Article original' re_fetch_content: 'Tornar cargar lo contengut' delete: 'Suprimir' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 3707a857..db1501fe 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Cofnij' set_as_read: 'Oznacz jako przeczytane' set_as_unread: 'Oznacz jako nieprzeczytane' - set_as_favorite: 'Ulubione' + set_as_starred: 'Ulubione' view_original_article: 'Oryginalny artykuł' re_fetch_content: 'Pobierz ponownie treść' delete: 'Usuń' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 27be1edc..5550dd29 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Înapoi' set_as_read: 'Marchează ca citit' # set_as_unread: 'Mark as unread' - set_as_favorite: 'Favorit' + set_as_starred: 'Favorit' view_original_article: 'Articol original' # re_fetch_content: 'Re-fetch content' delete: 'Șterge' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 85ee7316..29ed6b25 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -176,7 +176,7 @@ entry: back_to_homepage: 'Back' set_as_read: 'Okundu olarak işaretle' set_as_unread: 'Okunmadı olarak işaretle' - set_as_favorite: 'Favorilere ekle/çıkar' + set_as_starred: 'Favorilere ekle/çıkar' view_original_article: 'Orijinal makale' re_fetch_content: 'İçeriği yenile' delete: 'Sil' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 5a800332..7808b4dd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -14,7 +14,7 @@
  • {{ entry.domainName|removeWww }}
  • {{ 'entry.view.left_menu.re_fetch_content'|trans }}
  • {% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}
    • -
  • {{ 'entry.view.left_menu.set_as_favorite'|trans }}
    • +
  • {{ 'entry.view.left_menu.set_as_starred'|trans }}
  • {{ 'entry.view.left_menu.add_a_tag'|trans }}
  • {{ 'entry.view.left_menu.delete'|trans }}
    • {% if craue_setting('share_twitter') %}
    • {% endif %} @@ -72,7 +72,7 @@ $("body").css("cursor", "auto"); });*/ - // toggle favorite property of current article + // toggle star property of current article /* $('#setFav').click(function(){ $("body").css("cursor", "wait"); $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done( 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 920fa933..c8e4a533 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 @@ -77,7 +77,7 @@
    • - +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index e89aea3a..fca112dc 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -24,8 +24,8 @@
  • - - + +
  • @@ -70,9 +70,9 @@
  • - - - {{ 'entry.view.left_menu.set_as_favorite'|trans }} + + + {{ 'entry.view.left_menu.set_as_starred'|trans }}
    • diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 29361a32..19b63f17 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php @@ -226,7 +226,7 @@ class PocketImport implements ImportInterface $entry->setArchived(true); } - // 0 or 1 - 1 If the item is favorited + // 0 or 1 - 1 If the item is starred if ($pocketEntry['favorite'] == 1) { $entry->setStarred(true); } -- cgit v1.2.3 From 4e1be104ab59201e3d482e4fd31b69b76697fb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 18 Aug 2016 15:23:19 +0200 Subject: Added creation date and reading time on article view Fix #2034 --- src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | 2 ++ src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 2 ++ .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 5 +++++ .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 5 +++++ 13 files changed, 32 insertions(+) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 213d5790..5e7d8949 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -144,6 +144,8 @@ entry: reading_time: 'estimeret læsetid' reading_time_minutes: 'estimeret læsetid: %readingTime% min' reading_time_less_one_minute: 'estimeret læsetid: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marker som læst' toogle_as_star: 'Skift favoritstatus' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index c98cf0fc..cb1644de 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -144,6 +144,8 @@ entry: reading_time: 'geschätzte Lesezeit' reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' reading_time_less_one_minute: 'geschätzte Lesezeit: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Gelesen-Status ändern' toogle_as_star: 'Favoriten-Status ändern' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index b65e4522..734f8533 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -144,6 +144,8 @@ entry: reading_time: 'estimated reading time' reading_time_minutes: 'estimated reading time: %readingTime% min' reading_time_less_one_minute: 'estimated reading time: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Toggle mark as read' toogle_as_star: 'Toggle favorite' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 75978f16..582526ef 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -144,6 +144,8 @@ entry: reading_time: 'tiempo estimado de lectura' reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' reading_time_less_one_minute: 'tiempo estimado de lectura: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marcar como leído/ no leído' toogle_as_star: 'Marcar como favorito/ no favorito' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index db6e5960..52b50ce9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -144,6 +144,8 @@ entry: reading_time: 'زمان تخمینی برای خواندن' reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' reading_time_less_one_minute: 'زمان تخمینی برای خواندن: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'خوانده‌شده/خوانده‌نشده' toogle_as_star: 'برگزیده/نابرگزیده' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 94300596..cc460477 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -144,6 +144,8 @@ entry: reading_time: 'durée de lecture' reading_time_minutes: 'durée de lecture: %readingTime% min' reading_time_less_one_minute: 'durée de lecture: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marquer comme lu/non lu' toogle_as_star: 'Marquer comme favori' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 00ed9c98..6d638e58 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -144,6 +144,8 @@ entry: reading_time: 'tempo di lettura stimato' reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' reading_time_less_one_minute: 'tempo di lettura stimato: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'originale' toogle_as_read: 'Segna come da leggere' toogle_as_star: 'Segna come non preferito' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index c81c852b..6fe2c4df 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -144,6 +144,8 @@ entry: reading_time: 'durada de lectura' reading_time_minutes: 'durada de lectura : %readingTime% min' reading_time_less_one_minute: 'durada de lectura : < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Marcar coma legit/pas legit' toogle_as_star: 'Marcar coma favorit' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 3707a857..35108f22 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -144,6 +144,8 @@ entry: reading_time: 'szacunkowy czas czytania' reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' reading_time_less_one_minute: 'szacunkowy czas czytania: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'oryginał' toogle_as_read: 'Oznacz jako przeczytane' toogle_as_star: 'Oznacz jako ulubione' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 27be1edc..2210d9e6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -144,6 +144,8 @@ entry: reading_time: 'timp estimat de citire' reading_time_minutes: 'timp estimat de citire: %readingTime% min' reading_time_less_one_minute: 'timp estimat de citire: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'original' toogle_as_read: 'Comută marcat ca citit' toogle_as_star: 'Comută marcat ca favorit' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 85ee7316..39f08ea3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -144,6 +144,8 @@ entry: reading_time: 'tahmini okuma süresi' reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' reading_time_less_one_minute: 'tahmini okuma süresi: < 1 min' + reading_time_minutes_short: '%readingTime% min' + reading_time_less_one_minute_short: '< 1 min' original_article: 'orijinal' toogle_as_read: 'Okundu/okunmadı olarak işaretle' toogle_as_star: 'Favorilere ekle/çıkar' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 5a800332..12b0bc53 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -29,6 +29,11 @@
  • {{ 'entry.view.left_menu.problem.label'|trans }}
    • +
    {{ entry.createdAt|date('Y-m-d') }}
    + {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} +
    {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} + {% else %}{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} + {% endif %}
    {% set nbAnnotations = entry.annotations | length %} {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}