diff --git a/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.en.yml b/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.en.yml index fe588fc..c390c63 100644 --- a/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.en.yml +++ b/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.en.yml @@ -4,4 +4,8 @@ fos_user_change_password: profile: show: language: Language - timezone: Timezone \ No newline at end of file + timezone: Timezone + +form: + new_password: New password + new_password_confirmation: Confirm new password \ No newline at end of file diff --git a/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.fr.yml b/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.fr.yml index f4ac34e..ddd5216 100644 --- a/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.fr.yml +++ b/src/FreeBet/Bundle/UserBundle/Resources/translations/FOSUserBundle.fr.yml @@ -4,4 +4,8 @@ fos_user_change_password: profile: show: language: Langue - timezone: Fuseau horaire \ No newline at end of file + timezone: Fuseau horaire + +form: + new_password: Nouveau mot de passe + new_password_confirmation: Confirmation nouveau mot de passe \ No newline at end of file diff --git a/src/FreeBet/Bundle/UserBundle/Resources/translations/security.en.yml b/src/FreeBet/Bundle/UserBundle/Resources/translations/security.en.yml index bfa973f..0116377 100644 --- a/src/FreeBet/Bundle/UserBundle/Resources/translations/security.en.yml +++ b/src/FreeBet/Bundle/UserBundle/Resources/translations/security.en.yml @@ -14,6 +14,7 @@ registration: title: Register New Membership submit: Sign me up has_account: I already have a membership + start_betting: Start Betting "Bad credentials": Invalid login or password @@ -32,4 +33,7 @@ resetting: fos_user_registration_confirmed.title: Register New Membership fos_user_resetting_send_email.title: Resetting password -fos_user_resetting_check_email.title: Email sent \ No newline at end of file +fos_user_resetting_check_email.title: Email sent +fos_user_resetting_reset.title: Forgot password +reset.title: Forgot password +reset.request.submit: Save \ No newline at end of file diff --git a/src/FreeBet/Bundle/UserBundle/Resources/translations/security.fr.yml b/src/FreeBet/Bundle/UserBundle/Resources/translations/security.fr.yml index 6af2d58..b9be9ab 100644 --- a/src/FreeBet/Bundle/UserBundle/Resources/translations/security.fr.yml +++ b/src/FreeBet/Bundle/UserBundle/Resources/translations/security.fr.yml @@ -14,6 +14,7 @@ registration: title: Créer un compte submit: Enregistrer has_account: Retour à l'écran de connexion + start_betting: Commencer à parier "Bad credentials": Login ou mot de passe invalide @@ -32,4 +33,7 @@ resetting: fos_user_registration_confirmed.title: Créer un compte fos_user_resetting_send_email.title: Mot de passe oublié -fos_user_resetting_check_email.title: Email envoyé \ No newline at end of file +fos_user_resetting_check_email.title: Email envoyé +fos_user_resetting_reset.title: Mot de passe oublié +reset.title: Mot de passe oublié +reset.request.submit: Enregistrer \ No newline at end of file diff --git a/src/FreeBet/Bundle/UserBundle/Resources/views/Form/FOSFormTheme.html.twig b/src/FreeBet/Bundle/UserBundle/Resources/views/Form/FOSFormTheme.html.twig new file mode 100644 index 0000000..c4ec172 --- /dev/null +++ b/src/FreeBet/Bundle/UserBundle/Resources/views/Form/FOSFormTheme.html.twig @@ -0,0 +1,32 @@ +{% block form_widget_compound %} +{% spaceless %} +
+ {% if form.parent is empty %} + {{ form_errors(form) }} + {% endif %} + {{ block('form_rows') }} + {{ form_rest(form) }} +
+{% endspaceless %} +{% endblock form_widget_compound %} + +{% block form_row %} +{% spaceless %} +
+ {{ form_errors(form) }} + {{ form_widget(form, { 'attr': {'class': 'form-control', 'placeholder': form.vars.label|trans({},'security') } }) }} +
+{% endspaceless %} +{% endblock %} + +{% block form_errors %} +{% spaceless %} + {% if errors|length > 0 %} +
+ {% for error in errors %} +

{{ error.message }}

+ {% endfor %} +
+ {% endif %} +{% endspaceless %} +{% endblock form_errors %} \ No newline at end of file diff --git a/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/confirmed.html.twig b/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/confirmed.html.twig new file mode 100644 index 0000000..2e44add --- /dev/null +++ b/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/confirmed.html.twig @@ -0,0 +1,9 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% block fos_user_content %} +

{{ 'registration.confirmed'|trans({'%username%': user.username}, 'FOSUserBundle') }}

+ + + {{ "registration.start_betting"|trans({},'security') }} + +{% endblock fos_user_content %} diff --git a/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/register.html.twig b/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/register.html.twig index acf0751..424837c 100644 --- a/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/FreeBet/Bundle/UserBundle/Resources/views/Registration/register.html.twig @@ -5,40 +5,7 @@ {% block title %}{{ 'registration.title'|trans({}, 'security') }}{% endblock %} -{% form_theme form _self %} - -{% block form_widget_compound %} -{% spaceless %} -
- {% if form.parent is empty %} - {{ form_errors(form) }} - {% endif %} - {{ block('form_rows') }} - {{ form_rest(form) }} -
-{% endspaceless %} -{% endblock form_widget_compound %} - -{% block form_row %} -{% spaceless %} -
- {{ form_errors(form) }} - {{ form_widget(form, { 'attr': {'class': 'form-control', 'placeholder': form.vars.label|trans({},'security') } }) }} -
-{% endspaceless %} -{% endblock %} - -{% block form_errors %} -{% spaceless %} - {% if errors|length > 0 %} -
- {% for error in errors %} -

{{ error.message }}

- {% endfor %} -
- {% endif %} -{% endspaceless %} -{% endblock form_errors %} +{% form_theme form "FreeBetUserBundle:Form:FOSFormTheme.html.twig" %} {% block body %}
diff --git a/src/FreeBet/Bundle/UserBundle/Resources/views/Resetting/reset.html.twig b/src/FreeBet/Bundle/UserBundle/Resources/views/Resetting/reset.html.twig new file mode 100644 index 0000000..fad5321 --- /dev/null +++ b/src/FreeBet/Bundle/UserBundle/Resources/views/Resetting/reset.html.twig @@ -0,0 +1,26 @@ +{% extends "FreeBetUserBundle::layout.html.twig" %} + +{% block htmlclass %} class="bg-black"{% endblock %} +{% block bodyclass %}bg-black{% endblock %} + +{% block title %}{{ 'reset.title'|trans({}, 'security') }}{% endblock %} + +{% form_theme form "FreeBetUserBundle:Form:FOSFormTheme.html.twig" %} + +{% block body %} +
+
{{ 'reset.title'|trans({}, 'security') }}
+
+
+ {{ form_widget(form) }} +
+ +
+
+
+{% endblock %} \ No newline at end of file