Skip to content

Commit

Permalink
Merge pull request #49 from yaleksandr89/hotfix-20
Browse files Browse the repository at this point in the history 
hotfix-20 added fields ti list users (admin) and added translation page list users
  • Loading branch information
@yaleksandr89
yaleksandr89 authored Mar 26, 2022
2 parents 93c2ca4 + 91b96ef commit f863175
Show file tree
Hide file tree
Showing 5 changed files with 203 additions and 11 deletions.
46 changes: 35 additions & 11 deletions templates/admin/user/list.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
<table class="table table-bordered" id="main_table">
<thead>
<tr>
<th>Id</th>
<th>Email</th>
<th>Role</th>
<th>Profile info</th>
<th>Is verified email</th>
<th>From Google</th>
<th>{{ 'admin.user_list.id'|trans }}</th>
<th>{{ 'admin.user_list.email'|trans }}</th>
<th>{{ 'admin.user_list.role'|trans }}</th>
<th>{{ 'admin.user_list.profile_info'|trans }}</th>
<th>{{ 'admin.user_list.is_verified_email'|trans }}</th>
<th>{{ 'admin.user_list.from_google'|trans }}</th>
<th>{{ 'admin.user_list.from_yandex'|trans }}</th>
<th>{{ 'admin.user_list.from_vk'|trans }}</th>
<th>{{ 'admin.user_list.from_github'|trans }}</th>
<th></th>
</tr>
</thead>
Expand All @@ -47,20 +50,41 @@
</td>
<td>
{% if user.isVerified %}
<div class="alert alert-success">Verified</div>
<div class="alert alert-success">{{ 'admin.user_list.verified'|trans }}</div>
{% else %}
<div class="alert alert-warning">Not Verified</div>
<div class="alert alert-warning">{{ 'admin.user_list.not_verified'|trans }}</div>
{% endif %}
</td>
<td>
{% if user.googleId %}
<div class="alert alert-success">Verified</div>
<div class="alert alert-success">{{ 'admin.user_list.verified'|trans }}</div>
{% else %}
<div class="alert alert-warning">Not Verified</div>
<div class="alert alert-warning">{{ 'admin.user_list.not_verified'|trans }}</div>
{% endif %}
</td>
<td>
<a href="{{ path('admin_user_edit', {'id': user.id}) }}" class="btn btn-outline-info">Edit</a>
{% if user.yandexId %}
<div class="alert alert-success">{{ 'admin.user_list.verified'|trans }}</div>
{% else %}
<div class="alert alert-warning">{{ 'admin.user_list.not_verified'|trans }}</div>
{% endif %}
</td>
<td>
{% if user.vkontakteId %}
<div class="alert alert-success">{{ 'admin.user_list.verified'|trans }}</div>
{% else %}
<div class="alert alert-warning">{{ 'admin.user_list.not_verified'|trans }}</div>
{% endif %}
</td>
<td>
{% if user.githubId %}
<div class="alert alert-success">{{ 'admin.user_list.verified'|trans }}</div>
{% else %}
<div class="alert alert-warning">{{ 'admin.user_list.not_verified'|trans }}</div>
{% endif %}
</td>
<td>
<a href="{{ path('admin_user_edit', {'id': user.id}) }}" class="btn btn-outline-info">{{ 'admin.user_list.edit'|trans }}</a>
</td>
</tr>
{% endfor %}
Expand Down
72 changes: 72 additions & 0 deletions translations/messages.en.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,5 +1054,77 @@
<target>Login with Github</target>
</segment>
</unit>
<unit id="3XQLnLv" name="admin.user_list.id">
<segment>
<source>admin.user_list.id</source>
<target>Id</target>
</segment>
</unit>
<unit id="imvhdji" name="admin.user_list.email">
<segment>
<source>admin.user_list.email</source>
<target>Email</target>
</segment>
</unit>
<unit id="oUVglXT" name="admin.user_list.role">
<segment>
<source>admin.user_list.role</source>
<target>Role</target>
</segment>
</unit>
<unit id="jEdlObq" name="admin.user_list.profile_info">
<segment>
<source>admin.user_list.profile_info</source>
<target>Profile info</target>
</segment>
</unit>
<unit id="tZ6GW0o" name="admin.user_list.is_verified_email">
<segment>
<source>admin.user_list.is_verified_email</source>
<target>Is verified email</target>
</segment>
</unit>
<unit id="..ZWjVX" name="admin.user_list.from_google">
<segment>
<source>admin.user_list.from_google</source>
<target>From Google</target>
</segment>
</unit>
<unit id="h0Dl98t" name="admin.user_list.from_yandex">
<segment>
<source>admin.user_list.from_yandex</source>
<target>From Yandex</target>
</segment>
</unit>
<unit id="YEAkBLN" name="admin.user_list.from_vk">
<segment>
<source>admin.user_list.from_vk</source>
<target>From Vk</target>
</segment>
</unit>
<unit id="2qVg_O." name="admin.user_list.from_github">
<segment>
<source>admin.user_list.from_github</source>
<target>From Github</target>
</segment>
</unit>
<unit id="MjBzuxb" name="admin.user_list.verified">
<segment>
<source>admin.user_list.verified</source>
<target>Verified</target>
</segment>
</unit>
<unit id="O49.BZq" name="admin.user_list.not_verified">
<segment>
<source>admin.user_list.not_verified</source>
<target>Not Verified</target>
</segment>
</unit>
<unit id="U_e_xLK" name="admin.user_list.edit">
<segment>
<source>admin.user_list.edit</source>
<target>Edit</target>
</segment>
</unit>
</file>
</xliff>
12 changes: 12 additions & 0 deletions translations/messages.en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,15 @@ Id: Id
login_social_network.yandex: 'Login with Yandex'
login_social_network.vk: 'Login with Vkontakte'
login_social_network.github: 'Login with Github'
admin.user_list.id: Id
admin.user_list.email: Email
admin.user_list.role: Role
admin.user_list.profile_info: 'Profile info'
admin.user_list.is_verified_email: 'Is verified email'
admin.user_list.from_google: 'From Google'
admin.user_list.from_yandex: 'From Yandex'
admin.user_list.from_vk: 'From Vk'
admin.user_list.from_github: 'From Github'
admin.user_list.verified: Verified
admin.user_list.not_verified: 'Not Verified'
admin.user_list.edit: Edit
72 changes: 72 additions & 0 deletions translations/messages.ru.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1072,5 +1072,77 @@
<target>Авторизоваться через Гитхаб</target>
</segment>
</unit>
<unit id="U_e_xLK" name="admin.user_list.edit">
<segment>
<source>admin.user_list.edit</source>
<target>Редактировать</target>
</segment>
</unit>
<unit id="O49.BZq" name="admin.user_list.not_verified">
<segment>
<source>admin.user_list.not_verified</source>
<target>Не проверено</target>
</segment>
</unit>
<unit id="MjBzuxb" name="admin.user_list.verified">
<segment>
<source>admin.user_list.verified</source>
<target>Проверено</target>
</segment>
</unit>
<unit id="3XQLnLv" name="admin.user_list.id">
<segment>
<source>admin.user_list.id</source>
<target>Ид</target>
</segment>
</unit>
<unit id="imvhdji" name="admin.user_list.email">
<segment>
<source>admin.user_list.email</source>
<target>Почта</target>
</segment>
</unit>
<unit id="oUVglXT" name="admin.user_list.role">
<segment>
<source>admin.user_list.role</source>
<target>Роль</target>
</segment>
</unit>
<unit id="jEdlObq" name="admin.user_list.profile_info">
<segment>
<source>admin.user_list.profile_info</source>
<target>Информация</target>
</segment>
</unit>
<unit id="tZ6GW0o" name="admin.user_list.is_verified_email">
<segment>
<source>admin.user_list.is_verified_email</source>
<target>Почта проверена</target>
</segment>
</unit>
<unit id="..ZWjVX" name="admin.user_list.from_google">
<segment>
<source>admin.user_list.from_google</source>
<target>Google проверен</target>
</segment>
</unit>
<unit id="h0Dl98t" name="admin.user_list.from_yandex">
<segment>
<source>admin.user_list.from_yandex</source>
<target>Яндекс проверен</target>
</segment>
</unit>
<unit id="YEAkBLN" name="admin.user_list.from_vk">
<segment>
<source>admin.user_list.from_vk</source>
<target>Вконтакте проверен</target>
</segment>
</unit>
<unit id="2qVg_O." name="admin.user_list.from_github">
<segment>
<source>admin.user_list.from_github</source>
<target>Github проверен</target>
</segment>
</unit>
</file>
</xliff>
12 changes: 12 additions & 0 deletions translations/messages.ru.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,15 @@ To: Для
login_social_network.yandex: 'Авторизоваться через Яндекс'
login_social_network.vk: 'Авторизоваться через Вконтакт'
login_social_network.github: 'Авторизоваться через Гитхаб'
admin.user_list.edit: Редактировать
admin.user_list.not_verified: 'Не проверено'
admin.user_list.verified: Проверено
admin.user_list.id: Ид
admin.user_list.email: Почта
admin.user_list.role: Роль
admin.user_list.profile_info: Информация
admin.user_list.is_verified_email: 'Почта проверена'
admin.user_list.from_google: 'Google проверен'
admin.user_list.from_yandex: 'Яндекс проверен'
admin.user_list.from_vk: 'Вконтакте проверен'
admin.user_list.from_github: 'Github проверен'

0 comments on commit f863175

Please sign in to comment.