ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Display note information larger

This commit is contained in:
Yohann D'ANELLO 2020-04-12 02:07:13 +02:00
parent 7ad32c2afd
commit 8fe060847f
5 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
templates/member/club_tables.html
View File

@ -1,23 +1,27 @@
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% load i18n %} {% load i18n %}
<div class="card"> {% if member_list.data %}
<div class="card-header position-relative" id="clubListHeading"> <div class="card">
<a class="btn btn-link stretched-link font-weight-bold"> <div class="card-header position-relative" id="clubListHeading">
<i class="fa fa-users"></i> {% trans "Member of the Club" %} <a class="btn btn-link stretched-link font-weight-bold">
</a> <i class="fa fa-users"></i> {% trans "Member of the Club" %}
</div> </a>
</div>
{% render_table member_list %} {% render_table member_list %}
</div>
<hr>
<div class="card">
<div class="card-header position-relative" id="historyListHeading">
<a class="btn btn-link stretched-link font-weight-bold">
<i class="fa fa-euro"></i> {% trans "Transaction history" %}
</a>
</div> </div>
<hr>
{% endif %}
{% if history_list.data %}
<div class="card">
<div class="card-header position-relative" id="historyListHeading">
<a class="btn btn-link stretched-link font-weight-bold">
<i class="fa fa-euro"></i> {% trans "Transaction history" %}
</a>
</div>
<div id="history_list"> <div id="history_list">
{% render_table history_list %} {% render_table history_list %}
</div> </div>
</div> </div>
{% endif %}

4
templates/member/noteowner_detail.html
View File

@ -6,11 +6,11 @@
{% block content %} {% block content %}
<div class="row mt-4"> <div class="row mt-4">
<div class="col-md-3 mb-4"> <div class="col-xl-4">
{% block profile_info %} {% block profile_info %}
{% endblock %} {% endblock %}
</div> </div>
<div class="col-md-9"> <div class="col-xl-8">
{% block profile_content %} {% block profile_content %}
{% endblock %} {% endblock %}
</div> </div>

6
templates/wei/weiclub_detail.html
View File

@ -5,14 +5,14 @@
{% endblock %} {% endblock %}
{% block profile_content %} {% block profile_content %}
{% include "member/club_tables.html" %} {% include "wei/weiclub_tables.html" %}
{% endblock %} {% endblock %}
{% block extrajavascript %} {% block extrajavascript %}
<script> <script>
function refreshHistory() { function refreshHistory() {
$("#history_list").load("{% url 'member:club_detail' pk=object.pk %} #history_list"); $("#history_list").load("{% url 'wei:wei_detail' pk=object.pk %} #history_list");
$("#profile_infos").load("{% url 'member:club_detail' pk=object.pk %} #profile_infos"); $("#profile_infos").load("{% url 'wei:wei_detail' pk=object.pk %} #profile_infos");
} }
window.history.replaceState({}, document.title, location.pathname); window.history.replaceState({}, document.title, location.pathname);

16
templates/wei/weiclub_info.html
View File

@ -1,7 +1,7 @@
{% load i18n static pretty_money perms %} {% load i18n static pretty_money perms %}
<div class="card bg-light shadow"> <div class="card bg-light shadow">
<div class="card-header text-center"> <div class="card-header text-center">
<h4> Club {{ club.name }} </h4> <h4>{{ club.name }} </h4>
</div> </div>
<div class="card-top text-center"> <div class="card-top text-center">
<a href="{% url 'member:club_update_pic' club.pk %}"> <a href="{% url 'member:club_update_pic' club.pk %}">
@ -39,9 +39,11 @@
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt> <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ object.note.balance | pretty_money }}</dd> <dd class="col-xl-6">{{ object.note.balance | pretty_money }}</dd>
{% endif %} {% endif %}
<dt class="col-xl-6"><a href="{% url 'member:club_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt> {% if "note.change_alias"|has_perm:club.note.alias_set.first %}
<dd class="col-xl-6 text-truncate">{{ object.note.alias_set.all|join:", " }}</dd> <dt class="col-xl-4"><a href="{% url 'member:club_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
<dd class="col-xl-8 text-truncate">{{ object.note.alias_set.all|join:", " }}</dd>
{% endif %}
<dt class="col-xl-4">{% trans 'email'|capfirst %}</dt> <dt class="col-xl-4">{% trans 'email'|capfirst %}</dt>
<dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd> <dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd>
@ -49,13 +51,13 @@
</div> </div>
<div class="card-footer text-center"> <div class="card-footer text-center">
{% if can_add_members %} {% if can_add_members %}
<a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' club_pk=club.pk %}"> {% trans "Add member" %}</a> <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' club_pk=club.pk %}"> {% trans "Register 2A+" %}</a>
{% endif %} {% endif %}
{% if ".change_"|has_perm:club %} {% if ".change_"|has_perm:club %}
<a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}"> {% trans "Edit" %}</a> <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}"> {% trans "Edit" %}</a>
{% endif %} {% endif %}
{% url 'member:club_detail' club.pk as club_detail_url %} {% url 'wei:wei_detail' club.pk as club_detail_url %}
{%if request.path_info != club_detail_url %} {%if request.path_info != club_detail_url %}
<a class="btn btn-primary btn-sm my-1" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a> <a class="btn btn-primary btn-sm my-1" href="{{ club_detail_url }}">{% trans 'View WEI' %}</a>
{% endif %} </div> {% endif %} </div>
</div> </div>

36
templates/wei/weiclub_tables.html
View File

@ -1,23 +1,27 @@
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% load i18n %} {% load i18n %}
<div class="card"> {% if member_list.data %}
<div class="card-header position-relative" id="clubListHeading"> <div class="card">
<a class="btn btn-link stretched-link font-weight-bold"> <div class="card-header position-relative" id="clubListHeading">
<i class="fa fa-users"></i> {% trans "Member of the Club" %} <a class="btn btn-link stretched-link font-weight-bold">
</a> <i class="fa fa-users"></i> {% trans "Member of the Club" %}
</div> </a>
</div>
{% render_table member_list %} {% render_table member_list %}
</div>
<hr>
<div class="card">
<div class="card-header position-relative" id="historyListHeading">
<a class="btn btn-link stretched-link font-weight-bold">
<i class="fa fa-euro"></i> {% trans "Transaction history" %}
</a>
</div> </div>
<hr>
{% endif %}
{% if history_list.data %}
<div class="card">
<div class="card-header position-relative" id="historyListHeading">
<a class="btn btn-link stretched-link font-weight-bold">
<i class="fa fa-euro"></i> {% trans "Transaction history" %}
</a>
</div>
<div id="history_list"> <div id="history_list">
{% render_table history_list %} {% render_table history_list %}
</div> </div>
</div> </div>
{% endif %}