From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Oct 2019 11:21:19 +0000 (+0000)
Subject: people: Link from groups to accounts and vice-versa
X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=commitdiff_plain;h=ffa6ce9e5e0f591135a820d7cae2be7418692024

people: Link from groups to accounts and vice-versa

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/people/group.html b/src/templates/people/group.html
index 849c3037..286866b0 100644
--- a/src/templates/people/group.html
+++ b/src/templates/people/group.html
@@ -24,14 +24,20 @@
 				</div>
 			</div>
 
-			<ul class="list-group list-group-flush">
+			<div class="list-group list-group-flush">
 				{% for account in group %}
-					<li class="list-group-item">
-						<i class="fas fa-user mr-2"></i>
-						{{ account }}
-					</li>
+					<a class="list-group-item list-group-item-active" href="/users/{{ account.uid }}">
+						<div class="row">
+							<div class="col-1 text-center">
+								<img class="img-fluid rounded-circle" src="{{ account.avatar_url(64) }}" alt="{{ account }}" style="height: 24px" />
+							</div>
+							<div class="col-11">
+								{{ account }}
+							</div>
+						</div>
+					</a>
 				{% end %}
-			</ul>
+			</div>
 		{% end %}
 	</div>
 {% end block %}
diff --git a/src/templates/people/user.html b/src/templates/people/user.html
index f3736729..b2a6f32a 100644
--- a/src/templates/people/user.html
+++ b/src/templates/people/user.html
@@ -88,14 +88,13 @@
 				</div>
 			</div>
 
-			<ul class="list-group list-group-flush">
+			<div class="list-group list-group-flush">
 				{% for g in account.groups %}
-					<li class="list-group-item">
-						<i class="fas fa-users mr-2"></i>
-						{{ g }}
-					</li>
+					<a class="list-group-item list-group-item-active" {% if current_user.is_staff() %}href="/groups/{{ g.gid }}"{% end %}>
+						<i class="fas fa-users mr-2"></i> {{ g }}
+					</a>
 				{% end %}
-			</ul>
+			</div>
 		{% end %}
 	</div>