From a74a6ca2b164447f2675a13840f862c2c4c672fd Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 31 Jan 2016 14:54:30 +0100 Subject: [PATCH] Add new export config --- .../translations/CraueConfigBundle.en.yml | 4 ++++ .../translations/CraueConfigBundle.fr.yml | 4 ++++ app/config/config.yml | 2 +- .../CoreBundle/Command/InstallCommand.php | 20 +++++++++++++++++++ .../DataFixtures/ORM/LoadSettingData.php | 20 +++++++++++++++++++ .../themes/material/Entry/entries.html.twig | 14 ++++++------- 6 files changed, 56 insertions(+), 8 deletions(-) diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index ea90460e..b5385dc3 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml @@ -4,6 +4,10 @@ diaspora_url: Diaspora URL, if the service is enabled export_epub: Enable ePub export export_mobi: Enable .mobi export export_pdf: Enable PDF export +export_csv: Enable CSV export +export_json: Enable JSON export +export_txt: Enable TXT export +export_xml: Enable XML export pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) shaarli_url: URL de Shaarli, if the service is enabled share_diaspora: Enable share to Diaspora diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index 19600045..0efe14f4 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml @@ -4,6 +4,10 @@ diaspora_url: URL de Diaspora, si le service Diaspora est activé export_epub: Activer l'export ePub export_mobi: Activer l'export .mobi export_pdf: Activer l'export PDF +export_csv: Activer l'export CSV +export_json: Activer l'export JSON +export_txt: Activer l'export TXT +export_xml: Activer l'export XML pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication) shaarli_url: URL de Shaarli, si le service Diaspora est activé share_diaspora: Activer le partage vers Diaspora diff --git a/app/config/config.yml b/app/config/config.yml index 3c278ea6..dc6bccee 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,7 +28,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.0-alpha.1 + version: 2.0.0-alpha.2 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index 096f306f..93792692 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -272,6 +272,26 @@ class InstallCommand extends ContainerAwareCommand 'value' => '1', 'section' => 'export', ], + [ + 'name' => 'export_csv', + 'value' => '1', + 'section' => 'export', + ], + [ + 'name' => 'export_json', + 'value' => '1', + 'section' => 'export', + ], + [ + 'name' => 'export_txt', + 'value' => '1', + 'section' => 'export', + ], + [ + 'name' => 'export_xml', + 'value' => '1', + 'section' => 'export', + ], [ 'name' => 'pocket_consumer_key', 'value' => null, diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php index 8e3c7b59..5e89c2a9 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php @@ -70,6 +70,26 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface 'value' => '1', 'section' => 'export', ], + [ + 'name' => 'export_csv', + 'value' => '1', + 'section' => 'export', + ], + [ + 'name' => 'export_json', + 'value' => '1', + 'section' => 'export', + ], + [ + 'name' => 'export_txt', + 'value' => '1', + 'section' => 'export', + ], + [ + 'name' => 'export_xml', + 'value' => '1', + 'section' => 'export', + ], [ 'name' => 'pocket_consumer_key', 'value' => null, 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 6de800b9..c86b8d88 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 @@ -99,13 +99,13 @@ {% endif %}

{% trans %}Export{% endtrans %}

-- 2.41.0