From e61ee56031aa0788f9a40ec245d3c391d219d6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 31 Oct 2016 16:16:41 +0100
Subject: Added QRCode and link to configure android application

---
 .../Resources/views/themes/material/Config/index.html.twig   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index b53ae2fe..3fbb49ea 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -71,6 +71,18 @@
                                 </div>
                             </div>
 
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    <h5>Configure your Android application</h5>
+                                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a>
+                                    <img id="androidQrcode" class="hide-on-med-and-down" />
+                                </div>
+                                <script>
+                                    var imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                                    document.getElementById('androidQrcode').src=imgBase64;
+                                </script>
+                            </div>
+
                             {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
                             {{ form_rest(form.config) }}
                         </form>
-- 
cgit v1.2.3


From 3b81212674bb4b2cf51ce51637e0093c952cefde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 31 Oct 2016 16:48:34 +0100
Subject: Added translations and baggy part

---
 .../Resources/views/themes/baggy/Config/index.html.twig        | 10 ++++++++++
 .../Resources/views/themes/material/Config/index.html.twig     |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 455d0295..dde9411f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -54,6 +54,16 @@
                     <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
                 </p>
             </div>
+
+            <div class="row">
+                    <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
+                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
+                    <img id="androidQrcode" />
+                    <script>
+                        const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                        document.getElementById('androidQrcode').src=imgBase64;
+                    </script>
+            </div>
         </fieldset>
 
         {{ form_rest(form.config) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 3fbb49ea..807c9bdc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -73,12 +73,12 @@
 
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <h5>Configure your Android application</h5>
+                                    <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5>
                                     <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a>
                                     <img id="androidQrcode" class="hide-on-med-and-down" />
                                 </div>
                                 <script>
-                                    var imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                                    const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
                                     document.getElementById('androidQrcode').src=imgBase64;
                                 </script>
                             </div>
-- 
cgit v1.2.3


From 68e0efffb8785db84e4c26edeaea3a5bd6622d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 31 Oct 2016 17:20:27 +0100
Subject: Fixed review

---
 .../Resources/views/themes/baggy/Config/index.html.twig    | 14 +++++++-------
 .../Resources/views/themes/material/Config/index.html.twig |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index dde9411f..ec3b23c8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -56,13 +56,13 @@
             </div>
 
             <div class="row">
-                    <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
-                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
-                    <img id="androidQrcode" />
-                    <script>
-                        const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
-                        document.getElementById('androidQrcode').src=imgBase64;
-                    </script>
+                <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
+                <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
+                <img id="androidQrcode" />
+                <script>
+                    const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                    document.getElementById('androidQrcode').src = imgBase64;
+                </script>
             </div>
         </fieldset>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 807c9bdc..f69d158f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -79,7 +79,7 @@
                                 </div>
                                 <script>
                                     const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
-                                    document.getElementById('androidQrcode').src=imgBase64;
+                                    document.getElementById('androidQrcode').src = imgBase64;
                                 </script>
                             </div>
 
-- 
cgit v1.2.3