Skip to content

fix: Use unique data-sort attributes #3836

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

Merged
rjsparks merged 2 commits into from
Apr 19, 2022
Merged

fix: Use unique data-sort attributes #3836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df1bef
fix: Use unique `data-sort` attributes
larseggert Apr 19, 2022
db691d9
Address @rjsparks' comments
larseggert Apr 19, 2022
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
Empty file modified docker/scripts/app-create-dirs.sh
100644 → 100755
View file
Open in desktop
Empty file.
7 changes: 5 additions & 2 deletions ietf/static/js/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ function replace_with_internal(table, internal_table, i) {

function field_magic(i, e, fields) {
if ($(e)
.attr("colspan") === undefined && (fields[i] == "num" || fields[i] == "count" || fields[i] == "id")) {
.attr("colspan") === undefined &&
(fields[i] == "num" || fields[i] == "count" ||
fields[i] == "percent" || fields[i] == "id" ||
fields[i].endsWith("-num") || fields[i].endsWith("-date"))) {
$(e)
.addClass("text-end");
}
Expand Down Expand Up @@ -276,4 +279,4 @@ $(document)
$(table)[0]
.dispatchEvent(new Event("tablesorter:done"));
});
});
});
10 changes: 5 additions & 5 deletions ietf/templates/debug.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<tr>
<th scope="col" data-sort="num">#</th>
<th scope="col" data-sort="query">SQL</th>
<th scope="col" data-sort="num">Count</th>
<th scope="col" data-sort="count">Count</th>
<th scope="col" data-sort="where">WHERE</th>
<th scope="col" data-sort="num">View/Templ.</th>
<th scope="col" data-sort="num">Time</th>
<th scope="col" data-sort="num">Acc.</th>
<th scope="col" data-sort="view-num">View/Templ.</th>
<th scope="col" data-sort="time-num">Time</th>
<th scope="col" data-sort="acc-num">Acc.</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -107,4 +107,4 @@ <h4 class="modal-title" id="modal-title-{{ forloop.counter }}">QuerySet Origin f
Add <code>ietf.context_processors.sql_debug</code> to <code>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</code> to turn on the SQL statement table.
</small>
{% endif %}
{% endif %}
{% endif %}
24 changes: 12 additions & 12 deletions ietf/templates/group/review_requests.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
<tr>
<th scope="col" data-sort="request">Request</th>
<th scope="col" data-sort="type">Type</th>
<th scope="col" data-sort="date">Requested</th>
<th scope="col" data-sort="date">Deadline</th>
<th scope="col" data-sort="req-date">Requested</th>
<th scope="col" data-sort="deadline-date">Deadline</th>
<th scope="col" data-sort="state">Document state</th>
<th scope="col" data-sort="date">IESG Telechat</th>
<th scope="col" data-sort="telechat-date">IESG Telechat</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -71,11 +71,11 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
<tr>
<th scope="col" data-sort="request">Request</th>
<th scope="col" data-sort="type">Type</th>
<th scope="col" data-sort="date">Requested</th>
<th scope="col" data-sort="date">Deadline</th>
<th scope="col" data-sort="req-date">Requested</th>
<th scope="col" data-sort="deadline-date">Deadline</th>
<th scope="col" data-sort="reviewer">Reviewer</th>
<th scope="col" data-sort="state">Document state</th>
<th scope="col" data-sort="date">IESG Telechat</th>
<th scope="col" data-sort="telechat-date">IESG Telechat</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -133,13 +133,13 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
<th scope="col" data-sort="type">
Type
</th>
<th scope="col" data-sort="date">
<th scope="col" data-sort="req-date">
Requested
</th>
<th scope="col" data-sort="date">
<th scope="col" data-sort="deadline-date">
Deadline
</th>
<th scope="col" data-sort="date">
<th scope="col" data-sort="closed-date">
Closed
</th>
<th scope="col" data-sort="state">
Expand Down Expand Up @@ -188,13 +188,13 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
<th scope="col" data-sort="type">
Type
</th>
<th scope="col" data-sort="date">
<th scope="col" data-sort="assgn-date">
Assigned
</th>
<th scope="col" data-sort="date">
<th scope="col" data-sort="deadline-date">
Deadline
</th>
<th scope="col" data-sort="date">
<th scope="col" data-sort="closed-date">
Closed
</th>
<th scope="col" data-sort="reviewer">
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/liaisons/liaison_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<th scope="col" data-sort="date">Date</th>
<th scope="col" data-sort="from">From</th>
<th scope="col" class="d-none d-sm-table-cell" data-sort="to">To</th>
<th scope="col" class="d-none d-sm-table-cell" data-sort="date">Deadline</th>
<th scope="col" class="d-none d-sm-table-cell" data-sort="deadline-date">Deadline</th>
<th scope="col" data-sort="title">Title</th>
</tr>
</thead>
Expand Down Expand Up @@ -36,4 +36,4 @@
{% endfor %}
</tbody>
{% endif %}
</table>
</table>
2 changes: 1 addition & 1 deletion ietf/templates/meeting/requests.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2 class="mt-5" id="{{ area.grouper.acronym }}">
<thead>
<tr>
<th scope="col" data-sort="group">Group</th>
<th scope="col" data-sort="num">Length</th>
<th scope="col" data-sort="count">Length</th>
<th scope="col" data-sort="num">Size</th>
<th scope="col" class="d-none d-sm-table-cell" data-sort="requester">Requester</th>
<th scope="col" class="d-none d-sm-table-cell" data-sort="ad">AD</th>
Expand Down
20 changes: 10 additions & 10 deletions ietf/templates/nomcom/private_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ <h2 class="mt-3">Nomination status</h2>
<tr>
<th scope="col" data-sort="position">Position</th>
<th scope="col" data-sort="open">Open</th>
<th scope="col" data-sort="accepting">Accepting nominations</th>
<th scope="col" data-sort="accepting">Accepting feedback</th>
<th scope="col" data-sort="num">Nominations</th>
<th scope="col" data-sort="num">Unique nominees</th>
<th scope="col" data-sort="num">Accepted</th>
<th scope="col" data-sort="num">Declined</th>
<th scope="col" data-sort="num">Pending</th>
<th scope="col" data-sort="num">Questionnaire responses</th>
<th scope="col" data-sort="num">Comments</th>
<th scope="col" data-sort="accepting-nom-num">Accepting nominations</th>
<th scope="col" data-sort="accepting-fb-num">Accepting feedback</th>
<th scope="col" data-sort="nom-num">Nominations</th>
<th scope="col" data-sort="uniq-num">Unique nominees</th>
<th scope="col" data-sort="acc-num">Accepted</th>
<th scope="col" data-sort="decl-num">Declined</th>
<th scope="col" data-sort="pend-num">Pending</th>
<th scope="col" data-sort="resp-num">Questionnaire responses</th>
<th scope="col" data-sort="comm-num">Comments</th>
</tr>
</thead>
{% if stats %}
Expand Down Expand Up @@ -246,4 +246,4 @@ <h2 class="mt-3">
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}
8 changes: 4 additions & 4 deletions ietf/templates/nomcom/view_feedback.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3 class="mt-5" id="declined">Declined each nominated position</h3>
<th scope="col" data-sort="first">First name</th>
<th scope="col" data-sort="last">Last name</th>
<th scope="col" data-sort="email">Email</th>
{% for ft in nominee_feedback_types %}<th scope="col" data-sort="num">{{ ft.name }}</th>{% endfor %}
{% for ft in nominee_feedback_types %}<th scope="col" data-sort="{{ ft.name|slugify }}-num">{{ ft.name }}</th>{% endfor %}
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -61,7 +61,7 @@ <h2 class="mt-5" id="topics">Feedback related to topics</h2>
<thead>
<tr>
<th scope="col" data-sort="topic">Topic</th>
{% for ft in topic_feedback_types %}<th scope="col" data-sort="num">{{ ft.name }}</th>{% endfor %}
{% for ft in topic_feedback_types %}<th scope="col" data-sort="{{ ft.name|slugify }}-num">{{ ft.name }}</th>{% endfor %}
</tr>
</thead>
<tbody>
Expand All @@ -88,7 +88,7 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
<thead>
<tr>
<th scope="col"></th>
{% for ft in independent_feedback_types %}<th scope="col" data-sort="num">{{ ft.name }}</th>{% endfor %}
{% for ft in independent_feedback_types %}<th scope="col" data-sort="{{ ft.name|slugify }}-num">{{ ft.name }}</th>{% endfor %}
</tr>
</thead>
<tbody>
Expand All @@ -104,4 +104,4 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}
4 changes: 2 additions & 2 deletions ietf/templates/person/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ <h2 class="mt-5" id="rfcs">
<th scope="col" data-sort="rfc">RFC</th>
<th scope="col" data-sort="date">Date</th>
<th scope="col" data-sort="title">Title</th>
<th scope="col" data-sort="title">Cited by</th>
<th scope="col" data-sort="citedby">Cited by</th>
</thead>
<tbody>
{% for doc in person.rfcs %}
Expand Down Expand Up @@ -172,4 +172,4 @@ <h2 class="mt-5">
});
});
</script>
{% endblock %}
{% endblock %}
6 changes: 3 additions & 3 deletions ietf/templates/stats/document_stats_author_affiliation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="affiliation">Affiliation</th>
<th scope="col" data-sort="num">Percentage of authors</th>
<th scope="col" data-sort="num">Authors</th>
<th scope="col" data-sort="percent">Percentage of authors</th>
<th scope="col" data-sort="count">Authors</th>
</tr>
</thead>
{% if table_data %}
Expand Down Expand Up @@ -110,4 +110,4 @@ <h2>Affiliation Aliases</h2>
<p>
<a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
</p>
{% endif %}
{% endif %}
4 changes: 2 additions & 2 deletions ietf/templates/stats/document_stats_author_citations.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="num">Citations</th>
<th scope="col" data-sort="num">Percentage of authors</th>
<th scope="col" data-sort="percent">Percentage of authors</th>
<th scope="col" data-sort="authors">Authors</th>
</tr>
</thead>
Expand All @@ -69,4 +69,4 @@ <h2>Data</h2>
{% endif %}
</table>

<p>Note that the citation counts do not exclude self-references.</p>
<p>Note that the citation counts do not exclude self-references.</p>
6 changes: 3 additions & 3 deletions ietf/templates/stats/document_stats_author_continent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="continent">Continent</th>
<th scope="col" data-sort="num">Percentage of authors</th>
<th scope="col" data-sort="num">Authors</th>
<th scope="col" data-sort="percent">Percentage of authors</th>
<th scope="col" data-sort="count">Authors</th>
</tr>
</thead>
{% if table_data %}
Expand All @@ -66,4 +66,4 @@ <h2>Data</h2>
with each draft. Since this varies across documents, a traveling
author may be counted in more than country, making the total sum
more than 100%.
</p>
</p>
4 changes: 2 additions & 2 deletions ietf/templates/stats/document_stats_author_country.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="country">Country</th>
<th scope="col" class="text-end" data-sort="percentage">Percentage of authors</th>
<th scope="col" class="text-end" data-sort="percent">Percentage of authors</th>
<th scope="col" class="text-end" data-sort="authors">Authors</th>
</tr>
</thead>
Expand Down Expand Up @@ -133,4 +133,4 @@ <h2>Country Aliases</h2>
<p>
<a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
</p>
{% endif %}
{% endif %}
6 changes: 3 additions & 3 deletions ietf/templates/stats/document_stats_author_documents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="num">Documents</th>
<th scope="col" data-sort="num">Percentage of authors</th>
<th scope="col" data-sort="num">Authors</th>
<th scope="col" data-sort="percent">Percentage of authors</th>
<th scope="col" data-sort="count">Authors</th>
</tr>
</thead>
{% if table_data %}
Expand All @@ -66,4 +66,4 @@ <h2>Data</h2>
{% endfor %}
</tbody>
{% endif %}
</table>
</table>
4 changes: 2 additions & 2 deletions ietf/templates/stats/document_stats_author_hindex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="num">h-index</th>
<th scope="col" data-sort="num">Percentage of authors</th>
<th scope="col" data-sort="percent">Percentage of authors</th>
<th scope="col" data-sort="Authors">Authors</th>
</tr>
</thead>
Expand Down Expand Up @@ -80,4 +80,4 @@ <h2>Data</h2>
</p>
<p>
Note that the h-index calculations do not exclude self-references.
</p>
</p>
6 changes: 3 additions & 3 deletions ietf/templates/stats/document_stats_authors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ <h3>Data</h3>
<thead>
<tr>
<th scope="col" data-sort="num">Authors</th>
<th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
<th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
</tr>
</thead>
{% if table_data %}
Expand All @@ -65,4 +65,4 @@ <h3>Data</h3>
{% endfor %}
</tbody>
{% endif %}
</table>
</table>
4 changes: 2 additions & 2 deletions ietf/templates/stats/document_stats_format.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="format">Format</th>
<th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="label">{{ doc_label|capfirst }}s</th>
</tr>
</thead>
Expand All @@ -61,4 +61,4 @@ <h2>Data</h2>
{% endfor %}
</tbody>
{% endif %}
</table>
</table>
6 changes: 3 additions & 3 deletions ietf/templates/stats/document_stats_formlang.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="formal">Formal language</th>
<th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
<th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
</tr>
</thead>
{% if table_data %}
Expand All @@ -61,4 +61,4 @@ <h2>Data</h2>
{% endfor %}
</tbody>
{% endif %}
</table>
</table>
6 changes: 3 additions & 3 deletions ietf/templates/stats/document_stats_pages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ <h2>Data</h2>
<thead>
<tr>
<th scope="col" data-sort="num">Pages</th>
<th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
<th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
<th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
</tr>
</thead>
{% if table_data %}
Expand All @@ -59,4 +59,4 @@ <h2>Data</h2>
{% endfor %}
</tbody>
{% endif %}
</table>
</table>
Loading