diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-12-02 18:39:02 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-23 13:28:02 +0100 |
commit | 2dfbe9e5faf40364b60e6c76f3cc9fac5bf11fa4 (patch) | |
tree | 463e9a7a036f736a1fbb676f4fddf113f8a8cb72 /src/Wallabag/CoreBundle/Resources | |
parent | edc79ad886e4c96d1c2d205fedf5a9c19a177ee1 (diff) | |
download | wallabag-2dfbe9e5faf40364b60e6c76f3cc9fac5bf11fa4.tar.gz wallabag-2dfbe9e5faf40364b60e6c76f3cc9fac5bf11fa4.tar.zst wallabag-2dfbe9e5faf40364b60e6c76f3cc9fac5bf11fa4.zip |
Fix tests
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 9 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | 6 |
2 files changed, 7 insertions, 8 deletions
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 5c4e44dd..6ee57443 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 | |||
@@ -86,8 +86,7 @@ | |||
86 | <br/> | 86 | <br/> |
87 | <img id="androidQrcode" /> | 87 | <img id="androidQrcode" /> |
88 | <script> | 88 | <script> |
89 | const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); | 89 | document.getElementById('androidQrcode').src = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); |
90 | document.getElementById('androidQrcode').src = imgBase64; | ||
91 | </script> | 90 | </script> |
92 | </div> | 91 | </div> |
93 | </fieldset> | 92 | </fieldset> |
@@ -186,20 +185,20 @@ | |||
186 | {{ form_widget(form.user.googleTwoFactor) }} | 185 | {{ form_widget(form.user.googleTwoFactor) }} |
187 | {{ form_errors(form.user.googleTwoFactor) }} | 186 | {{ form_errors(form.user.googleTwoFactor) }} |
188 | </div> | 187 | </div> |
189 | {% for OTPSecret in app.session.flashbag.get('OTPSecret') %} | 188 | {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %} |
190 | <div class="row"> | 189 | <div class="row"> |
191 | You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. | 190 | You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. |
192 | <br/> | 191 | <br/> |
193 | That code will disapear after a page reload. | 192 | That code will disapear after a page reload. |
194 | <br/><br/> | 193 | <br/><br/> |
195 | <strong>{{ OTPSecret.code }}</strong> | 194 | <strong>{{ app.user.getGoogleAuthenticatorSecret }}</strong> |
196 | <br/><br/> | 195 | <br/><br/> |
197 | Or you can scan that QR Code with your app: | 196 | Or you can scan that QR Code with your app: |
198 | <br/> | 197 | <br/> |
199 | <img id="2faQrcode" class="hide-on-med-and-down" /> | 198 | <img id="2faQrcode" class="hide-on-med-and-down" /> |
200 | 199 | ||
201 | <script> | 200 | <script> |
202 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OTPSecret.qrCode }}');; | 201 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OtpQrCode }}');; |
203 | </script> | 202 | </script> |
204 | </div> | 203 | </div> |
205 | {% endfor %} | 204 | {% endfor %} |
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 887d154f..ca7eb9f3 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 | |||
@@ -212,20 +212,20 @@ | |||
212 | </div> | 212 | </div> |
213 | </div> | 213 | </div> |
214 | 214 | ||
215 | {% for OTPSecret in app.session.flashbag.get('OTPSecret') %} | 215 | {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %} |
216 | <div class="card-panel yellow darken-1 black-text"> | 216 | <div class="card-panel yellow darken-1 black-text"> |
217 | You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. | 217 | You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. |
218 | <br/> | 218 | <br/> |
219 | That code will disapear after a page reload. | 219 | That code will disapear after a page reload. |
220 | <br/><br/> | 220 | <br/><br/> |
221 | <strong>{{ OTPSecret.code }}</strong> | 221 | <strong>{{ app.user.getGoogleAuthenticatorSecret }}</strong> |
222 | <br/><br/> | 222 | <br/><br/> |
223 | Or you can scan that QR Code with your app: | 223 | Or you can scan that QR Code with your app: |
224 | <br/> | 224 | <br/> |
225 | <img id="2faQrcode" class="hide-on-med-and-down" /> | 225 | <img id="2faQrcode" class="hide-on-med-and-down" /> |
226 | 226 | ||
227 | <script> | 227 | <script> |
228 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OTPSecret.qrCode }}');; | 228 | document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ OtpQrCode }}');; |
229 | </script> | 229 | </script> |
230 | </div> | 230 | </div> |
231 | {% endfor %} | 231 | {% endfor %} |