Mail

GCalmels · Dec 4, 2014 · 0642988 · 0642988
1 parent cafabe2
commit 0642988
Show file tree

Hide file tree

Showing 21 changed files with 14 additions and 3 deletions.
diff --git a/app/.htaccess b/app/.htaccess
diff --git a/app/AppCache.php b/app/AppCache.php
diff --git a/app/AppKernel.php b/app/AppKernel.php
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
diff --git a/app/autoload.php b/app/autoload.php
diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep
diff --git a/app/check.php b/app/check.php
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -70,7 +70,6 @@ swiftmailer:
     host:      "%mailer_host%"
     username:  "%mailer_user%"
     password:  "%mailer_password%"
-    spool:     { type: memory }
 
 # FOSUserBundle Configuration
 fos_user:

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -44,5 +44,5 @@ monolog:
 assetic:
     use_controller: true
 
-#swiftmailer:
-#    delivery_address: me@example.com
+swiftmailer:
+    delivery_address: gabriel.calmels@hotmail.fr
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
diff --git a/app/config/routing.yml b/app/config/routing.yml
diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
diff --git a/app/config/security.yml b/app/config/security.yml
diff --git a/app/config/services.yml b/app/config/services.yml
diff --git a/app/console b/app/console
diff --git a/app/logs/.gitkeep b/app/logs/.gitkeep
diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
diff --git a/src/CG/UserBundle/Resources/views/Registration/register_content.html.twig b/src/CG/UserBundle/Resources/views/Registration/register_content.html.twig
@@ -42,6 +42,18 @@
       </div>
     </div>
 
+    <div class="form-group">
+      {# Génération du label username. #}
+      {{ form_label(form.email, 'register.form.email'|trans, {'label_attr': {'class': 'col-sm-3 control-label'}}) }}
+
+      {# Affichage des erreurs pour ce champ précis. #}
+      {{ form_errors(form.email) }}
+
+      <div class="col-sm-4">
+        {{ form_widget(form.email, {'attr': {'class': 'form-control'}}) }}
+      </div>
+    </div>
+
   {# Pour le bouton, pas de label ni d'erreur, on affiche juste le widget #}
   {{ form_widget(form.saveButton, {'attr': {'class': 'btn btn-primary'},  'label': 'register.form.submit'|trans }) }}