aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-12-24 15:22:56 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-02 23:27:41 +0100
commit0aa344dc247c77376fcbf2112191f9f8b3dfc846 (patch)
tree4b9b958e6652ae389af93e9ac2b6c05ec366fcd6 /src/Wallabag/ImportBundle/Resources
parent5a4bbcc9a76fcdf54a6af25fcf7b26c9053a0ba3 (diff)
downloadwallabag-0aa344dc247c77376fcbf2112191f9f8b3dfc846.tar.gz
wallabag-0aa344dc247c77376fcbf2112191f9f8b3dfc846.tar.zst
wallabag-0aa344dc247c77376fcbf2112191f9f8b3dfc846.zip
Update url & service name
Prefix ur with service namel: [service]_[route name] Add comment in Interface
Diffstat (limited to 'src/Wallabag/ImportBundle/Resources')
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/services.yml8
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig2
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index 82628f08..d77779eb 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -1,8 +1,8 @@
1services: 1services:
2 wallabag_import.import.pocket_import: 2 wallabag_import.pocket.import:
3 class: Wallabag\ImportBundle\Import\PocketImport 3 class: Wallabag\ImportBundle\Import\PocketImport
4 arguments: 4 arguments:
5 - @security.token_storage 5 - "@security.token_storage"
6 - @session 6 - "@session"
7 - @doctrine.orm.entity_manager 7 - "@doctrine.orm.entity_manager"
8 - %pocket_consumer_key% 8 - %pocket_consumer_key%
diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
index bdd57e5e..fda21f2d 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
@@ -8,7 +8,7 @@
8 <div class="card-panel settings"> 8 <div class="card-panel settings">
9 {% trans %}Welcome on wallabag importer. Please select your previous service that you want to migrate.{% endtrans %} 9 {% trans %}Welcome on wallabag importer. Please select your previous service that you want to migrate.{% endtrans %}
10 <ul> 10 <ul>
11 <li><a href="{{ path('pocket') }}">Pocket</a></li> 11 <li><a href="{{ path('pocket_import') }}">Pocket</a></li>
12 </ul> 12 </ul>
13 </div> 13 </div>
14 </div> 14 </div>
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index e6abc17b..df64e472 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,7 @@
7 <div class="col s12"> 7 <div class="col s12">
8 <div class="card-panel settings"> 8 <div class="card-panel settings">
9 {% 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 %} 9 {% 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 %}
10 <form method="post" action="{{ path('authpocket') }}"> 10 <form method="post" action="{{ path('pocket_auth') }}">
11 <input type="submit" value="Connect to Pocket and import data" /> 11 <input type="submit" value="Connect to Pocket and import data" />
12 </form> 12 </form>
13 </div> 13 </div>