Skip to content

Commit

Permalink
Add requested campus and borough changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ColdHeat
ColdHeat committed Apr 27, 2024
1 parent 0a4c9fd commit b65020e
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 7 deletions.
2 changes: 1 addition & 1 deletion templates/confirm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 21 additions & 3 deletions templates/teams/teams.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -109,6 +126,7 @@ <h6 class="text-muted text-center pb-3">
{% endif %}
</span>
</td>
#}
</tr>
{% endfor %}

Expand Down
29 changes: 26 additions & 3 deletions templates/users/users.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -100,6 +122,7 @@ <h6 class="text-muted text-center pb-3">
{% endif %}
</span>
</td>
#}
</tr>
{% endfor %}
</tbody>
Expand Down

0 comments on commit b65020e

Please sign in to comment.