From 8fe060847fd91805f65333dd42acf68fefecb076 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sun, 12 Apr 2020 02:07:13 +0200
Subject: [PATCH] Display note information larger
---
templates/member/club_tables.html | 34 ++++++++++++++------------
templates/member/noteowner_detail.html | 4 +--
templates/wei/weiclub_detail.html | 6 ++---
templates/wei/weiclub_info.html | 16 ++++++------
templates/wei/weiclub_tables.html | 34 ++++++++++++++------------
5 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/templates/member/club_tables.html b/templates/member/club_tables.html
index 32be9bd4..e937fbe9 100644
--- a/templates/member/club_tables.html
+++ b/templates/member/club_tables.html
@@ -1,23 +1,27 @@
{% load render_table from django_tables2 %}
{% load i18n %}
-<div class="card">
- <div class="card-header position-relative" id="clubListHeading">
- <a class="btn btn-link stretched-link font-weight-bold">
- <i class="fa fa-users"></i> {% trans "Member of the Club" %}
- </a>
- </div>
+{% if member_list.data %}
+ <div class="card">
+ <div class="card-header position-relative" id="clubListHeading">
+ <a class="btn btn-link stretched-link font-weight-bold">
+ <i class="fa fa-users"></i> {% trans "Member of the Club" %}
+ </a>
+ </div>
{% render_table member_list %}
-</div>
+ </div>
-<hr>
+ <hr>
+{% endif %}
-<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>
+{% 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">
{% render_table history_list %}
</div>
-</div>
+ </div>
+{% endif %}
diff --git a/templates/member/noteowner_detail.html b/templates/member/noteowner_detail.html
index fc781549..2a377140 100644
--- a/templates/member/noteowner_detail.html
+++ b/templates/member/noteowner_detail.html
@@ -6,11 +6,11 @@
{% block content %}
<div class="row mt-4">
- <div class="col-md-3 mb-4">
+ <div class="col-xl-4">
{% block profile_info %}
{% endblock %}
</div>
- <div class="col-md-9">
+ <div class="col-xl-8">
{% block profile_content %}
{% endblock %}
</div>
diff --git a/templates/wei/weiclub_detail.html b/templates/wei/weiclub_detail.html
index 7ccd8dea..72c70aa5 100644
--- a/templates/wei/weiclub_detail.html
+++ b/templates/wei/weiclub_detail.html
@@ -5,14 +5,14 @@
{% endblock %}
{% block profile_content %}
-{% include "member/club_tables.html" %}
+{% include "wei/weiclub_tables.html" %}
{% endblock %}
{% block extrajavascript %}
<script>
function refreshHistory() {
- $("#history_list").load("{% url 'member:club_detail' pk=object.pk %} #history_list");
- $("#profile_infos").load("{% url 'member:club_detail' pk=object.pk %} #profile_infos");
+ $("#history_list").load("{% url 'wei:wei_detail' pk=object.pk %} #history_list");
+ $("#profile_infos").load("{% url 'wei:wei_detail' pk=object.pk %} #profile_infos");
}
window.history.replaceState({}, document.title, location.pathname);
diff --git a/templates/wei/weiclub_info.html b/templates/wei/weiclub_info.html
index 03cb69f2..3c2f6eea 100644
--- a/templates/wei/weiclub_info.html
+++ b/templates/wei/weiclub_info.html
@@ -1,7 +1,7 @@
{% load i18n static pretty_money perms %}
<div class="card bg-light shadow">
<div class="card-header text-center">
- <h4> Club {{ club.name }} </h4>
+ <h4>{{ club.name }} </h4>
</div>
<div class="card-top text-center">
<a href="{% url 'member:club_update_pic' club.pk %}">
@@ -39,9 +39,11 @@
<dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
<dd class="col-xl-6">{{ object.note.balance | pretty_money }}</dd>
{% endif %}
-
- <dt class="col-xl-6"><a href="{% url 'member:club_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
- <dd class="col-xl-6 text-truncate">{{ object.note.alias_set.all|join:", " }}</dd>
+
+ {% if "note.change_alias"|has_perm:club.note.alias_set.first %}
+ <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>
<dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd>
@@ -49,13 +51,13 @@
</div>
<div class="card-footer text-center">
{% 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 %}
{% 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>
{% 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 %}
- <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>
</div>
diff --git a/templates/wei/weiclub_tables.html b/templates/wei/weiclub_tables.html
index 32be9bd4..e937fbe9 100644
--- a/templates/wei/weiclub_tables.html
+++ b/templates/wei/weiclub_tables.html
@@ -1,23 +1,27 @@
{% load render_table from django_tables2 %}
{% load i18n %}
-<div class="card">
- <div class="card-header position-relative" id="clubListHeading">
- <a class="btn btn-link stretched-link font-weight-bold">
- <i class="fa fa-users"></i> {% trans "Member of the Club" %}
- </a>
- </div>
+{% if member_list.data %}
+ <div class="card">
+ <div class="card-header position-relative" id="clubListHeading">
+ <a class="btn btn-link stretched-link font-weight-bold">
+ <i class="fa fa-users"></i> {% trans "Member of the Club" %}
+ </a>
+ </div>
{% render_table member_list %}
-</div>
+ </div>
-<hr>
+ <hr>
+{% endif %}
-<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>
+{% 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">
{% render_table history_list %}
</div>
-</div>
+ </div>
+{% endif %}
--
GitLab