More style in profile page

This commit is contained in:
Alexandre Iooss 2020-02-21 12:08:36 +01:00
parent 6caad0b369
commit 8d87b2b8f5
No known key found for this signature in database
GPG Key ID: 6C79278F3FCDCC02
3 changed files with 58 additions and 54 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-02-21 11:52+0100\n" "POT-Creation-Date: 2020-02-21 12:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -25,7 +25,7 @@ msgstr ""
#: apps/activity/models.py:19 apps/activity/models.py:44 #: apps/activity/models.py:19 apps/activity/models.py:44
#: apps/member/models.py:60 apps/member/models.py:111 #: apps/member/models.py:60 apps/member/models.py:111
#: apps/note/models/notes.py:176 apps/note/models/transactions.py:23 #: apps/note/models/notes.py:176 apps/note/models/transactions.py:23
#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:10 #: apps/note/models/transactions.py:43 templates/member/profile_detail.html:11
msgid "name" msgid "name"
msgstr "" msgstr ""
@ -90,7 +90,7 @@ msgstr ""
msgid "phone number" msgid "phone number"
msgstr "" msgstr ""
#: apps/member/models.py:29 templates/member/profile_detail.html:23 #: apps/member/models.py:29 templates/member/profile_detail.html:24
msgid "section" msgid "section"
msgstr "" msgstr ""
@ -98,7 +98,7 @@ msgstr ""
msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
msgstr "" msgstr ""
#: apps/member/models.py:36 templates/member/profile_detail.html:26 #: apps/member/models.py:36 templates/member/profile_detail.html:27
msgid "address" msgid "address"
msgstr "" msgstr ""
@ -180,7 +180,7 @@ msgstr ""
msgid "memberships" msgid "memberships"
msgstr "" msgstr ""
#: apps/member/views.py:63 templates/member/profile_detail.html:39 #: apps/member/views.py:63 templates/member/profile_detail.html:42
msgid "Update Profile" msgid "Update Profile"
msgstr "" msgstr ""
@ -290,7 +290,7 @@ msgstr ""
msgid "alias" msgid "alias"
msgstr "" msgstr ""
#: apps/note/models/notes.py:199 templates/member/profile_detail.html:32 #: apps/note/models/notes.py:199 templates/member/profile_detail.html:33
msgid "aliases" msgid "aliases"
msgstr "" msgstr ""
@ -386,7 +386,7 @@ msgstr ""
msgid "Membership duration" msgid "Membership duration"
msgstr "" msgstr ""
#: templates/member/club_detail.html:18 templates/member/profile_detail.html:29 #: templates/member/club_detail.html:18 templates/member/profile_detail.html:30
msgid "balance" msgid "balance"
msgstr "" msgstr ""
@ -402,27 +402,27 @@ msgstr ""
msgid "Regenerate token" msgid "Regenerate token"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:10 #: templates/member/profile_detail.html:11
msgid "first name" msgid "first name"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:13 #: templates/member/profile_detail.html:14
msgid "username" msgid "username"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:16 #: templates/member/profile_detail.html:17
msgid "password" msgid "password"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:19 #: templates/member/profile_detail.html:20
msgid "Change password" msgid "Change password"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:37 #: templates/member/profile_detail.html:38
msgid "Manage auth token" msgid "Manage auth token"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:49 #: templates/member/profile_detail.html:53
msgid "View my memberships" msgid "View my memberships"
msgstr "" msgstr ""

View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-02-21 11:52+0100\n" "POT-Creation-Date: 2020-02-21 12:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -20,7 +20,7 @@ msgstr "activité"
#: apps/activity/models.py:19 apps/activity/models.py:44 #: apps/activity/models.py:19 apps/activity/models.py:44
#: apps/member/models.py:60 apps/member/models.py:111 #: apps/member/models.py:60 apps/member/models.py:111
#: apps/note/models/notes.py:176 apps/note/models/transactions.py:23 #: apps/note/models/notes.py:176 apps/note/models/transactions.py:23
#: apps/note/models/transactions.py:43 templates/member/profile_detail.html:10 #: apps/note/models/transactions.py:43 templates/member/profile_detail.html:11
msgid "name" msgid "name"
msgstr "nom" msgstr "nom"
@ -85,7 +85,7 @@ msgstr "adhérent"
msgid "phone number" msgid "phone number"
msgstr "numéro de téléphone" msgstr "numéro de téléphone"
#: apps/member/models.py:29 templates/member/profile_detail.html:23 #: apps/member/models.py:29 templates/member/profile_detail.html:24
msgid "section" msgid "section"
msgstr "section" msgstr "section"
@ -93,7 +93,7 @@ msgstr "section"
msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
#: apps/member/models.py:36 templates/member/profile_detail.html:26 #: apps/member/models.py:36 templates/member/profile_detail.html:27
msgid "address" msgid "address"
msgstr "adresse" msgstr "adresse"
@ -179,7 +179,7 @@ msgstr "adhésion"
msgid "memberships" msgid "memberships"
msgstr "adhésions" msgstr "adhésions"
#: apps/member/views.py:63 templates/member/profile_detail.html:39 #: apps/member/views.py:63 templates/member/profile_detail.html:42
msgid "Update Profile" msgid "Update Profile"
msgstr "Modifier le profil" msgstr "Modifier le profil"
@ -290,7 +290,7 @@ msgstr "Alias invalide"
msgid "alias" msgid "alias"
msgstr "alias" msgstr "alias"
#: apps/note/models/notes.py:199 templates/member/profile_detail.html:32 #: apps/note/models/notes.py:199 templates/member/profile_detail.html:33
msgid "aliases" msgid "aliases"
msgstr "alias" msgstr "alias"
@ -386,7 +386,7 @@ msgstr "L'adhésion finie le"
msgid "Membership duration" msgid "Membership duration"
msgstr "Durée de l'adhésion" msgstr "Durée de l'adhésion"
#: templates/member/club_detail.html:18 templates/member/profile_detail.html:29 #: templates/member/club_detail.html:18 templates/member/profile_detail.html:30
msgid "balance" msgid "balance"
msgstr "solde du compte" msgstr "solde du compte"
@ -402,29 +402,29 @@ msgstr "Créé le"
msgid "Regenerate token" msgid "Regenerate token"
msgstr "Regénérer le jeton" msgstr "Regénérer le jeton"
#: templates/member/profile_detail.html:10 #: templates/member/profile_detail.html:11
msgid "first name" msgid "first name"
msgstr "" msgstr ""
#: templates/member/profile_detail.html:13 #: templates/member/profile_detail.html:14
msgid "username" msgid "username"
msgstr "nom d'utilisateur" msgstr "nom d'utilisateur"
#: templates/member/profile_detail.html:16 #: templates/member/profile_detail.html:17
#, fuzzy #, fuzzy
#| msgid "Change password" #| msgid "Change password"
msgid "password" msgid "password"
msgstr "Changer le mot de passe" msgstr "Changer le mot de passe"
#: templates/member/profile_detail.html:19 #: templates/member/profile_detail.html:20
msgid "Change password" msgid "Change password"
msgstr "Changer le mot de passe" msgstr "Changer le mot de passe"
#: templates/member/profile_detail.html:37 #: templates/member/profile_detail.html:38
msgid "Manage auth token" msgid "Manage auth token"
msgstr "Gérer les jetons d'authentification" msgstr "Gérer les jetons d'authentification"
#: templates/member/profile_detail.html:49 #: templates/member/profile_detail.html:53
msgid "View my memberships" msgid "View my memberships"
msgstr "Voir mes adhésions" msgstr "Voir mes adhésions"

View File

@ -3,41 +3,45 @@
{% block content %} {% block content %}
<div class="row mt-4"> <div class="row mt-4">
<div class="col-md-3"> <div class="col-md-3 mb-4">
<img src="{{ object.note.display_image.url }}" alt=""/> <div class="card bg-light">
<img src="{{ object.note.display_image.url }}" class="card-img-top" alt="">
<div class="card-body">
<dl class="row">
<dt class="col-xl-6">{% trans 'name'|capfirst %}, {% trans 'first name' %}</dt>
<dd class="col-xl-6">{{ object.user.last_name }} {{ object.user.first_name }}</dd>
<dl class="row table"> <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
<dt class="col-xl-6">{% trans 'name'|capfirst %}, {% trans 'first name' %}</dt> <dd class="col-xl-6">{{ object.user.username }}</dd>
<dd class="col-xl-6">{{ object.user.last_name }} {{ object.user.first_name }}</dd>
<dt class="col-xl-6">{% trans 'username'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
<dd class="col-xl-6">{{ object.user.username }}</dd> <dd class="col-xl-6">
<a class="small" href="{% url 'password_change' %}">
{% trans 'Change password' %}
</a>
</dd>
<dt class="col-xl-6">{% trans 'password'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
<dd class="col-xl-6"> <dd class="col-xl-6">{{ object.section }}</dd>
<a class="badge badge-primary" href="{% url 'password_change' %}">
{% trans 'Change password' %}
</a>
</dd>
<dt class="col-xl-6">{% trans 'section'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
<dd class="col-xl-6">{{ object.section }}</dd> <dd class="col-xl-6">{{ object.address }}</dd>
<dt class="col-xl-6">{% trans 'address'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ object.address }}</dd> <dd class="col-xl-6">{{ object.user.note.balance | pretty_money }}</dd>
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
<dd class="col-xl-6">{{ object.user.note.balance | pretty_money }}</dd> <dd class="col-xl-6">{{ object.user.note.alias_set.all|join:", " }}</dd>
</dl>
<dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt> {% if object.user.pk == user.pk %}
<dd class="col-xl-6">{{ object.user.note.alias_set.all|join:", " }}</dd> <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
</dl> {% endif %}
<p class="text-center"> </div>
{% if object.user.pk == user.pk %} <div class="card-footer">
<a class="btn btn-info btn-sm" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a> <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' object.pk %}">{% trans 'Update Profile' %}</a>
{% endif %} </div>
<a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' object.pk %}">{% trans 'Update Profile' %}</a> </div>
</p>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">