aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2015-12-29 20:32:58 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2015-12-29 20:32:58 +0100
commite6a228c43bf98f64d2d046314bae224c5b87399e (patch)
tree950c2c0533d4425b6572cfa9de84c40c44956b12 /src/Wallabag/CoreBundle
parentc997cfcc9c161241a6398b0942a1a869688d807a (diff)
parentab64c3d9ac591d30447428bd357b5b8c3a9bbcd7 (diff)
downloadwallabag-e6a228c43bf98f64d2d046314bae224c5b87399e.tar.gz
wallabag-e6a228c43bf98f64d2d046314bae224c5b87399e.tar.zst
wallabag-e6a228c43bf98f64d2d046314bae224c5b87399e.zip
Merge pull request #1544 from wallabag/2fa-email
v2 – Add custom email for 2FA
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig8
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php4
4 files changed, 18 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
index 84b78a89..3b3c1e97 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
@@ -25,7 +25,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
25 25
26 $adminConfig->setTheme('material'); 26 $adminConfig->setTheme('material');
27 $adminConfig->setItemsPerPage(30); 27 $adminConfig->setItemsPerPage(30);
28 $adminConfig->setLanguage('en_US'); 28 $adminConfig->setLanguage('en');
29 29
30 $manager->persist($adminConfig); 30 $manager->persist($adminConfig);
31 31
@@ -34,7 +34,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
34 $bobConfig = new Config($this->getReference('bob-user')); 34 $bobConfig = new Config($this->getReference('bob-user'));
35 $bobConfig->setTheme('default'); 35 $bobConfig->setTheme('default');
36 $bobConfig->setItemsPerPage(10); 36 $bobConfig->setItemsPerPage(10);
37 $bobConfig->setLanguage('fr_FR'); 37 $bobConfig->setLanguage('fr');
38 38
39 $manager->persist($bobConfig); 39 $manager->persist($bobConfig);
40 40
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 cc797c63..d9850f7a 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
@@ -40,6 +40,10 @@
40 {{ form_start(form.rss) }} 40 {{ form_start(form.rss) }}
41 {{ form_errors(form.rss) }} 41 {{ form_errors(form.rss) }}
42 42
43 <div class="row">
44 {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader.{% endtrans %}
45 </div>
46
43 <fieldset class="w500p inline"> 47 <fieldset class="w500p inline">
44 <div class="row"> 48 <div class="row">
45 <label>Rss token</label> 49 <label>Rss token</label>
@@ -101,6 +105,10 @@
101 </fieldset> 105 </fieldset>
102 106
103 {% if twofactor_auth %} 107 {% if twofactor_auth %}
108 <div class="row">
109 {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
110 </div>
111
104 <fieldset class="w500p inline"> 112 <fieldset class="w500p inline">
105 <div class="row"> 113 <div class="row">
106 {{ form_label(form.user.twoFactorAuthentication) }} 114 {{ form_label(form.user.twoFactorAuthentication) }}
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 d060311d..8743dc1d 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
@@ -133,6 +133,12 @@
133 {% if twofactor_auth %} 133 {% if twofactor_auth %}
134 <div class="row"> 134 <div class="row">
135 <div class="input-field col s12"> 135 <div class="input-field col s12">
136 {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
137 </div>
138 </div>
139
140 <div class="row">
141 <div class="input-field col s12">
136 {{ form_widget(form.user.twoFactorAuthentication) }} 142 {{ form_widget(form.user.twoFactorAuthentication) }}
137 {{ form_label(form.user.twoFactorAuthentication) }} 143 {{ form_label(form.user.twoFactorAuthentication) }}
138 {{ form_errors(form.user.twoFactorAuthentication) }} 144 {{ form_errors(form.user.twoFactorAuthentication) }}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 7b32354f..89ca31e2 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -44,7 +44,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
44 $form = $crawler->filter('button[id=config_save]')->form(); 44 $form = $crawler->filter('button[id=config_save]')->form();
45 45
46 $data = array( 46 $data = array(
47 'config[theme]' => 0, 47 'config[theme]' => 'baggy',
48 'config[items_per_page]' => '30', 48 'config[items_per_page]' => '30',
49 'config[language]' => 'en', 49 'config[language]' => 'en',
50 ); 50 );
@@ -63,7 +63,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
63 { 63 {
64 return array( 64 return array(
65 array(array( 65 array(array(
66 'config[theme]' => 0, 66 'config[theme]' => 'baggy',
67 'config[items_per_page]' => '', 67 'config[items_per_page]' => '',
68 'config[language]' => 'en', 68 'config[language]' => 'en',
69 )), 69 )),