From 6af16cc8938156e6999f5fea5488165956bd898f Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Wed, 31 Aug 2016 17:18:21 +0200
Subject: [PATCH] Some basic templating

---
 club/templates/club/club_detail.jinja  | 18 ++++++++++++++----
 club/templates/club/club_members.jinja | 18 ++++++++++++++----
 core/templates/core/user_detail.jinja  |  3 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja
index 5e9e6384..95ecb020 100644
--- a/club/templates/club/club_detail.jinja
+++ b/club/templates/club/club_detail.jinja
@@ -1,4 +1,5 @@
 {% extends "core/base.jinja" %}
+{% from 'core/macros.jinja' import user_profile_link %}
 
 {% block content %}
     <h3>{% trans %}Club{% endtrans %}</h3>
@@ -15,11 +16,20 @@
     {% endif %}
     <h3>{{ club.name }}</h3>
     <p>{{ club.address }}</p>
-    <ul>
-        {% for m in club.members.filter(end_date=None).all() %}
-        <li>{{ m }}</li>
+    <table>
+        <thead>
+            <td>{% trans %}User{% endtrans %}</td>
+            <td>{% trans %}Role{% endtrans %}</td>
+        </thead>
+        <tbody>
+        {% for m in club.members.filter(end_date=None).order_by('-role').all() %}
+            <tr>
+                <td>{{ user_profile_link(m.user) }}</td>
+                <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+            </tr>
         {% endfor %}
-    </ul>
+        </tbody>
+    </table>
 {% endblock %}
 
 
diff --git a/club/templates/club/club_members.jinja b/club/templates/club/club_members.jinja
index d9c9de11..5cf49386 100644
--- a/club/templates/club/club_members.jinja
+++ b/club/templates/club/club_members.jinja
@@ -1,12 +1,22 @@
 {% extends "core/base.jinja" %}
+{% from 'core/macros.jinja' import user_profile_link %}
 
 {% block content %}
     <h2>{% trans %}Club members{% endtrans %}</h2>
-    <ul>
-        {% for m in club.members.all() %}
-        <li>{{ m }}</li>
+    <table>
+        <thead>
+            <td>{% trans %}User{% endtrans %}</td>
+            <td>{% trans %}Role{% endtrans %}</td>
+        </thead>
+        <tbody>
+        {% for m in club.members.filter(end_date=None).order_by('-role').all() %}
+            <tr>
+                <td>{{ user_profile_link(m.user) }}</td>
+                <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+            </tr>
         {% endfor %}
-    </ul>
+        </tbody>
+    </table>
     <form action="{{ url('club:club_members', club_id=club.id) }}" method="post">
         {% csrf_token %}
         {{ form.as_p() }}
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index 663877e3..ba4ba525 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -45,7 +45,8 @@
 {# if the user is member of a club, he can view the subscription state #}
 <p>
 {% if get_subscriber(profile).is_subscribed() %}
-{% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}
+{% trans subscription_end=get_subscriber(profile).subscriptions.last().subscription_end %}Subscribed until {{ subscription_end }}{% endtrans %}<br/>
+{% trans %}Account number: {% endtrans %}{{ profile.customer.account_id }}
 {% else %}
 {% trans %}Not subscribed{% endtrans %}
 {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) %}