Merge remote-tracking branch 'origin/master' into activity

templates/base.html

@@ -79,9 +79,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <a class="nav-link" href="{% url 'note:consos' %}"><i class="fa fa-coffee"></i> {% trans 'Consumptions' %}</a>
                     </li>
                 {% endif %}
+                {% if "note.transaction"|not_empty_model_list %}
                     <li class="nav-item active">
                         <a class="nav-link" href="{% url 'note:transfer' %}"><i class="fa fa-exchange"></i>{% trans 'Transfer' %} </a>
                     </li>
+                {% endif %}
                 {% if "member.club"|not_empty_model_list %}
                     <li class="nav-item active">
                         <a class="nav-link" href="{% url 'member:club_list' %}"><i class="fa fa-users"></i> {% trans 'Clubs' %}</a>

templates/member/add_members.html

@@ -1,7 +1,11 @@
-{% extends "base.html" %}
+{% extends "member/noteowner_detail.html" %}
 {% load crispy_forms_tags %}
 {% load static %}
-{% block content %}
+
+{% block profile_info %}
+{% include "member/club_info.html" %}
+{% endblock %}
+{% block profile_content %}
 
 <form method="post" action="">
     {% csrf_token %}
@@ -10,9 +14,9 @@
         <input type="submit" name="submit" value="Add Members" class="btn btn-primary" id="submit-save">
     </div>
 </form>
+{% endblock %}
 
-<!-- Include formset plugin - including jQuery dependency -->
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+{% block extrajavascript %}
 <script src="{% static 'js/dynamic-formset.js' %}"></script>
 <script>
     $('.formset-row').formset({

templates/member/alias_update.html

@@ -0,0 +1,12 @@
+{% load django_tables2 crispy_forms_tags i18n %}
+<div class="d-flex justify-content-center">
+    <input id="alias_input" type="text" value=""/>
+    <button id="alias_submit" class="btn btn-primary mx-2" onclick="create_alias( {{ object.note.pk }} )" type="submit">
+        {% trans "Add alias" %}
+    </button>
+</div>
+<div class="card bg-light shadow">
+    <div class="card-body">
+        {% render_table aliases %}
+    </div>
+</div>

templates/member/club_alias.html

@@ -0,0 +1,10 @@
+{% extends "member/club_detail.html" %}
+{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
+
+{% block profile_content %}
+{% include "member/alias_update.html" %}
+{% endblock %}
+
+{% block extrajavascript %}
+<script src="/static/js/alias.js"></script>
+{% endblock%}

templates/member/club_info.html

@@ -1,5 +1,8 @@
 {% load i18n static pretty_money %}
 <div class="card bg-light shadow">
+    <div class="card-header text-center">
+        <h4> Club {{ club.name }} </h4>
+    </div>
     <div class="card-top text-center">
         <a  href="{% url 'member:club_update_pic' club.pk  %}">
             <img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2" >
@@ -10,6 +13,9 @@
             <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
             <dd class="col-xl-6">{{ club.name}}</dd>
 
+            <dt class="col-xl-6"><a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a></dt>
+            <dd class="col-xl-6"> {{ club.parent_club.name}}</dd>
+
             <dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
             <dd class="col-xl-6">{{ club.membership_start }}</dd>
 
@@ -22,11 +28,19 @@
             <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
             <dd class="col-xl-6">{{ club.membership_fee|pretty_money }}</dd>
             
-            <dt class="col-xl-6"><a href="{% url 'member:user_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
+            <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>
 
             <dt class="col-xl-3">{% trans 'email'|capfirst %}</dt>
             <dd class="col-xl-9"><a href="mailto:{{ club.email }}">{{ club.email}}</a></dd>
         </dl>
     </div>
+    <div class="card-footer text-center">
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' pk=club.pk %}"> {% trans "Add member" %}</a>
+        <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_add_member' pk=club.pk %}"> {% trans "Add roles" %}</a>
+        {% url 'member:club_detail' club.pk as club_detail_url %}
+        {%if request.get_full_path != club_detail_url %}
+        <a class="btn btn-primary btn-sm my-1" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
+        {% endif %}    </div>
 </div>

templates/member/club_picture_update.html

@@ -1,10 +1,6 @@
 {% extends "member/club_detail.html" %}
 {% load i18n static pretty_money django_tables2 crispy_forms_tags %}
 
-{% block profile_info %}
-{% include "member/club_info.html" %}
-{% endblock%}
-
 {% block profile_content%}
 {% include "member/picture_update.html" %}
 {% endblock%}

templates/member/profile_alias.html

@@ -2,18 +2,9 @@
 {% load i18n static pretty_money django_tables2 crispy_forms_tags %}
 
 {% block profile_content %}
-        <div class="d-flex justify-content-center">
-            <form class=" text-center form my-2" action="" method="post">
-                {% csrf_token %}
-                {{ form |crispy }}
-                <button class="btn btn-primary mx-2" type="submit">
-                    {% trans "Add alias" %}
-                </button>
-            </form>
-        </div>
-        <div class="card bg-light shadow">
-            <div class="card-body">
-                {% render_table aliases %}
-            </div>
-        </div>
+{% include "member/alias_update.html"%}
 {% endblock %}
+
+{% block extrajavascript %}
+<script src="/static/js/alias.js"></script>
+{% endblock%}

templates/member/profile_info.html

@@ -1,6 +1,9 @@
 {% load i18n static pretty_money %}
 
 <div class="card bg-light shadow">
+    <div class="card-header text-center" >
+        <h4> {% trans "Account #" %}  {{ object.pk }}</h4>
+    </div>
     <div class="card-top text-center">
         <a  href="{% url 'member:user_update_pic' object.pk  %}">
             <img src="{{ object.note.display_image.url }}" class="img-thumbnail mt-2" >

templates/member/profile_picture_update.html

@@ -1,10 +1,6 @@
-{% extends "member/noteowner_detail.html" %}
+{% extends "member/profile_detail.html" %}
 {% load i18n static pretty_money django_tables2 crispy_forms_tags %}
 
-{% block profile_info %}
-{% include "member/profile_info.html" %}
-{% endblock%}
-
 {% block profile_content%}
 {% include "member/picture_update.html" %}
 {% endblock%}

templates/note/transactiontemplate_list.html

@@ -10,7 +10,7 @@
         </h4>
         <input class="form-control mx-auto w-25" type="text" onkeyup="search_field_moved();return(false);" id="search_field"/>
         <hr>
-        <a class="btn btn-primary text-center my-4" href="{% url 'note:template_create' %}">Créer un bouton</a>
+        <a class="btn btn-primary text-center my-1" href="{% url 'note:template_create' %}">{% trans "New button" %}</a>
     </div>
 </div>
 <div class="row justify-content-center">