diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 0a19eecdf55a96eb2fa36030f437435cd5f4a943..f9f9eb03babd262291751bfb191a122223374e66 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -31,20 +31,24 @@ <dd class="col-xl-6">{{ object.note.balance | pretty_money }}</dd> <dt class="col-xl-6"> <a href="{% url 'member:user_alias' object.pk %}">{% trans 'aliases'|capfirst %}</a></dt> - <dd class="col-xl-6">{{ object.note.alias_set.all|join:", " }}</dd> + <dd class="col-xl-6 text-truncate">{{ object.note.alias_set.all|join:", " }}</dd> </dl> {% if object.pk == user.pk %} <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a> {% endif %} </div> - <div class="card-footer"> + <div class="card-footer text-center"> <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' object.pk %}">{% trans 'Update Profile' %}</a> + {% url 'member:user_detail' object.pk as user_profile_url %} + {%if request.get_full_path != user_profile_url %} + <a class="btn btn-primary btn-sm" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a> + {% endif %} </div> </div> </div> - <div class="col-md-9"> + {% block profile_content %} <div class="accordion shadow" id="accordionProfile"> <div class="card"> <div class="card-header position-relative" id="clubListHeading"> @@ -72,6 +76,7 @@ </div> </div> </div> + {% endblock %} </div> </div> {% endblock %} diff --git a/templates/member/user_alias.html b/templates/member/user_alias.html index 7d932adcc5c3b3ec00eed1d9a4bf69c39d012c15..a83d7c3ef8f450aefd53c9d052ed759325eb984e 100644 --- a/templates/member/user_alias.html +++ b/templates/member/user_alias.html @@ -1,51 +1,7 @@ -{% extends "base.html" %} +{% extends "member/profile_detail.html" %} {% load i18n static pretty_money django_tables2 crispy_forms_tags %} -{% block content %} -<div class="row mt-4"> - <div class="col-md-3 mb-4"> - <div class="card bg-light shadow"> - <img src="{{ object.note.display_image }}" 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.last_name }} {{ object.first_name }}</dd> - - <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt> - <dd class="col-xl-6">{{ object.username }}</dd> - - <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt> - <dd class="col-xl-6"> - <a class="small" href="{% url 'password_change' %}"> - {% trans 'Change password' %} - </a> - </dd> - - <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt> - <dd class="col-xl-6">{{ object.profile.section }}</dd> - - <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt> - <dd class="col-xl-6">{{ object.profile.address }}</dd> - - <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt> - <dd class="col-xl-6">{{ object.note.balance | pretty_money }}</dd> - - <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt> - <dd class="col-xl-6">{{ object.note.alias_set.all|join:", " }}</dd> - </dl> - - {% if object.pk == user.pk %} - <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a> - {% endif %} - </div> - <div class="card-footer text-center"> - <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' object.pk %}">{% trans 'Update Profile' %}</a> - <a class="btn btn-primary btn-sm" href="{% url 'member:user_detail' object.pk %}">{% trans 'View Profile' %}</a> - </div> - </div> - </div> - - <div class="col-md-9"> +{% block profile_content %} <div class="d-flex justify-content-center"> <form class=" text-center form my-2" action="" method="post"> {% csrf_token %} @@ -60,6 +16,4 @@ {% render_table aliases %} </div> </div> - </div> -</div> {% endblock %}