Link IndividualMember to user profile page

accounts/forms.py

@@ -20,10 +20,13 @@ class ProfileForm(forms.ModelForm):
     email = forms.EmailField(
         required=False, widget=forms.TextInput(attrs={"placeholder": _("Email")})
     )
+    bio = forms.CharField(
+        required=False, widget=forms.Textarea(attrs={"placeholder": _("Bio")})
+    )
 
     class Meta:
         model = Profile
-        fields = ["name"]
+        fields = ["name", "bio"]
 
     def __init__(self, *args, **kwargs):
         instance = kwargs.get("instance", None)

accounts/migrations/0003_profile_bio.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-19 01:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0002_migrate_sha1_passwords"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="profile",
+            name="bio",
+            field=models.TextField(blank=True),
+        ),
+    ]

accounts/models.py

@@ -5,6 +5,7 @@
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=200, blank=True)
+    bio = models.TextField(blank=True)
 
     def __str__(self):
         return self.name or str(self.user)

accounts/tests.py

@@ -24,7 +24,7 @@ def setUpTestData(cls):
 
     def test_username_is_page_title(self):
         response = self.client.get(self.user1_url)
-        self.assertContains(response, "<h1>user1</h1>", html=True)
+        self.assertContains(response, '<h1 class="name">user1</h1>', html=True)
 
     def test_stat_commits(self):
         Revision.objects.create(

djangoproject/scss/_style.scss

@@ -3189,9 +3189,41 @@ hr {
 }
 
 .user-info {
+    // Keep this value in sync with the width value of the img element in the HTML.
+    $user_info_avatar_img_width: 150px;
+
     .avatar {
         @include framed-image();
-        float: right;
+        margin: 4rem 1rem 0rem 1rem;
+
+        // Using `float: right` causes the image to separate words vertically by its own height on some screen sizes.
+        @include respond-min(811px) {
+            float: right;
+            margin: 4rem 1rem 1rem 1rem;
+        }
+    }
+
+    .name {
+        margin-bottom: 0;
+
+        @include respond-min(811px) {
+            // These rules prevents the unwanted vertical space between words as described in the `.avatar` class.
+            display: inline-block;
+            max-width: calc(100% - $user_info_avatar_img_width);
+        }
+
+        @include respond-max(810px) {
+            // Reposition the name when it's below the image on small screens.
+            margin-top: 2rem;
+        }
+    }
+
+    .bio {
+        @include font-size(16);
+        font-weight: normal;
+        line-height: 1.5;
+        white-space: pre-line;
+        margin-top: 0;
     }
 }
 

djangoproject/settings/common.py

@@ -53,6 +53,8 @@
 
 DEFAULT_FROM_EMAIL = "noreply@djangoproject.com"
 FUNDRAISING_DEFAULT_FROM_EMAIL = "fundraising@djangoproject.com"
+# TODO(ertgl): Update `settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL`.
+INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL = DEFAULT_FROM_EMAIL
 
 FIXTURE_DIRS = [str(PROJECT_PACKAGE.joinpath("fixtures"))]
 

djangoproject/templates/accounts/edit_profile.html

@@ -27,6 +27,13 @@ <h1>{% translate "Edit your profile" %}</h1>
             <p>{{ form.email }}</p>
         </div>
 
+        <div>
+            {% if form.bio.errors %}
+                <p class="errors">{{ form.bio.errors.as_text }}</p>
+            {% endif %}
+            <p>{{ form.bio }}</p>
+        </div>
+
         <div class="submit">
             <input class="cta" type="submit" value="{% translate "Save" %}"/>
         </div>

djangoproject/templates/accounts/user_profile.html

@@ -15,7 +15,7 @@ <h2 id="aside-header">
 
         <p>{% translate "Need to edit something? Here's how:" %}</p>
         <ul>
-            <li><a href="{% url 'edit_profile' %}">{% translate "Edit your name and email here." %}</a></li>
+            <li><a href="{% url 'edit_profile' %}">{% translate "Edit your name, email and bio here." %}</a></li>
             <li>{% blocktranslate trimmed %}
                 The image is the <a href="https://en.gravatar.com/">Gravatar</a> linked
                 to the email address you signed up with. You can change the image over
@@ -37,10 +37,16 @@ <h2 id="aside-header">
         <img class='avatar' width='150' height='150'
              src="https://secure.gravatar.com/avatar/{{ email_hash }}?s=150&amp;d=https%3A%2F%2Frobohash.org%2F{{ email_hash }}%3Fset%3Dset3%26size%3D150x150">
 
-        <h1>
+        <h1 class="name">
             {% firstof user_obj.profile.name user_obj.username %}
         </h1>
 
+        {% if user_obj.profile.bio %}
+            <p class="bio">
+                {{ user_obj.profile.bio }}
+            </p>
+        {% endif %}
+
         {% if stats %}
             <h2>{% translate "Statistics on Django core contributions:" %}</h2>
             <ul>

djangoproject/templates/members/email/account_invite.txt

@@ -0,0 +1,17 @@
+{% spaceless %}
+Hello {{ name }},
+
+We're updating the Django Individual Members list so each member's name can link to their djangoproject.com profile. On your profile, you can share a short bio, highlight your contributions to Django or the community, and provide ways for others to get in touch.
+
+To have your name linked, please create an account (if you don't already have one) at:
+
+{% url 'registration_register' %}
+
+Once your account is ready, let us know your username so we can connect it to the members list.
+
+This small step helps the community grow more connected and makes it easier for everyone to explore and engage with it.
+
+Thank you for being part of the Django community.
+
+Django Software Foundation
+{% endspaceless %}

djangoproject/templates/members/individualmember_list.html

@@ -77,7 +77,13 @@ <h1>{% translate "Individual members" %}</h1>
 
   <ul>
     {% for member in members %}
-      <li>{{ member.name }}</li>
+      <li>
+        {% if member.user %}
+          <a href="{% url 'user_profile' username=member.user.username %}">{{ member.name }}</a>
+        {% else %}
+          {{ member.name }}
+        {% endif %}
+      </li>
     {% endfor %}
   </ul>
 
@@ -87,7 +93,14 @@ <h2>{% translate "Former members" %}</h2>
 
     <ul>
       {% for member in former_members %}
-        <li>{{ member.name }}{% if member.reason_for_leaving %} ({{ member.reason_for_leaving }}){% endif %}</li>
+        <li>
+          {% if member.user %}
+            <a href="{% url 'user_profile' username=member.user.username %}">{{ member.name }}</a>
+          {% else %}
+            {{ member.name }}
+          {% endif %}
+          {% if member.reason_for_leaving %}({{ member.reason_for_leaving }}){% endif %}
+        </li>
       {% endfor %}
     </ul>
   {% endif %}

members/admin.py

@@ -1,12 +1,20 @@
 from datetime import date, timedelta
 
-from django.contrib import admin
+from django.contrib import admin, messages
+from django.contrib.auth import get_permission_codename
+from django.db import transaction
 from django.templatetags.static import static
 from django.utils.formats import localize
 from django.utils.html import format_html
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _, ngettext
 
-from members.models import CorporateMember, IndividualMember, Invoice, Team
+from members.models import (
+    CorporateMember,
+    IndividualMember,
+    IndividualMemberAccountInviteSendMailStatus,
+    Invoice,
+    Team,
+)
 
 
 @admin.register(IndividualMember)
@@ -17,8 +25,77 @@ class IndividualMemberAdmin(admin.ModelAdmin):
         "is_active",
         "member_since",
         "member_until",
+        "account_invite_mail_sent_at",
     ]
     search_fields = ["name"]
+    list_filter = ["member_until", "account_invite_mail_sent_at"]
+    autocomplete_fields = ["user"]
+    actions = ["send_account_invite_mail"]
+
+    @admin.action(
+        description=_("Send account invite mail to selected individual members"),
+        permissions=["send_account_invite_mail"],
+    )
+    def send_account_invite_mail(self, request, queryset):
+        with transaction.atomic():
+            results = IndividualMember.send_account_invite_mails(queryset)
+        sent_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.SENT,
+            0,
+        )
+        failed_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.FAILED,
+            0,
+        )
+        skipped_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.SKIPPED,
+            0,
+        )
+        if sent_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Sent account invite mail to 1 individual member.",
+                    "Sent account invite mail to %(count)d individual members.",
+                    sent_count,
+                )
+                % {"count": sent_count},
+                messages.SUCCESS,
+            )
+        if failed_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Failed to send account invite mail to 1 individual member.",
+                    "Failed to send account invite mail to %(count)d individual members.",
+                    failed_count,
+                )
+                % {"count": failed_count},
+                messages.ERROR,
+            )
+        if skipped_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    (
+                        "Skipped sending account invite mail to 1 individual member"
+                        " (already has an account linked or an invite mail has been"
+                        " sent)."
+                    ),
+                    (
+                        "Skipped sending account invite mail to %(count)d individual"
+                        " members (already have accounts linked or invite mails have"
+                        " been sent)."
+                    ),
+                    skipped_count,
+                )
+                % {"count": skipped_count},
+                messages.INFO,
+            )
+
+    def has_send_account_invite_mail_permission(self, request):
+        codename = get_permission_codename("send_account_invite_mail", self.opts)
+        return request.user.has_perm(f"{self.opts.app_label}.{codename}")
 
 
 class InvoiceInline(admin.TabularInline):

members/migrations/0010_individualmember_user.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.7 on 2025-10-19 18:16
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0009_alter_individualmember_add_reason_help_text"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="individualmember",
+            name="user",
+            field=models.OneToOneField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

members/migrations/0011_alter_individualmember_options_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 5.2.7 on 2025-10-20 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0010_individualmember_user"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="individualmember",
+            options={
+                "ordering": ["name"],
+                "permissions": [
+                    (
+                        "send_account_invite_mail",
+                        "Can send account invite mail to an individual member",
+                    )
+                ],
+            },
+        ),
+        migrations.AddField(
+            model_name="individualmember",
+            name="account_invite_mail_sent_at",
+            field=models.DateTimeField(blank=True, db_index=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="individualmember",
+            name="member_until",
+            field=models.DateField(blank=True, db_index=True, null=True),
+        ),
+    ]