JohnHammond
/
CTFd
mirror of https://github.com/JohnHammond/CTFd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up some of the tables when data is too long

2.4.0-dev
Kevin Chung 2020-05-01 17:26:06 -04:00
parent fe97385f69
commit 9003c29846
7 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CTFd/themes/admin/templates/teams/team.html
View File

@ -127,26 +127,32 @@
</h3>
<hr class="w-50">
<div class="pt-3">
<a class="edit-team">
<a class="edit-team text-dark">
<i class="btn-fa fas fa-pencil-alt fa-2x px-2" data-toggle="tooltip" data-placement="top"
title="Edit Team"></i>
</a>
<a class="edit-captain">
<a class="edit-captain text-dark">
<i class="btn-fa fas fa-user-tag fa-2x px-2" data-toggle="tooltip" data-placement="top"
title="Choose Captain"></i>
</a>
<a class="award-team">
<a class="award-team text-dark">
<i class="btn-fa fas fa-trophy fa-2x px-2" data-toggle="tooltip" data-placement="top" title="Award Team Member"></i>
</a>
<a class="delete-team">
<a class="delete-team text-dark">
<i class="btn-fa fas fa-trash-alt fa-2x px-2" data-toggle="tooltip" data-placement="top"
title="Delete Team"></i>
</a>
</div>
<div class="pt-3">
<a class="addresses-team">
<a class="addresses-team text-dark">
<i class="btn-fa fas fa-network-wired fa-2x px-2" data-toggle="tooltip" data-placement="top" title="IP Addresses"></i>
</a>
{% if team.website %}
<a href="{{ team.website }}" target="_blank" class="text-dark">
<i class="btn-fa fas fa-external-link-alt fa-2x px-2" data-toggle="tooltip" data-placement="top"
title="{{ team.website }}" aria-hidden="true"></i>
</a>
{% endif %}
</div>
</div>
</div>

22
CTFd/themes/admin/templates/teams/teams.html
View File

@ -74,10 +74,9 @@
</th>
<th class="sort-col text-center"><b>ID</b></th>
<th class="sort-col text-left"><b>Team</b></th>
<th class="sort-col text-center"><b>Website</b></th>
<th class="sort-col text-center"><b>Country</b></th>
<th class="sort-col text-center"><b>Hidden</b></th>
<th class="sort-col text-center"><b>Banned</b></th>
<th class="sort-col text-center px-0"><small><b>Hidden</b></small></th>
<th class="sort-col text-center px-0"><small><b>Banned</b></small></th>
</tr>
</thead>
<tbody>
@ -98,6 +97,12 @@
<span class="badge badge-primary">Official</span>
</a>
{% endif %}
{% if team.website %}
<a href="{{ team.website }}" target="_blank" class="badge badge-info">
<i class="btn-fa fas fa-external-link-alt" data-toggle="tooltip" data-placement="top"
title="{{ team.website }}" aria-hidden="true"></i>
</a>
{% endif %}
<span class="d-block text-muted">
<small>
{% if team.affiliation %}
@ -106,20 +111,11 @@
</small>
</span>
</td>
<td class="team-website text-center">
{% if team.website %}
<a href="{{ team.website }}" target="_blank">
<i class="btn-fa fas fa-external-link-alt" data-toggle="tooltip" data-placement="top"
title="{{ team.website }}" aria-hidden="true"></i>
</a>
{% endif %}
</td>
<td class="team-country text-center" value="{{ team.country if team.country is not none }}">
<span>
{% if team.country %}
<i class="flag-{{ team.country.lower() }}"></i>
{{ lookup_country_code(team.country) }}
<small>{{ lookup_country_code(team.country) }}</small>
{% endif %}
</span>
</td>

16
CTFd/themes/admin/templates/users/user.html
View File

@ -130,23 +130,29 @@
</h3>
<hr class="w-50">
<div class="pt-3">
<a class="edit-user">
<a class="edit-user text-dark">
<i class="btn-fa fas fa-user-edit fa-2x px-2" data-toggle="tooltip" data-placement="top" title="Edit User"></i>
</a>
<a class="award-user">
<a class="award-user text-dark">
<i class="btn-fa fas fa-trophy fa-2x px-2" data-toggle="tooltip" data-placement="top" title="Award User"></i>
</a>
<a class="email-user">
<a class="email-user text-dark">
<i class="btn-fa fas fa-envelope fa-2x px-2" data-toggle="tooltip" data-placement="top" title="Email User"></i>
</a>
<a class="delete-user">
<a class="delete-user text-dark">
<i class="btn-fa fas fa-trash-alt fa-2x px-2" data-toggle="tooltip" data-placement="top" title="Delete User"></i>
</a>
</div>
<div class="pt-3">
<a class="addresses-user">
<a class="addresses-user text-dark">
<i class="btn-fa fas fa-network-wired fa-2x px-2" data-toggle="tooltip" data-placement="top" title="IP Addresses"></i>
</a>
{% if user.website %}
<a href="{{ user.website }}" target="_blank" class="text-decoration-none text-dark">
<i class="btn-fa fas fa-external-link-alt fa-2x px-2" data-toggle="tooltip" data-placement="top"
title="{{ user.website }}" aria-hidden="true"></i>
</a>
{% endif %}
</div>
</div>
</div>

27
CTFd/themes/admin/templates/users/users.html
View File

@ -77,12 +77,11 @@
<th class="sort-col text-center"><b>ID</b></td>
<th class="sort-col text-center"><b>User</b></th>
<th class="d-md-table-cell d-lg-table-cell sort-col text-center"><b>Email</b></th>
<th class="sort-col"><b>Website</b></th>
<th class="sort-col"><b>Country</b></th>
<th class="sort-col text-center"><b>Admin</b></th>
<th class="sort-col text-center"><b>Verified</b></th>
<th class="sort-col text-center"><b>Hidden</b></th>
<th class="sort-col text-center"><b>Banned</b></th>
<th class="sort-col text-center"><b>Country</b></th>
<th class="sort-col text-center px-0"><small><b>Admin</b></small></th>
<th class="sort-col text-center px-0"><small><b>Verified</b></small></th>
<th class="sort-col text-center px-0"><small><b>Hidden</b></small></th>
<th class="sort-col text-center px-0"><small><b>Banned</b></small></th>
</tr>
</thead>
<tbody>
@ -103,6 +102,12 @@
<span class="badge badge-primary">Official</span>
</a>
{% endif %}
{% if user.website %}
<a href="{{ user.website }}" target="_blank" class="badge badge-info">
<i class="btn-fa fas fa-external-link-alt" data-toggle="tooltip" data-placement="top"
title="{{ user.website }}" aria-hidden="true"></i>
</a>
{% endif %}
{% if user.affiliation %}
<span class="d-block text-muted"><small>{{ user.affiliation | truncate(20) }}</small></span>
{% endif %}
@ -112,19 +117,11 @@
<a href="mailto:{{ user.email }}" target="_blank">{{ user.email | truncate(32) }}</a>
{% endif %}
</td>
<td class="team-website text-center">
{% if user.website %}
<a href="{{ user.website }}" target="_blank">
<i class="btn-fa fas fa-external-link-alt" data-toggle="tooltip" data-placement="top"
title="{{ user.website }}" aria-hidden="true"></i>
</a>
{% endif %}
</td>
<td class="team-country text-center" value="{{ user.country if user.country is not none }}">
<span>
{% if user.country %}
<i class="flag-{{ user.country.lower() }}"></i>
{{ lookup_country_code(user.country) }}
<small>{{ lookup_country_code(user.country) }}</small>
{% endif %}
</span>
</td>

4
CTFd/themes/core/assets/css/main.scss
View File

@ -30,6 +30,10 @@ table > thead > tr > td {
border-top: none !important;
}
.table thead th {
white-space: nowrap;
}
.fa-spin.spinner {
margin-top: 225px;
text-align: center;

2
CTFd/themes/core/static/css/main.dev.css
View File

File diff suppressed because one or more lines are too long

2
CTFd/themes/core/static/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long