From 35e5520d9c13e6d486e73e2dce0f863da9eeb1cb Mon Sep 17 00:00:00 2001 From: momothereal Date: Fri, 22 Jun 2018 19:58:14 -0400 Subject: Start work on Gitlab activity feed --- templates/main/jams/team_view.html | 145 +++++++++++++++++++++++++++++++----- templates/main/jams/teams_list.html | 3 +- 2 files changed, 127 insertions(+), 21 deletions(-) (limited to 'templates') diff --git a/templates/main/jams/team_view.html b/templates/main/jams/team_view.html index fbf8dfe4..aaeef7cd 100644 --- a/templates/main/jams/team_view.html +++ b/templates/main/jams/team_view.html @@ -20,16 +20,52 @@

Team Members

-
+
{% for member in team.members %}
{{ member.username }}#{{ member.discriminator }} -   - - - + +
+
+ + {{ member.username }}#{{ member.discriminator }} + +
+
+ + {{ member.username }}#{{ member.discriminator }} +
{% endfor %}
@@ -48,23 +84,92 @@ {% endif %}

- +
+
+
+

+ Loading GitLab activity, hang tight... +

+
+
+
+
-

- Entry Description -

- {% if is_own_team %} - -  Edit - - -  Revision History - - {% endif %} -

- This team has not written an entry description yet. -

+ + {% endblock %} diff --git a/templates/main/jams/teams_list.html b/templates/main/jams/teams_list.html index f63e2669..e23d21b1 100644 --- a/templates/main/jams/teams_list.html +++ b/templates/main/jams/teams_list.html @@ -14,7 +14,8 @@

Code Jam {{ team.jam.number }}: Team {{ team.name }}

- +  View -- cgit v1.2.3