aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Wallabag/ApiBundle/Controller/DeveloperController.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig6
4 files changed, 9 insertions, 0 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/DeveloperController.php b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
index 9cb1b626..15aca0ba 100644
--- a/src/Wallabag/ApiBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
@@ -23,6 +23,7 @@ class DeveloperController extends Controller
23 23
24 return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [ 24 return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
25 'clients' => $clients, 25 'clients' => $clients,
26 'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
26 ]); 27 ]);
27 } 28 }
28 29
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 8e7e3c2c..b96a23a0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -452,6 +452,7 @@ developer:
452 field_uris: 'Redirect URIs' 452 field_uris: 'Redirect URIs'
453 field_grant_types: 'Grant type allowed' 453 field_grant_types: 'Grant type allowed'
454 no_client: 'No client yet.' 454 no_client: 'No client yet.'
455 show_qrcode_iphone: 'Show QRCode iphone'
455 remove: 456 remove:
456 warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !' 457 warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
457 warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." 458 warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 4f49f777..4357b7ca 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -452,6 +452,7 @@ developer:
452 field_uris: "Adresse de redirection" 452 field_uris: "Adresse de redirection"
453 field_grant_types: "Type de privilège accordé" 453 field_grant_types: "Type de privilège accordé"
454 no_client: "Aucun client pour le moment" 454 no_client: "Aucun client pour le moment"
455 show_qrcode_iphone: 'Voir le QRCode iphone'
455 remove: 456 remove:
456 warn_message_1: "Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !" 457 warn_message_1: "Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !"
457 warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag." 458 warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag."
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 3430c0d4..99f8ed29 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -52,6 +52,12 @@
52 {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> 52 {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
53 {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/> 53 {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
54 <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a> 54 <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
55 <a class="waves-effect waves-light btn" href="">{{ 'developer.existing_clients.show_qrcode_iphone'|trans }}</a>
56 <img id="iphoneQrcode{{ client.id }}" />
57 <script>
58 const imgBase64 = jrQrcode.getQrBase64('wallabagv2://{{ app.user.username }}%%{{ wallabag_url }}%%{{ client.id }}_{{ client.randomId }}%%{{ client.secret }}');
59 document.getElementById('iphoneQrcode{{ client.id }}').src = imgBase64;
60 </script>
55 </p> 61 </p>
56 </div> 62 </div>
57 </li> 63 </li>