4 files changed, 73 insertions, 31 deletions
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index 72f6f12c..d3925de3 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -7,7 +7,7 @@ services:
            - "%scheb_two_factor.email.sender_email%"
            - "%scheb_two_factor.email.sender_name%"
            - '@=service(''craue_config'').get(''wallabag_support_url'')'
-            - '@=service(''craue_config'').get(''wallabag_url'')'
+            - '%domain_name%'
    wallabag_user.password_resetting:
        class: Wallabag\UserBundle\EventListener\PasswordResettingListener
@@ -35,3 +35,11 @@ services:
            - "%wallabag_core.list_mode%"
        tags:
            - { name: kernel.event_subscriber }
+    wallabag_user.listener.authentication_failure_event_listener:
+        class: Wallabag\UserBundle\EventListener\AuthenticationFailureListener
+        arguments:
+            - "@request_stack"
+            - "@logger"
+        tags:
+            - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
index 53a1afd1..e62ea2bc 100644
--- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
@@ -5,7 +5,7 @@ auth_code:
        subject: "Còdi d'autentificacion wallabag"
        body:
            hello: "Bonjorn %user%,"
-            first_para: "Estant qu'avètz activat la dobla autentificacion sus vòtre compte wallabag e que venètz de vos conectar dempuèi un novèl aparelh (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."
+            first_para: "Estant qu'avètz activat l'autentificacion en dos temps sus vòstre compte wallabag e que venètz de vos connectar dempuèi un novèl periferic (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."
-            second_para: "Vaquí lo còdi a dintrar :"
+            second_para: "Vaquí lo còdi per dintrar : "
-            support: "S'avètz un problèma de connexion, dobtetz pas a contacter l'assisténcia : "
+            support: "S'avètz un problèma de connexion, dobtetz pas a contactar l'assisténcia : "
            signature: "La còla de wallabag"
diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.ru.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.ru.yml
new file mode 100644
index 00000000..2a418224
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.ru.yml
@@ -0,0 +1,11 @@
+# Two factor mail
+auth_code:
+    on: 'Вкл'
+    mailer:
+        subject: 'код аутентификации wallabag'
+        body:
+            hello: "Привет %user%,"
+            first_para: "Поскольку вы активируете двухфакторную аутентификацию на своей учетной записи wallabag и только что вошли в систему с нового устройства (компьютер, телефон и т. д.), мы отправляем вам код для подтверждения вашего соединения."
+            second_para: "Вот код:"
+            support: "Пожалуйста, не стесняйтесь обращаться к нам, если у вас есть какие-либо проблемы:"
+            signature: "Команда wallabag"
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index daba29e4..15002632 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -7,37 +7,60 @@
    <div class="row">
        <div class="col s12">
            <div class="card-panel">
+                {% if users.getNbPages > 1 %}
+                    {{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                {% endif %}
                <div class="row">
-                    <div class="input-field col s12">
+                    <div class="col s6">
                        <p class="help">{{ 'user.description'|trans|raw }}</p>
+                    </div>
+                    <div class="col s6">
+                        <div class="input-field">
+                            <form name="search_users" method="GET" action="{{ path('user_index')}}">
+                                {% if form_errors(searchForm) %}
+                                    <span class="black-text">{{ form_errors(searchForm) }}</span>
+                                {% endif %}
+                                {% if form_errors(searchForm.term) %}
+                                    <span class="black-text">{{ form_errors(searchForm.term) }}</span>
+                                {% endif %}
-                        <table class="bordered">
+                                {{ form_widget(searchForm.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
-                            <thead>
-                                <tr>
+                                {{ form_rest(searchForm) }}
-                                    <th>{{ 'user.form.username_label'|trans }}</th>
+                            </form>
-                                    <th>{{ 'user.form.email_label'|trans }}</th>
+                        </div>
-                                    <th>{{ 'user.form.last_login_label'|trans }}</th>
-                                    <th>{{ 'user.list.actions'|trans }}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                            {% for user in users %}
-                                <tr>
-                                    <td>{{ user.username }}</td>
-                                    <td>{{ user.email }}</td>
-                                    <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
-                                    <td>
-                                        <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                        <br />
-                        <p>
-                            <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
-                        </p>
                    </div>
+                    <table class="bordered">
+                        <thead>
+                            <tr>
+                                <th>{{ 'user.form.username_label'|trans }}</th>
+                                <th>{{ 'user.form.email_label'|trans }}</th>
+                                <th>{{ 'user.form.last_login_label'|trans }}</th>
+                                <th>{{ 'user.list.actions'|trans }}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        {% for user in users %}
+                            <tr>
+                                <td>{{ user.username }}</td>
+                                <td>{{ user.email }}</td>
+                                <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
+                                <td>
+                                    <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                    <br />
+                    <p>
+                        <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
+                    </p>
+                    {% if users.getNbPages > 1 %}
+                        {{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+                    {% endif %}
                </div>
            </div>
        </div>

diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index 72f6f12c..d3925de3 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -7,7 +7,7 @@ services:
7	- "%scheb_two_factor.email.sender_email%"	7	- "%scheb_two_factor.email.sender_email%"
8	- "%scheb_two_factor.email.sender_name%"	8	- "%scheb_two_factor.email.sender_name%"
9	- '@=service(''craue_config'').get(''wallabag_support_url'')'	9	- '@=service(''craue_config'').get(''wallabag_support_url'')'
10	- '@=service(''craue_config'').get(''wallabag_url'')'	10	- '%domain_name%'
11		11
12	wallabag_user.password_resetting:	12	wallabag_user.password_resetting:
13	class: Wallabag\UserBundle\EventListener\PasswordResettingListener	13	class: Wallabag\UserBundle\EventListener\PasswordResettingListener
@@ -35,3 +35,11 @@ services:
35	- "%wallabag_core.list_mode%"	35	- "%wallabag_core.list_mode%"
36	tags:	36	tags:
37	- { name: kernel.event_subscriber }	37	- { name: kernel.event_subscriber }
		38
		39	wallabag_user.listener.authentication_failure_event_listener:
		40	class: Wallabag\UserBundle\EventListener\AuthenticationFailureListener
		41	arguments:
		42	- "@request_stack"
		43	- "@logger"
		44	tags:
		45	- { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }


diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml index 53a1afd1..e62ea2bc 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.oc.yml
@@ -5,7 +5,7 @@ auth_code:
5	subject: "Còdi d'autentificacion wallabag"	5	subject: "Còdi d'autentificacion wallabag"
6	body:	6	body:
7	hello: "Bonjorn %user%,"	7	hello: "Bonjorn %user%,"
8	first_para: "Estant qu'avètz activat la dobla autentificacion sus vòtre compte wallabag e que venètz de vos conectar dempuèi un novèl aparelh (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."	8	first_para: "Estant qu'avètz activat l'autentificacion en dos temps sus vòstre compte wallabag e que venètz de vos connectar dempuèi un novèl periferic (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."
9	second_para: "Vaquí lo còdi a dintrar :"	9	second_para: "Vaquí lo còdi per dintrar : "
10	support: "S'avètz un problèma de connexion, dobtetz pas a contacter l'assisténcia : "	10	support: "S'avètz un problèma de connexion, dobtetz pas a contactar l'assisténcia : "
11	signature: "La còla de wallabag"	11	signature: "La còla de wallabag"


diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.ru.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.ru.yml new file mode 100644 index 00000000..2a418224 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.ru.yml
@@ -0,0 +1,11 @@
		1	# Two factor mail
		2	auth_code:
		3	on: 'Вкл'
		4	mailer:
		5	subject: 'код аутентификации wallabag'
		6	body:
		7	hello: "Привет %user%,"
		8	first_para: "Поскольку вы активируете двухфакторную аутентификацию на своей учетной записи wallabag и только что вошли в систему с нового устройства (компьютер, телефон и т. д.), мы отправляем вам код для подтверждения вашего соединения."
		9	second_para: "Вот код:"
		10	support: "Пожалуйста, не стесняйтесь обращаться к нам, если у вас есть какие-либо проблемы:"
		11	signature: "Команда wallabag"


diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index daba29e4..15002632 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -7,37 +7,60 @@
7	<div class="row">	7	<div class="row">
8	<div class="col s12">	8	<div class="col s12">
9	<div class="card-panel">	9	<div class="card-panel">
		10	{% if users.getNbPages > 1 %}
		11	{{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
		12	{% endif %}
10	<div class="row">	13	<div class="row">
11	<div class="input-field col s12">	14	<div class="col s6">
12	<p class="help">{{ 'user.description'\|trans\|raw }}</p>	15	<p class="help">{{ 'user.description'\|trans\|raw }}</p>
		16	</div>
		17	<div class="col s6">
		18	<div class="input-field">
		19	<form name="search_users" method="GET" action="{{ path('user_index')}}">
		20	{% if form_errors(searchForm) %}
		21	<span class="black-text">{{ form_errors(searchForm) }}</span>
		22	{% endif %}
		23
		24	{% if form_errors(searchForm.term) %}
		25	<span class="black-text">{{ form_errors(searchForm.term) }}</span>
		26	{% endif %}
13		27
14	<table class="bordered">	28	{{ form_widget(searchForm.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'user.search.placeholder'} }) }}
15	<thead>	29
16	<tr>	30	{{ form_rest(searchForm) }}
17	<th>{{ 'user.form.username_label'\|trans }}</th>	31	</form>
18	<th>{{ 'user.form.email_label'\|trans }}</th>	32	</div>
19	<th>{{ 'user.form.last_login_label'\|trans }}</th>
20	<th>{{ 'user.list.actions'\|trans }}</th>
21	</tr>
22	</thead>
23	<tbody>
24	{% for user in users %}
25	<tr>
26	<td>{{ user.username }}</td>
27	<td>{{ user.email }}</td>
28	<td>{% if user.lastLogin %}{{ user.lastLogin\|date('Y-m-d H:i:s') }}{% endif %}</td>
29	<td>
30	<a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'\|trans }}</a>
31	</td>
32	</tr>
33	{% endfor %}
34	</tbody>
35	</table>
36	<br />
37	<p>
38	<a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'\|trans }}</a>
39	</p>
40	</div>	33	</div>
		34
		35	<table class="bordered">
		36	<thead>
		37	<tr>
		38	<th>{{ 'user.form.username_label'\|trans }}</th>
		39	<th>{{ 'user.form.email_label'\|trans }}</th>
		40	<th>{{ 'user.form.last_login_label'\|trans }}</th>
		41	<th>{{ 'user.list.actions'\|trans }}</th>
		42	</tr>
		43	</thead>
		44	<tbody>
		45	{% for user in users %}
		46	<tr>
		47	<td>{{ user.username }}</td>
		48	<td>{{ user.email }}</td>
		49	<td>{% if user.lastLogin %}{{ user.lastLogin\|date('Y-m-d H:i:s') }}{% endif %}</td>
		50	<td>
		51	<a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'\|trans }}</a>
		52	</td>
		53	</tr>
		54	{% endfor %}
		55	</tbody>
		56	</table>
		57	<br />
		58	<p>
		59	<a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'\|trans }}</a>
		60	</p>
		61	{% if users.getNbPages > 1 %}
		62	{{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
		63	{% endif %}
41	</div>	64	</div>
42	</div>	65	</div>
43	</div>	66	</div>