Skip to content

fix: Misc template fixes #3813

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
jennifer-richards merged 3 commits into from
Apr 12, 2022
Merged

fix: Misc template fixes #3813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8019de
fix: Remove extra whitespace around parentheses
larseggert Apr 12, 2022
a72caec
fix: Make heading capitalization consistent, colorize a "No"
larseggert Apr 12, 2022
97bd6a2
fix: Pagination element, spacing, replace text with icon
larseggert Apr 12, 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
53 changes: 15 additions & 38 deletions ietf/templates/doc/document_ballot_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,7 @@
</p>
{% for p in positions %}
<div class="balloter-name mb-2">
{% if p.is_old_pos %}
<span class="text-muted">
(
{% endif %}
{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}
{{ p.balloter.plain_name }}
{% if p.comment or p.discuss %}</a>{% endif %}
{% if p.is_old_pos %}
)
</span>
{% endif %}
{% if p.is_old_pos %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">{% endif %}{{ p.balloter.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.is_old_pos %})</span>{% endif %}
</div>
{% empty %}
<span class="text-muted">(None)</span>
Expand All @@ -31,15 +21,11 @@
</div>
<div class="col-md-10">
{% if all_ballots and all_ballots|length > 1 %}
<label class="my-1 fw-bold">Ballots:</label>
<ul class="pagination pagination-sm">
<li class="disabled">
<span>
<b>Ballots</b>
</span>
</li>
{% for b in all_ballots %}
<li {% if b == ballot %}class="active"{% endif %}>
<a href="{% url "ietf.doc.views_doc.document_ballot" name=doc.name ballot_id=b.pk %}">
<li class="page-item{% if b == ballot %} active{% endif %}">
<a class="page-link" href="{% url "ietf.doc.views_doc.document_ballot" name=doc.name ballot_id=b.pk %}">
{{ b.ballot_type.name }} ({{ b.rev }})
</a>
</li>
Expand Down Expand Up @@ -118,9 +104,8 @@
<div class="card border-danger {% if p.comment %} mb-2{% endif %}">
<div class="card-header bg-danger text-light">
<div>
<b>{{ p.pos.name }}</b> ({{ p.discuss_time|date:"Y-m-d" }}
{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %}
)
<b>{{ p.pos.name }}</b>
({{ p.discuss_time|date:"Y-m-d " }}{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %})
{% if p.send_email %}
<i class="bi bi-envelope float-end"
title="Email requested to be sent for this discuss"></i>
Expand All @@ -145,9 +130,8 @@
<div class="card {{ p.pos|pos_to_border_format }}">
<div class="card-header {{ p.pos|pos_to_label_format }}">
<div>
<b>Comment</b> ({{ p.comment_time|date:"Y-m-d" }}
{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %}
)
<b>Comment</b>
({{ p.comment_time|date:"Y-m-d " }}{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %})
{% if p.send_email %}
<i class="bi bi-envelope-check float-end"
title="Email requested to be sent for this comment"></i>
Expand All @@ -174,7 +158,7 @@
{% for n, positions in position_groups %}
{% for p in positions %}
{% if p.is_old_pos %}
<p class="h5" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
<p class="h5 mt-4" id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
<span class="text-muted">({{ p.balloter.plain_name }}; former steering group member)</span>
<span class="float-end">
{% if p.old_positions %}<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>{% endif %}
Expand All @@ -193,13 +177,10 @@
<div>
<b>{{ p.pos.name }} </b>
{% if p.pos.blocking and p.discuss %}
<b>[Treat as non-blocking comment]</b> ({{ p.discuss_time|date:"Y-m-d" }}
{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %}
)
<b>[Treat as non-blocking comment]</b>
({{ p.discuss_time|date:"Y-m-d " }}{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %})
{% else %}
({{ p.comment_time|date:"Y-m-d" }}
{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %}
)
({{ p.comment_time|date:"Y-m-d " }}{% if not p.for_current_revision %}for -{{ p.get_dochistory.rev }}{% endif %})
{% endif %}
{% if p.send_email %}
<i class="bi bi-envelope float-end"
Expand All @@ -211,12 +192,8 @@
<i class="bi bi-chat float-end"
title="No email send requests for this ballot position"></i>
{% else %}
<div class="float-end small italic"
title="No ballot position send log available">
No email
<br>
send info
</div>
<i class="bi bi-envelope-slash float-end"
title="No ballot position send log available"></i>
{% endif %}
</div>
</div>
Expand All @@ -234,4 +211,4 @@
{% endfor %}
{% endfor %}
</div>
</div>
</div>
10 changes: 5 additions & 5 deletions ietf/templates/registration/edit_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ <h1>Profile information for {{ user.person.name }}</h1>
</div>
{% endif %}
<div class="row mb-3">
<label class="col-sm-2 col-form-label fw-bold">NomCom Eligible</label>
<label class="col-sm-2 col-form-label fw-bold">NomCom eligible</label>
<div class="col-sm-10">
{% with person|is_nomcom_eligible|yesno:'Yes,No,No' as is_eligible %}
<p class="form-control-plaintext {% if is_eligible == 'Yes' %}text-success fw-bold{% endif %}">
<p class="form-control-plaintext {% if is_eligible == 'Yes' %}text-success fw-bold{% else %}text-danger{% endif %}">
{{ is_eligible }}
</p>
{% endwith %}
Expand Down Expand Up @@ -95,7 +95,7 @@ <h1>Profile information for {{ user.person.name }}</h1>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label fw-bold">
External Resources
External resources
<a href="#pi" aria-label="!">
<i class="bi bi-exclamation-circle"></i>
</a>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h1>Profile information for {{ user.person.name }}</h1>
<i class="bi bi-exclamation-circle"></i>
</a>
{% endif %}
{{ email }}
{{ email|linkify }}
</td>
<td>{{ email.origin|default:'(unknown)'|urlize_ietf_docs }}</td>
</tr>
Expand Down Expand Up @@ -271,4 +271,4 @@ <h1>Profile information for {{ user.person.name }}</h1>
});

</script>
{% endblock %}
{% endblock %}