Skip to content

Commit 19f3861

Browse files
levkowetzlevkowetz
committed
Added a link to a user's personal profile page to the account info page, and moved the GDPR fine print to the bottom. Turned the 'personal-info' dagger symbols into links to the fine print. Added a dagger to the 'External Resources' section. Partially related to issue ietf-tools#3093.
 - Legacy-Id: 18547
1 parent de8d00c commit 19f3861

1 file changed

Lines changed: 44 additions & 35 deletions

File tree

‎ietf/templates/registration/edit_profile.html‎

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,14 @@
1010

1111
{% block content %}
1212
{% origin %}
13-
<h1>Profile for {{ user.username }}</h1>
13+
<h1>Profile information for {{ user.person.name }}</h1>
1414

15-
<p>
16-
Personal information in the datatracker which is derived from your contributions
17-
to the IETF standards development process is covered by the EU General Data Protection
18-
Regulation's
19-
<a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">Article 6(1)&nbsp;(f)</a>
20-
covering IETF's Legitimate Interest due to the IETF's mission of developing standards
21-
for the internet. See also the page on <a href="/help/personal-information">handling
22-
of personal information</a>.
23-
24-
</p>
25-
<p>
26-
27-
Personal information which is <b>not</b> derived from your contributions is covered by the EU
28-
<a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">GDPR Article 6(1)&nbsp;(a)</a>
29-
regarding consent. All such information is visible on this page and shown with the
30-
dagger symbol &dagger; next to it, or listed on your
31-
<a href="{% url 'ietf.community.views.view_list' user.username %}">notification subscription page</a>. Most of this
32-
information can be edited or removed on these page. There are some exceptions, such
33-
as photos, which currently require an email to <a href="mailto:{{settings.SECRETARIAT_INFO_EMAIL}}">the Secretariat</a>
34-
if you wish to update or remove the information.
15+
<p>&nbsp;</p>
3516

36-
</p>
3717
<p>
38-
39-
All the information the datatracker has that is coupled to this account and visible
40-
on this page or otherwise related to your work on ietf documents, is also available
41-
to you as a <a href="{% url 'ietf.api.views.PersonalInformationExportView' %}">JSON blob</a> when
42-
you are logged in.
43-
18+
The information you provide below is used to generate your <a href="{% url 'ietf.person.views.profile' email_or_name=user.person.email %}">public datatracker profile page</a>
4419
</p>
4520

46-
4721
<hr>
4822

4923
<form class="form-horizontal" method="post">
@@ -56,7 +30,7 @@ <h1>Profile for {{ user.username }}</h1>
5630

5731

5832
<div class="form-group">
59-
<label class="col-sm-2 control-label">User name &dagger;</label>
33+
<label class="col-sm-2 control-label">User name <a href="#pi">&dagger;</a></label>
6034
<div class="col-sm-10">
6135
<p class="form-control-static">
6236
{{ user.username }}
@@ -67,7 +41,7 @@ <h1>Profile for {{ user.username }}</h1>
6741
</div>
6842

6943
<div class="form-group">
70-
<label class="col-sm-2 control-label">Password &dagger;</label>
44+
<label class="col-sm-2 control-label">Password <a href="#pi">&dagger;</a></label>
7145
<div class="col-sm-10">
7246
<p class="form-control-static">
7347

@@ -79,7 +53,7 @@ <h1>Profile for {{ user.username }}</h1>
7953

8054
{% if person.photo %}
8155
<div class="form-group">
82-
<label class="col-sm-2 control-label">Photo &dagger;</label>
56+
<label class="col-sm-2 control-label">Photo <a href="#pi">&dagger;</a></label>
8357
<div class="col-sm-10">
8458
<p class="form-control-static">
8559
<a href="{{person.photo.url}}">
@@ -103,7 +77,7 @@ <h1>Profile for {{ user.username }}</h1>
10377

10478
If you've done so and the calculation is still incorrect, please
10579
send a note to
106-
<a href="mailto:{{settings.SECRETARIAT_TICKET_EMAIL}}">{{settings.SECRETARIAT_TICKET_EMAIL}}</a>.<br/>
80+
<a href="mailto:{{settings.SECRETARIAT_INFO_EMAIL}}">{{settings.SECRETARIAT_INFO_EMAIL}}</a>.<br/>
10781
See <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc7437'%}">RFC 7437</a>
10882
for eligibility requirements.
10983

@@ -112,7 +86,7 @@ <h1>Profile for {{ user.username }}</h1>
11286
</div>
11387

11488
<div class="form-group">
115-
<label class="col-sm-2 control-label">External Resources</label>
89+
<label class="col-sm-2 control-label">External Resources <a href="#pi">&dagger;</a></label>
11690
<div class="col-sm-10 form-control-static">
11791
{% for extres in person.personextresource_set.all %}
11892
<div class="row">
@@ -139,7 +113,7 @@ <h1>Profile for {{ user.username }}</h1>
139113
<td><input type="radio" name="primary_email" value="{{ email.pk }}" {% if email.primary %}checked{% endif %}></td>
140114
<td><input type="checkbox" name="active_emails" value="{{ email.pk }}" {% if email.active %}checked{% endif %}></td>
141115
<td>
142-
{% if email.origin == person.user.username or email.origin == '' %}&dagger;{% endif %}
116+
{% if email.origin == person.user.username or email.origin == '' %}<a href="#pi">&dagger;</a>{% endif %}
143117
{{ email }}
144118
</td>
145119
<td>{{ email.origin|default:'(unknown)' }}</td>
@@ -185,6 +159,41 @@ <h1>Profile for {{ user.username }}</h1>
185159
</div>
186160
</form>
187161

162+
<hr>
163+
164+
<p id="pi"><strong>[&dagger;] Personal information requiring consent:</strong></p>
165+
166+
<p>
167+
Personal information in the datatracker which is derived from your contributions
168+
to the IETF standards development process is covered by the EU General Data Protection
169+
Regulation's
170+
<a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">Article 6(1)&nbsp;(f)</a>
171+
covering IETF's Legitimate Interest due to the IETF's mission of developing standards
172+
for the internet. See also the page on <a href="/help/personal-information">handling
173+
of personal information</a>.
174+
175+
</p>
176+
<p>
177+
178+
Personal information which is <b>not</b> derived from your contributions is covered by the EU
179+
<a href="https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016R0679#d1e1888-1-1">GDPR Article 6(1)&nbsp;(a)</a>
180+
regarding consent. All such information is visible on this page and shown with the
181+
dagger symbol (<strong>&dagger;</strong>) next to it, or listed on your
182+
<a href="{% url 'ietf.community.views.view_list' user.username %}">notification subscription page</a>. Most of this
183+
information can be edited or removed on these pages. There are some exceptions, such
184+
as photos, which currently require an email to <a href="mailto:{{settings.SECRETARIAT_INFO_EMAIL}}">the Secretariat</a>
185+
if you wish to update or remove the information.
186+
187+
</p>
188+
<p>
189+
190+
All the information the datatracker has that is coupled to this account and visible
191+
on this page or otherwise related to your work on ietf documents, is also available
192+
to you as a <a href="{% url 'ietf.api.views.PersonalInformationExportView' %}">JSON blob</a> when
193+
you are logged in. It contains both the Legitimate Interest information and the information
194+
that requires Consent.
195+
196+
</p>
188197

189198
{% endblock %}
190199

0 commit comments

Comments
 (0)