From cb48a569e0ea76a7f6ce1275ae6144d3497deb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 9 Apr 2016 21:34:50 +0200 Subject: Fix internal settings Fix #1867: remove download_picture setting and manage show_printlink in material theme --- src/Wallabag/CoreBundle/Command/InstallCommand.php | 5 ----- src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php | 5 ----- .../CoreBundle/Resources/translations/messages.en.yml | 2 +- .../Resources/views/themes/baggy/Entry/entry.html.twig | 2 +- .../Resources/views/themes/material/Entry/entry.html.twig | 11 +++++++++++ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 6665f4b5..c5a5a519 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -231,11 +231,6 @@ class InstallCommand extends ContainerAwareCommand $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute(); $settings = [ - [ - 'name' => 'download_pictures', - 'value' => '1', - 'section' => 'entry', - ], [ 'name' => 'carrot', 'value' => '1', diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php index 1f4cafdf..09058796 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php @@ -15,11 +15,6 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface public function load(ObjectManager $manager) { $settings = [ - [ - 'name' => 'download_pictures', - 'value' => '1', - 'section' => 'entry', - ], [ 'name' => 'carrot', 'value' => '1', diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 3dc22998..8f3e4267 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -176,7 +176,7 @@ entry: set_as_read: 'Mark as read' set_as_unread: 'Mark as unread' set_as_favorite: 'Favorite' - view_original_article: 'Orignal article' + view_original_article: 'Original article' re_fetch_content: 'Re-fetch content' delete: 'Delete' add_a_tag: 'Add a tag' 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 3cda3949..5a800332 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 @@ -22,7 +22,7 @@ {% if craue_setting('share_shaarli') %}
  • shaarli
  • {% endif %} {% if craue_setting('share_diaspora') %}
  • diaspora
  • {% endif %} {% if craue_setting('carrot') %}
  • Carrot
  • {% endif %} - {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.re_fetch_content'|trans }}
  • {% endif %} + {% if craue_setting('show_printlink') %}
  • {{ 'entry.view.left_menu.print'|trans }}
  • {% endif %} {% if craue_setting('export_epub') %}
  • EPUB
  • {% endif %} {% if craue_setting('export_mobi') %}
  • MOBI
  • {% endif %} {% if craue_setting('export_pdf') %}
  • PDF
  • {% endif %} 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 66435699..e89aea3a 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 @@ -138,6 +138,17 @@ + {% if craue_setting('show_printlink') %} +
  • + + + {{ 'entry.view.left_menu.print'|trans }} + +
    +
  • + {% endif %} + +
  • -- cgit v1.2.3