Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Produce correct HTML for the meeting requests table #5712

Merged
merged 2 commits into from
Jun 8, 2023
Merged

fix: Produce correct HTML for the meeting requests table #5712

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d111b6
fix: Produce correct HTML for the meeting requests table
larseggert May 29, 2023
f7adb89
Merge branch 'main' into fix-html-nits
rjsparks Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 79 additions & 45 deletions ietf/templates/meeting/requests.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,63 +18,97 @@ <h1 class="title">

<h2 class="mt-3">Requests Summary</h2>
<p class="mt-2"><em>This summary section focuses on sessions that have conflict lists to manage. It excludes requests from groups of type "team", such as those for the hackathon or for tutorials.</em></p>
<div class="mt-2">
<table class="table table-sm">
<tbody>
{% for row in summary_by_area %}
<tr>
{% if forloop.first %}
{% for col in row %}
<th scope="col" class="table-primary">{{ col }}</th>
{% endfor %}
{% else %}
{% for col in row %}
<td>{{ col }}</td>
{% endfor %}
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="row mt-2">
<div class="col">
<table class="table table-sm">
<tbody>
{% for row in summary_by_group_type %}
<tr>
{% if forloop.first %}
<div class="mt-3">
<table class="table table-sm table-striped">
{% for row in summary_by_area %}
{% if forloop.first %}
<thead>
<tr class="table-info">
{% for col in row %}
<th scope="col" class="table-primary">{{ col }}</th>
<th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
{% endfor %}
{% else %}
</tr>
</thead>
<tbody>
{% elif forloop.last %}
</tbody>
<tfoot>
<tr>
{% for col in row %}
<td>{{ col }}</td>
<th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
{% endfor %}
{# last line is missing two columns? #}
<td></td><td></td>
</tr>
</tfoot>
{% else %}
<tr>
{% for col in row %}
{% if forloop.first %}
<th scope="row">{{ col }}</th>
{% else %}
<td class="text-end">{{ col }}</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
</tr>
{% endif %}
{% endfor %}
</table>
</div>
<div class="row mt-3">
<div class="col">
<table class="table table-sm">
<tbody>
{% for row in summary_by_purpose %}
<tr>
{% if forloop.first %}
<table class="table table-sm table-striped">
{% for row in summary_by_group_type %}
{% if forloop.first %}
<thead>
<tr class="table-info">
{% for col in row %}
<th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
{% endfor %}
</tr>
</thead>
<tbody>
{% else %}
<tr>
{% for col in row %}
<th scope="col" class="table-primary">{{ col }}</th>
{% if forloop.first %}
<th scope="row">{{ col }}</th>
{% else %}
<td class="text-end">{{ col }}</td>
{% endif %}
{% endfor %}
{% else %}
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
</div>
<div class="col">
<table class="table table-sm table-striped">
{% for row in summary_by_purpose %}
{% if forloop.first %}
<thead>
<tr class="table-info">
{% for col in row %}
<th scope="col"{% if not forloop.first %} class="text-end"{% endif %}>{{ col }}</th>
{% endfor %}
</tr>
</thead>
<tbody>
{% else %}
<tr>
{% for col in row %}
<td>{{ col }}</td>
{% if forloop.first %}
<th scope="row">{{ col }}</th>
{% else %}
<td class="text-end">{{ col }}</td>
{% endif %}
{% endfor %}
{% endif %}
</tr>
{% endfor %}
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
</table>
</div>
</div>

Expand Down