diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Form/Type')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/FeedType.php (renamed from src/Wallabag/CoreBundle/Form/Type/RssType.php) | 10 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/NewEntryType.php | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/RenameTagType.php | 35 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/UserInformationType.php | 9 |
5 files changed, 50 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php index 08355928..2fc4c204 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | |||
@@ -22,11 +22,13 @@ class EditEntryType extends AbstractType | |||
22 | 'disabled' => true, | 22 | 'disabled' => true, |
23 | 'required' => false, | 23 | 'required' => false, |
24 | 'label' => 'entry.edit.url_label', | 24 | 'label' => 'entry.edit.url_label', |
25 | 'default_protocol' => null, | ||
25 | ]) | 26 | ]) |
26 | ->add('origin_url', UrlType::class, [ | 27 | ->add('origin_url', UrlType::class, [ |
27 | 'required' => false, | 28 | 'required' => false, |
28 | 'property_path' => 'originUrl', | 29 | 'property_path' => 'originUrl', |
29 | 'label' => 'entry.edit.origin_url_label', | 30 | 'label' => 'entry.edit.origin_url_label', |
31 | 'default_protocol' => null, | ||
30 | ]) | 32 | ]) |
31 | ->add('save', SubmitType::class, [ | 33 | ->add('save', SubmitType::class, [ |
32 | 'label' => 'entry.edit.save_label', | 34 | 'label' => 'entry.edit.save_label', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/RssType.php b/src/Wallabag/CoreBundle/Form/Type/FeedType.php index 49b31c1e..9b34daf4 100644 --- a/src/Wallabag/CoreBundle/Form/Type/RssType.php +++ b/src/Wallabag/CoreBundle/Form/Type/FeedType.php | |||
@@ -7,14 +7,14 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; | |||
7 | use Symfony\Component\Form\FormBuilderInterface; | 7 | use Symfony\Component\Form\FormBuilderInterface; |
8 | use Symfony\Component\OptionsResolver\OptionsResolver; | 8 | use Symfony\Component\OptionsResolver\OptionsResolver; |
9 | 9 | ||
10 | class RssType extends AbstractType | 10 | class FeedType extends AbstractType |
11 | { | 11 | { |
12 | public function buildForm(FormBuilderInterface $builder, array $options) | 12 | public function buildForm(FormBuilderInterface $builder, array $options) |
13 | { | 13 | { |
14 | $builder | 14 | $builder |
15 | ->add('rss_limit', null, [ | 15 | ->add('feed_limit', null, [ |
16 | 'label' => 'config.form_rss.rss_limit', | 16 | 'label' => 'config.form_feed.feed_limit', |
17 | 'property_path' => 'rssLimit', | 17 | 'property_path' => 'feedLimit', |
18 | ]) | 18 | ]) |
19 | ->add('save', SubmitType::class, [ | 19 | ->add('save', SubmitType::class, [ |
20 | 'label' => 'config.form.save', | 20 | 'label' => 'config.form.save', |
@@ -31,6 +31,6 @@ class RssType extends AbstractType | |||
31 | 31 | ||
32 | public function getBlockPrefix() | 32 | public function getBlockPrefix() |
33 | { | 33 | { |
34 | return 'rss_config'; | 34 | return 'feed_config'; |
35 | } | 35 | } |
36 | } | 36 | } |
diff --git a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php index 7d74fee3..7af1e589 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php | |||
@@ -15,6 +15,7 @@ class NewEntryType extends AbstractType | |||
15 | ->add('url', UrlType::class, [ | 15 | ->add('url', UrlType::class, [ |
16 | 'required' => true, | 16 | 'required' => true, |
17 | 'label' => 'entry.new.form_new.url_label', | 17 | 'label' => 'entry.new.form_new.url_label', |
18 | 'default_protocol' => null, | ||
18 | ]) | 19 | ]) |
19 | ; | 20 | ; |
20 | } | 21 | } |
diff --git a/src/Wallabag/CoreBundle/Form/Type/RenameTagType.php b/src/Wallabag/CoreBundle/Form/Type/RenameTagType.php new file mode 100644 index 00000000..e6270048 --- /dev/null +++ b/src/Wallabag/CoreBundle/Form/Type/RenameTagType.php | |||
@@ -0,0 +1,35 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\CoreBundle\Form\Type; | ||
4 | |||
5 | use Symfony\Component\Form\AbstractType; | ||
6 | use Symfony\Component\Form\Extension\Core\Type\TextType; | ||
7 | use Symfony\Component\Form\FormBuilderInterface; | ||
8 | use Symfony\Component\OptionsResolver\OptionsResolver; | ||
9 | |||
10 | class RenameTagType extends AbstractType | ||
11 | { | ||
12 | public function buildForm(FormBuilderInterface $builder, array $options) | ||
13 | { | ||
14 | $builder | ||
15 | ->add('label', TextType::class, [ | ||
16 | 'required' => true, | ||
17 | 'attr' => [ | ||
18 | 'placeholder' => 'tag.rename.placeholder', | ||
19 | ], | ||
20 | ]) | ||
21 | ; | ||
22 | } | ||
23 | |||
24 | public function configureOptions(OptionsResolver $resolver) | ||
25 | { | ||
26 | $resolver->setDefaults([ | ||
27 | 'data_class' => 'Wallabag\CoreBundle\Entity\Tag', | ||
28 | ]); | ||
29 | } | ||
30 | |||
31 | public function getBlockPrefix() | ||
32 | { | ||
33 | return 'tag'; | ||
34 | } | ||
35 | } | ||
diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php index 07c99949..6e4c9154 100644 --- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php +++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php | |||
@@ -21,9 +21,14 @@ class UserInformationType extends AbstractType | |||
21 | ->add('email', EmailType::class, [ | 21 | ->add('email', EmailType::class, [ |
22 | 'label' => 'config.form_user.email_label', | 22 | 'label' => 'config.form_user.email_label', |
23 | ]) | 23 | ]) |
24 | ->add('twoFactorAuthentication', CheckboxType::class, [ | 24 | ->add('emailTwoFactor', CheckboxType::class, [ |
25 | 'required' => false, | 25 | 'required' => false, |
26 | 'label' => 'config.form_user.twoFactorAuthentication_label', | 26 | 'label' => 'config.form_user.emailTwoFactor_label', |
27 | ]) | ||
28 | ->add('googleTwoFactor', CheckboxType::class, [ | ||
29 | 'required' => false, | ||
30 | 'label' => 'config.form_user.googleTwoFactor_label', | ||
31 | 'mapped' => false, | ||
27 | ]) | 32 | ]) |
28 | ->add('save', SubmitType::class, [ | 33 | ->add('save', SubmitType::class, [ |
29 | 'label' => 'config.form.save', | 34 | 'label' => 'config.form.save', |