diff options
Diffstat (limited to 'src/Wallabag/CoreBundle')
3 files changed, 17 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php index 84f02013..e06c937d 100644 --- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php +++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php | |||
@@ -13,6 +13,7 @@ class UserInformationType extends AbstractType | |||
13 | $builder | 13 | $builder |
14 | ->add('name', 'text') | 14 | ->add('name', 'text') |
15 | ->add('email', 'email') | 15 | ->add('email', 'email') |
16 | ->add('twoFactorAuthentication', 'checkbox', array('required' => false)) | ||
16 | ->add('save', 'submit') | 17 | ->add('save', 'submit') |
17 | ->remove('username') | 18 | ->remove('username') |
18 | ->remove('plainPassword') | 19 | ->remove('plainPassword') |
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 64305b16..cee4f672 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 | |||
@@ -100,6 +100,14 @@ | |||
100 | </div> | 100 | </div> |
101 | </fieldset> | 101 | </fieldset> |
102 | 102 | ||
103 | <fieldset class="w500p inline"> | ||
104 | <div class="row"> | ||
105 | {{ form_label(form.user.twoFactorAuthentication) }} | ||
106 | {{ form_errors(form.user.twoFactorAuthentication) }} | ||
107 | {{ form_widget(form.user.twoFactorAuthentication) }} | ||
108 | </div> | ||
109 | </fieldset> | ||
110 | |||
103 | {{ form_rest(form.user) }} | 111 | {{ form_rest(form.user) }} |
104 | </form> | 112 | </form> |
105 | 113 | ||
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 0d8e9f24..b20c4ea5 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 | |||
@@ -132,6 +132,14 @@ | |||
132 | </div> | 132 | </div> |
133 | </div> | 133 | </div> |
134 | 134 | ||
135 | <div class="row"> | ||
136 | <div class="input-field col s12"> | ||
137 | {{ form_widget(form.user.twoFactorAuthentication) }} | ||
138 | {{ form_label(form.user.twoFactorAuthentication) }} | ||
139 | {{ form_errors(form.user.twoFactorAuthentication) }} | ||
140 | </div> | ||
141 | </div> | ||
142 | |||
135 | <div class="hidden">{{ form_rest(form.user) }}</div> | 143 | <div class="hidden">{{ form_rest(form.user) }}</div> |
136 | <button class="btn waves-effect waves-light" type="submit" name="action"> | 144 | <button class="btn waves-effect waves-light" type="submit" name="action"> |
137 | {% trans %}Save{% endtrans %} | 145 | {% trans %}Save{% endtrans %} |