diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-21 10:59:21 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-31 14:48:26 +0100 |
commit | 1e3ed714707878caa603ffdc262e64abb6ddfb5c (patch) | |
tree | 7aa58352b0a76a8c5efd78667fdf87a01289591a /src/Wallabag | |
parent | 63e40f2d7c4074aff0be587c828eb511a6b7c878 (diff) | |
download | wallabag-1e3ed714707878caa603ffdc262e64abb6ddfb5c.tar.gz wallabag-1e3ed714707878caa603ffdc262e64abb6ddfb5c.tar.zst wallabag-1e3ed714707878caa603ffdc262e64abb6ddfb5c.zip |
Add warning message for PocketImport
Warn user if pocket_consumer_key isn't defined
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/PocketController.php | 1 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 7aee302f..1c1b4fa8 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php | |||
@@ -15,6 +15,7 @@ class PocketController extends Controller | |||
15 | { | 15 | { |
16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ | 16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ |
17 | 'import' => $this->get('wallabag_import.pocket.import'), | 17 | 'import' => $this->get('wallabag_import.pocket.import'), |
18 | 'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true, | ||
18 | ]); | 19 | ]); |
19 | } | 20 | } |
20 | 21 | ||
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig index 643ad775..e0e36f38 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | |||
@@ -5,6 +5,12 @@ | |||
5 | <div class="row"> | 5 | <div class="row"> |
6 | <div class="col s12"> | 6 | <div class="col s12"> |
7 | <div class="card-panel settings"> | 7 | <div class="card-panel settings"> |
8 | {% if not has_consumer_key %} | ||
9 | <div class="card-panel red darken-1"> | ||
10 | {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %} | ||
11 | </div> | ||
12 | {% endif %} | ||
13 | |||
8 | <blockquote>{{ import.description|trans }}</blockquote> | 14 | <blockquote>{{ import.description|trans }}</blockquote> |
9 | <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p> | 15 | <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p> |
10 | <form method="post" action="{{ path('import_pocket_auth') }}"> | 16 | <form method="post" action="{{ path('import_pocket_auth') }}"> |