From b65020ed8683819272d373a62af0d13284549a68 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Sat, 27 Apr 2024 18:52:46 -0400
Subject: [PATCH] Add requested campus and borough changes

---
 templates/confirm.html     |  2 +-
 templates/teams/teams.html | 24 +++++++++++++++++++++---
 templates/users/users.html | 29 ++++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/templates/confirm.html b/templates/confirm.html
index 6257894..43081c6 100644
--- a/templates/confirm.html
+++ b/templates/confirm.html
@@ -27,7 +27,7 @@ <h5 class="text-center">
         <br>
 
         <h5 class="text-center">
-          {% trans %}If the email doesn’t arrive, check your spam folder or contact an administrator to manually verify your account.{% endtrans %}
+          {% trans %}If the email doesn't arrive, check your spam folder or contact an administrator via the chat bubble to manually verify your account.{% endtrans %}
         </h5>
 
         <hr>
diff --git a/templates/teams/teams.html b/templates/teams/teams.html
index f24b081..c2125a5 100644
--- a/templates/teams/teams.html
+++ b/templates/teams/teams.html
@@ -47,9 +47,8 @@ <h6 class="text-muted text-center pb-3">
           <thead>
           <tr>
             <td class="text-md-start"><b>{% trans %}Team{% endtrans %}</b></td>
-            <td><b>{% trans %}Website{% endtrans %}</b></td>
-            <td class="d-none d-md-table-cell"><b>{% trans %}Affiliation{% endtrans %}</b></td>
-            <td class="d-none d-md-table-cell"><b>{% trans %}Country{% endtrans %}</b></td>
+            <td class="d-none d-md-table-cell"><b>CUNY Campus</b></td>
+            <td class="d-none d-md-table-cell"><b>Borough</b></td>
           </tr>
           </thead>
           <tbody>
@@ -70,6 +69,24 @@ <h6 class="text-muted text-center pb-3">
                 {% endif %}
               </td>
 
+              {% set team_ns = namespace(college=null, borough=null) %}
+              {% for field in team.fields %}
+                {% if field.name == "CUNY Campus" %}
+                  {% set team_ns.college = field.value %}
+                {% elif field.name == "CUNY Campus Borough" %}
+                  {% set team_ns.borough = field.value %}
+                {% endif %}
+              {% endfor %}
+
+              <td class="d-none d-md-table-cell d-lg-table-cell">
+                {{ team_ns.college }}
+              </td>
+
+              <td class="d-none d-md-table-cell d-lg-table-cell">
+                {{ team_ns.borough }}
+              </td>
+
+              {#
               <td style="width: 10px;">
                 {% if team.website and (team.website.startswith('http://') or team.website.startswith('https://')) %}
                   <a href="{{ team.website }}" target="_blank" rel="noopener">
@@ -109,6 +126,7 @@ <h6 class="text-muted text-center pb-3">
                 {% endif %}
 							</span>
               </td>
+              #}
             </tr>
           {% endfor %}
 
diff --git a/templates/users/users.html b/templates/users/users.html
index 02c8d07..a37ce0b 100644
--- a/templates/users/users.html
+++ b/templates/users/users.html
@@ -44,9 +44,9 @@ <h6 class="text-muted text-center pb-3">
           <thead>
           <tr>
             <td><b>{% trans %}User{% endtrans %}</b></td>
-            <td><b>{% trans %}Website{% endtrans %}</b></td>
-            <td class="d-none d-md-table-cell"><b>{% trans %}Affiliation{% endtrans %}</b></td>
-            <td class="d-none d-md-table-cell"><b>{% trans %}Country{% endtrans %}</b></td>
+            <td><b>{% trans %}Team{% endtrans %}</b></td>
+            <td class="d-none d-md-table-cell"><b>CUNY Campus</b></td>
+            <td class="d-none d-md-table-cell"><b>Borough</b></td>
           </tr>
           </thead>
           <tbody>
@@ -68,6 +68,28 @@ <h6 class="text-muted text-center pb-3">
                 {% endif %}
               </td>
 
+              <td>
+                <a href='{{ url_for("teams.public", team_id=user.team.id) }}'>{{ user.team.name }}</a>
+              </td>
+
+              {% set user_ns = namespace(college=null, borough=null) %}
+              {% for field in user.fields %}
+                {% if field.name == "CUNY Campus" %}
+                  {% set user_ns.college = field.value %}
+                {% elif field.name == "CUNY Campus Borough" %}
+                  {% set user_ns.borough = field.value %}
+                {% endif %}
+              {% endfor %}
+
+              <td class="d-none d-md-table-cell d-lg-table-cell">
+                {{ user_ns.college }}
+              </td>
+
+              <td class="d-none d-md-table-cell d-lg-table-cell">
+                {{ user_ns.borough }}
+              </td>
+
+              {#
               <td class="text-center" style="width: 10px;">
                 {% if user.website and (user.website.startswith('http://') or user.website.startswith('https://')) %}
                   <a href="{{ user.website }}" target="_blank" rel="noopener">
@@ -100,6 +122,7 @@ <h6 class="text-muted text-center pb-3">
                   {% endif %}
 								</span>
               </td>
+              #}
             </tr>
           {% endfor %}
           </tbody>