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

feat: More clarity in nomcom feedback, and ... #7191

Merged
merged 2 commits into from
Mar 16, 2024
Merged

feat: More clarity in nomcom feedback, and ... #7191

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
1a9583b
feat: Remove trailing period from photo title, etc
richsalz Mar 16, 2024
df686bf
feat: Remove email link in NomCom feedback
richsalz Mar 16, 2024
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
6 changes: 3 additions & 3 deletions ietf/templates/nomcom/feedback.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h2 class="navskip mt-4">
<small class="text-body-secondary">{{ form.nominee.email.person.name }} for {{ form.position.name }}</small>
</h2>
<p class="mt-3">
Provide feedback about {% person_link form.nominee.person %}
Provide feedback about {% person_link form.nominee.person with_email=False %}
for the <b>{{ form.position.name }}</b> position.
</p>
{% elif form.topic %}
Expand All @@ -97,8 +97,8 @@ <h2 >
{% endif %}
<p>
This feedback will only be available to
<a href="{% url 'ietf.nomcom.views.year_index' year=year %}">NomCom {{ year }}</a>.
You may have the feedback mailed back to you by selecting the option below.
<a href="{% url 'ietf.nomcom.views.year_index' year=year %}">the current NomCom</a>.
You can have the feedback mailed back to you by selecting the option below.
</p>
<form class="float-start" id="feedbackform" method="post">
{% csrf_token %}
Expand Down
6 changes: 3 additions & 3 deletions ietf/templates/person/person_link.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% if email and email == "[email protected]" or name and name == "(System)" %}<span class="text-body-secondary">(System)</span>{% else %}<span {% if class %}class="{{ class }}"
{% endif %}>{% if email or name %}<a {% if class %}class="text-reset"{% endif %}
title="{% if title %}{{ title }}{% else %}Datatracker profile of {{ name }}.{% endif %}"
title="{% if title %}{{ title }}{% else %}Datatracker profile of {{ name }}{% endif %}"
{% if email %} href="{% url 'ietf.person.views.profile' email_or_name=email %}" {% else %} href="{% url 'ietf.person.views.profile' email_or_name=name %}" {% endif %}>{{ name }}</a>{% if email and with_email %} <a {% if class %}class="text-reset"{% endif %}
href="mailto:{{ email|urlencode }}"
aria-label="Compose email to {{ email }}."
title="Compose email to {{ email }}.">
aria-label="Compose email to {{ email }}"
title="Compose email to {{ email }}">
<i class="bi bi-envelope"></i></a>{% endif %}{% else %}<span class="text-body-secondary">(None)</span>{% endif %}</span>{% endif %}
2 changes: 1 addition & 1 deletion ietf/templates/person/photo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load origin static person_filters %}
<div class="card shadow-sm mb-3 text-center photo">
{% if name or email %}
<a title="Datatracker profile of {{ person.name }}."
<a title="Datatracker profile of {{ person.name }}"
href="{% if name %}{% url 'ietf.person.views.profile' email_or_name=name %}{% else %}{% url 'ietf.person.views.profile' email_or_name=email %}{% endif %}">
{% endif %}
{% if person.photo_thumb %}
Expand Down
Loading