diff options
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/config/services.yml | 2 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index 6a11892e..e0942b1a 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml | |||
@@ -17,7 +17,7 @@ services: | |||
17 | - "@security.token_storage" | 17 | - "@security.token_storage" |
18 | - "@doctrine.orm.entity_manager" | 18 | - "@doctrine.orm.entity_manager" |
19 | - "@wallabag_core.content_proxy" | 19 | - "@wallabag_core.content_proxy" |
20 | - %pocket_consumer_key% | 20 | - "@craue_config" |
21 | calls: | 21 | calls: |
22 | - [ setClient, [ "@wallabag_import.pocket.client" ] ] | 22 | - [ setClient, [ "@wallabag_import.pocket.client" ] ] |
23 | - [ setLogger, [ "@logger" ]] | 23 | - [ setLogger, [ "@logger" ]] |
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') }}"> |