Merge pull request #1612 from wallabag/v2-settings-page

Settings page
2016-02-04 15:59:57 +01:00
parent 74f39b0952 79b9e49d94
commit e008c037f5
40 changed files with 510 additions and 245 deletions
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@ -15,6 +15,7 @@ class PocketController extends Controller
    {
        return $this->render('WallabagImportBundle:Pocket:index.html.twig', [
            'import' => $this->get('wallabag_import.pocket.import'),
+            'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true,
        ]);
    }