aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-31 16:16:41 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-10-31 16:18:52 +0100
commite61ee56031aa0788f9a40ec245d3c391d219d6c2 (patch)
treeb8fce3d2f4f60372f4e1007eb544d9fa26c11f44 /src/Wallabag
parent5feef9f7a4e6852415feb388190b7ca141f116d1 (diff)
downloadwallabag-e61ee56031aa0788f9a40ec245d3c391d219d6c2.tar.gz
wallabag-e61ee56031aa0788f9a40ec245d3c391d219d6c2.tar.zst
wallabag-e61ee56031aa0788f9a40ec245d3c391d219d6c2.zip
Added QRCode and link to configure android application
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig12
2 files changed, 13 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 8d391917..d40efcd7 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -149,6 +149,7 @@ class ConfigController extends Controller
149 'token' => $config->getRssToken(), 149 'token' => $config->getRssToken(),
150 ], 150 ],
151 'twofactor_auth' => $this->getParameter('twofactor_auth'), 151 'twofactor_auth' => $this->getParameter('twofactor_auth'),
152 'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
152 'enabled_users' => $this->getDoctrine() 153 'enabled_users' => $this->getDoctrine()
153 ->getRepository('WallabagUserBundle:User') 154 ->getRepository('WallabagUserBundle:User')
154 ->getSumEnabledUsers(), 155 ->getSumEnabledUsers(),
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 @@
71 </div> 71 </div>
72 </div> 72 </div>
73 73
74 <div class="row">
75 <div class="input-field col s12">
76 <h5>Configure your Android application</h5>
77 <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>
78 <img id="androidQrcode" class="hide-on-med-and-down" />
79 </div>
80 <script>
81 var imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
82 document.getElementById('androidQrcode').src=imgBase64;
83 </script>
84 </div>
85
74 {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 86 {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
75 {{ form_rest(form.config) }} 87 {{ form_rest(form.config) }}
76 </form> 88 </form>