]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Add QRCode in Api clients management for each clients
authorMaxime <maxime.m62@gmail.com>
Fri, 7 Apr 2017 19:56:14 +0000 (21:56 +0200)
committerMaxime <maxime.m62@gmail.com>
Fri, 7 Apr 2017 19:56:14 +0000 (21:56 +0200)
src/Wallabag/ApiBundle/Controller/DeveloperController.php
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig

index 9cb1b626456884cd615ecb4178e0371b6dbdd330..15aca0bae19162b7bc9e40836e95ae76d6e45c7c 100644 (file)
@@ -23,6 +23,7 @@ class DeveloperController extends Controller
 
         return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
             'clients' => $clients,
+            'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
         ]);
     }
 
index 8e7e3c2ce7655932478f69ee1533bd055e29da38..b96a23a0bae6a2bfabc34ae12b70a17833c8b17d 100644 (file)
@@ -452,6 +452,7 @@ developer:
         field_uris: 'Redirect URIs'
         field_grant_types: 'Grant type allowed'
         no_client: 'No client yet.'
+        show_qrcode_iphone: 'Show QRCode iphone'
     remove:
         warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
         warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
index 4f49f777a69993141d58c6516db04567b4942997..4357b7ca3274d0a6b551090fc73eba5689a8cbf0 100644 (file)
@@ -452,6 +452,7 @@ developer:
         field_uris: "Adresse de redirection"
         field_grant_types: "Type de privilège accordé"
         no_client: "Aucun client pour le moment"
+        show_qrcode_iphone: 'Voir le QRCode iphone'
     remove:
         warn_message_1: "Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !"
         warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag."
index 3430c0d4fbba61d92534d0d706eb9fb93fed23d9..99f8ed2965f01681972c3d4947caca6f7f620944 100644 (file)
                                         {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
                                         {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
                                         <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
+                                        <a class="waves-effect waves-light btn" href="">{{ 'developer.existing_clients.show_qrcode_iphone'|trans }}</a>
+                                        <img id="iphoneQrcode{{ client.id }}" />
+                                        <script>
+                                            const imgBase64 = jrQrcode.getQrBase64('wallabagv2://{{ app.user.username }}%%{{ wallabag_url }}%%{{ client.id }}_{{ client.randomId }}%%{{ client.secret }}');
+                                            document.getElementById('iphoneQrcode{{ client.id }}').src = imgBase64;
+                                        </script>
                                     </p>
                                 </div>
                             </li>