-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix password resetting (#76) + some minor improvements
- Loading branch information
1 parent
627af8f
commit 5506da7
Showing
15 changed files
with
190 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?php | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Symfony\Component\DependencyInjection\Loader\Configurator; | ||
|
|
||
| use Symfony\Config\FrameworkConfig; | ||
|
|
||
| return static function (FrameworkConfig $framework): void { | ||
| $mailer = $framework->mailer(); | ||
| $mailer->dsn('%env(MAILER_DSN)%'); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -211,5 +211,3 @@ | |
| </div> | ||
| {% endif %} | ||
| {% endblock %} | ||
|
|
||
|
|
||
26 changes: 26 additions & 0 deletions
26
...homeless/templates/bundles/SonataUserBundle/Admin/Security/Resetting/checkEmail.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| {% extends '@!SonataUser/Admin/Security/Resetting/checkEmail.html.twig' %} | ||
|
|
||
| {% block sonata_wrapper %} | ||
| <div class="login-box"> | ||
| {% block login_box_header %} | ||
| <div class="login-logo"> | ||
| <a href="{{ path('sonata_admin_dashboard') }}"> | ||
| {% if 'icon' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <div> | ||
| <img src="{{ asset(sonata_config.logo) }}" alt="{{ sonata_config.title }}"> | ||
| </div> | ||
| {% endif %} | ||
| {% if 'text' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <span>{{ sonata_config.title }}</span> | ||
| {% endif %} | ||
| </a> | ||
| </div> | ||
| {% endblock %} | ||
| <div class="login-box-body"> | ||
| <p>{{ 'resetting.check_email'|trans({'tokenLifetime': tokenLifetime}, 'SonataUserBundle')|nl2br }}</p> | ||
| <a href="{{ path('sonata_user_admin_security_login') }}"> | ||
| {{ 'title_user_authentication'|trans({}, 'SonataUserBundle') }} | ||
| </a> | ||
| </div> | ||
| </div> | ||
| {% endblock sonata_wrapper %} |
11 changes: 11 additions & 0 deletions
11
shared/homeless/templates/bundles/SonataUserBundle/Admin/Security/Resetting/email.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| {% block subject %} | ||
| {%- autoescape false -%} | ||
| {{ 'resetting.email.subject'|trans({'username': user.username}, 'SonataUserBundle') }} | ||
| {%- endautoescape -%} | ||
| {% endblock %} | ||
|
|
||
| {% block body_text %} | ||
| {% autoescape false %} | ||
| {{ 'resetting.email.message'|trans({'username': user.username, 'confirmationUrl': confirmationUrl}, 'SonataUserBundle') }} | ||
| {% endautoescape %} | ||
| {% endblock %} |
16 changes: 16 additions & 0 deletions
16
...ed/homeless/templates/bundles/SonataUserBundle/Admin/Security/Resetting/request.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| {% extends '@!SonataUser/Admin/Security/Resetting/request.html.twig' %} | ||
|
|
||
| {% block login_box_header %} | ||
| <div class="login-logo"> | ||
| <a href="{{ path('sonata_admin_dashboard') }}"> | ||
| {% if 'icon' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <div> | ||
| <img src="{{ asset(sonata_config.logo) }}" alt="{{ sonata_config.title }}"> | ||
| </div> | ||
| {% endif %} | ||
| {% if 'text' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <span>{{ sonata_config.title }}</span> | ||
| {% endif %} | ||
| </a> | ||
| </div> | ||
| {% endblock %} |
16 changes: 16 additions & 0 deletions
16
shared/homeless/templates/bundles/SonataUserBundle/Admin/Security/Resetting/reset.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| {% extends '@!SonataUser/Admin/Security/Resetting/reset.html.twig' %} | ||
|
|
||
| {% block login_box_header %} | ||
| <div class="login-logo"> | ||
| <a href="{{ path('sonata_admin_dashboard') }}"> | ||
| {% if 'icon' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <div> | ||
| <img src="{{ asset(sonata_config.logo) }}" alt="{{ sonata_config.title }}"> | ||
| </div> | ||
| {% endif %} | ||
| {% if 'text' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <span>{{ sonata_config.title }}</span> | ||
| {% endif %} | ||
| </a> | ||
| </div> | ||
| {% endblock %} |
123 changes: 53 additions & 70 deletions
123
shared/homeless/templates/bundles/SonataUserBundle/Admin/Security/login.html.twig
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,58 @@ | ||
| {% extends base_template %} | ||
|
|
||
| {% block sonata_nav %} | ||
| {% endblock sonata_nav %} | ||
|
|
||
| {% block logo %} | ||
| {% endblock logo %} | ||
|
|
||
| {% block sonata_left_side %} | ||
| {% endblock sonata_left_side %} | ||
|
|
||
| {% block body_attributes %}class="sonata-bc login-page"{% endblock %} | ||
|
|
||
| {% block sonata_wrapper %} | ||
|
|
||
| <div class="login-box"> | ||
| <div class="login-logo"> | ||
| <a href="{{ path('sonata_admin_dashboard') }}"> | ||
| {% if 'single_image' == sonata_config.getOption('title_mode') or 'both' == sonata_config.getOption('title_mode') %} | ||
| <div> | ||
| <img style="width:200px;" src="{{ asset(sonata_config.titlelogo) }}" | ||
| alt="{{ sonata_config.title }}"> | ||
| </div> | ||
| {% endif %} | ||
| {% if 'single_text' == sonata_config.getOption('title_mode') or 'both' == sonata_config.getOption('title_mode') %} | ||
| <span>{{ sonata_config.title }}</span> | ||
| {% endif %} | ||
| </a> | ||
| {% extends '@!SonataUser/Admin/Security/login.html.twig' %} | ||
|
|
||
| {% block login_box_header %} | ||
| <div class="login-logo"> | ||
| <a href="{{ path('sonata_admin_dashboard') }}"> | ||
| {% if 'icon' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <div> | ||
| <img src="{{ asset(sonata_config.logo) }}" alt="{{ sonata_config.title }}"> | ||
| </div> | ||
| {% endif %} | ||
| {% if 'text' == sonata_config.getOption('logo_content') or 'all' == sonata_config.getOption('logo_content') %} | ||
| <span>{{ sonata_config.title }}</span> | ||
| {% endif %} | ||
| </a> | ||
| </div> | ||
| {% endblock %} | ||
|
|
||
| {% block sonata_user_login_form %} | ||
| {% block sonata_user_login_error %} | ||
| {% if error %} | ||
| <div class="alert alert-danger">{{ error.message|trans({}, 'SonataUserBundle') }}</div> | ||
| {% endif %} | ||
| {% endblock %} | ||
| <p class="login-box-msg">{{ 'title_user_authentication'|trans({}, 'SonataUserBundle') }}</p> | ||
| <form action="{{ path("sonata_user_admin_security_check") }}" method="post" role="form"> | ||
| <input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/> | ||
|
|
||
| <div class="form-group has-feedback"> | ||
| <input type="text" class="form-control" id="username" name="_username" | ||
| value="{{ last_username }}" required="required" | ||
| placeholder="{{ 'security.login.username'|trans({}, 'SonataUserBundle') }}"/> | ||
| <span class="glyphicon glyphicon-user form-control-feedback"></span> | ||
| </div> | ||
| <div class="login-box-body"> | ||
| {% block sonata_user_login_form %} | ||
| {% block sonata_user_login_error %} | ||
| {% if error %} | ||
| <div class="alert alert-danger">{{ error.message|trans({}, 'SonataUserBundle') }}</div> | ||
| {% endif %} | ||
| {% endblock %} | ||
| <p class="login-box-msg">{{ 'title_user_authentication'|trans({}, 'SonataUserBundle') }}</p> | ||
| <form action="{{ path("sonata_user_admin_security_check") }}" method="post" role="form"> | ||
| <input type="hidden" name="_csrf_token" value="{{ csrf_token }}"/> | ||
|
|
||
| <div class="form-group has-feedback"> | ||
| <input type="text" class="form-control" id="username" name="_username" | ||
| value="{{ last_username }}" required="required" | ||
| placeholder="{{ 'security.login.username'|trans({}, 'SonataUserBundle') }}"/> | ||
| <span class="glyphicon glyphicon-user form-control-feedback"></span> | ||
| </div> | ||
|
|
||
| <div class="form-group has-feedback"> | ||
| <input type="password" class="form-control" id="password" name="_password" required="required" | ||
| placeholder="{{ 'security.login.password'|trans({}, 'SonataUserBundle') }}"/> | ||
| <span class="glyphicon glyphicon-lock form-control-feedback"></span> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-xs-8"> | ||
| <div class="checkbox"> | ||
| <label> | ||
| <input type="checkbox" id="remember_me" name="_remember_me" value="on"/> | ||
| {{ 'security.login.remember_me'|trans({}, 'SonataUserBundle') }} | ||
| </label> | ||
| </div> | ||
| </div> | ||
| <div class="col-xs-4"> | ||
| <button type="submit" | ||
| class="btn btn-primary btn-block btn-flat">{{ 'security.login.submit'|trans({}, 'SonataUserBundle') }}</button> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| <div class="form-group has-feedback"> | ||
| <input type="password" class="form-control" id="password" name="_password" required="required" | ||
| placeholder="{{ 'security.login.password'|trans({}, 'SonataUserBundle') }}"/> | ||
| <span class="glyphicon glyphicon-lock form-control-feedback"></span> | ||
| </div> | ||
|
|
||
| <a href="{{ reset_route }}">{{ 'forgotten_password'|trans({}, 'SonataUserBundle') }}</a> | ||
| {% endblock %} | ||
| <div class="row"> | ||
| <div class="col-xs-8"> | ||
| <div class="checkbox"> | ||
| <label> | ||
| <input type="checkbox" id="remember_me" name="_remember_me" value="on"/> | ||
| {{ 'security.login.remember_me'|trans({}, 'SonataUserBundle') }} | ||
| </label> | ||
| </div> | ||
| </div> | ||
| <div class="col-xs-4"> | ||
| <button type="submit" | ||
| class="btn btn-primary btn-block btn-flat">{{ 'security.login.submit'|trans({}, 'SonataUserBundle') }}</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
|
|
||
| {% endblock sonata_wrapper %} | ||
| <a href="{{ reset_route }}">{{ 'forgotten_password'|trans({}, 'SonataUserBundle') }}</a> | ||
| {% endblock %} |
27 changes: 27 additions & 0 deletions
27
shared/homeless/translations/SonataUserBundle+intl-icu.ru.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| breadcrumb: | ||
| link_user_delete: Удалить | ||
|
|
||
| form: | ||
| group_profile: Профиль | ||
| label_username: Логин | ||
|
|
||
| user: Пользователь | ||
| roles: Роли | ||
|
|
||
| resetting.check_email: |- | ||
| Письмо отправлено. Оно содержит ссылку, при переходе по которой ваш пароль будет сброшен. | ||
| Заметьте, вы сможете запросить новый пароль только через {tokenLifetime, plural, | ||
| one {# час} | ||
| few {# часа} | ||
| other {# часов} | ||
| }. | ||
| Если вы не получили письмо, проверьте папку Спам или попробуйте снова. | ||
| resetting.email.message: |- | ||
| Приветствуем, {username}!<br> | ||
| <br> | ||
| Для сброса пароля, пожалуйста, пройдите по ссылке {confirmationUrl}<br> | ||
| <br> | ||
| С наилучшими пожеланиями,<br> | ||
| команда сайта. |
This file was deleted.
Oops, something went wrong.