# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1241382477 0
# Node ID 5eed5e7c1c98f77cb6c0928433132f0621dd29fc
# Parent  a39907cd63e2bdd7942320a1ffe10e545d967669
Remove fields in the user profile that were superceded by the django-elsewhere application: website, icq, aim, etc.

diff -r a39907cd63e2 -r 5eed5e7c1c98 gpp/bio/forms.py
--- a/gpp/bio/forms.py	Sun May 03 20:18:14 2009 +0000
+++ b/gpp/bio/forms.py	Sun May 03 20:27:57 2009 +0000
@@ -30,9 +30,6 @@
     location = forms.CharField(required=False, widget=forms.TextInput(attrs={'size' : 64 }))
     occupation = forms.CharField(required=False, widget=forms.TextInput(attrs={'size' : 64 }))
     interests = forms.CharField(required=False, widget=forms.TextInput(attrs={'size' : 64 }))
-    website_1 = forms.URLField(required=False, widget=forms.TextInput(attrs={'size' : 64 }))
-    website_2 = forms.URLField(required=False, widget=forms.TextInput(attrs={'size' : 64 }))
-    website_3 = forms.URLField(required=False, widget=forms.TextInput(attrs={'size' : 64 }))
 
     class Meta:
         model = UserProfile
@@ -109,4 +106,3 @@
     def get_filename(self):
         return self.cleaned_data['avatar_file'].name
 
-# vim: ts=4 sw=4
diff -r a39907cd63e2 -r 5eed5e7c1c98 gpp/bio/models.py
--- a/gpp/bio/models.py	Sun May 03 20:18:14 2009 +0000
+++ b/gpp/bio/models.py	Sun May 03 20:27:57 2009 +0000
@@ -27,17 +27,9 @@
             help_text='Optional; the year is not shown to others')
     occupation = models.CharField(max_length=128, blank=True)
     interests = models.CharField(max_length=255, blank=True)
-    website_1 = models.URLField(verify_exists=False, blank=True)
-    website_2 = models.URLField(verify_exists=False, blank=True)
-    website_3 = models.URLField(verify_exists=False, blank=True)
     profile_text = models.TextField(blank=True)
     profile_html = models.TextField(blank=True)
     hide_email = models.BooleanField(default=True)
-    icq = models.CharField('ICQ', max_length=15, blank=True)
-    aim = models.CharField('AIM', max_length=18, blank=True)
-    yim = models.CharField('YIM', max_length=25, blank=True)
-    msnm = models.CharField('MSN', max_length=25, blank=True)
-    twitter = models.CharField(max_length=64, blank=True)
     signature = models.TextField(blank=True)
     signature_html = models.TextField(blank=True)
     avatar = models.ImageField(upload_to=avatar_file_path, blank=True)
@@ -55,4 +47,3 @@
         self.signature_html = html.strip()
         super(UserProfile, self).save(*args, **kwargs)
 
-# vim: ts=4 sw=4
diff -r a39907cd63e2 -r 5eed5e7c1c98 gpp/templates/bio/view_profile.html
--- a/gpp/templates/bio/view_profile.html	Sun May 03 20:18:14 2009 +0000
+++ b/gpp/templates/bio/view_profile.html	Sun May 03 20:27:57 2009 +0000
@@ -24,33 +24,12 @@
    {% if profile.interests %}
    <tr><th>Interests</th><td>{{ profile.interests }}</td></tr>
    {% endif %}
-   {% if profile.website_1 %}
-   <tr><th>Website 1</th><td><a href="{{ profile.website_1 }}">{{ profile.website_1 }}</a></td></tr>
-   {% endif %}
-   {% if profile.website_2 %}
-   <tr><th>Website 2</th><td><a href="{{ profile.website_2 }}">{{ profile.website_2 }}</a></td></tr>
-   {% endif %}
-   {% if profile.website_3 %}
-   <tr><th>Website 3</th><td><a href="{{ profile.website_3 }}">{{ profile.website_3 }}</a></td></tr>
-   {% endif %}
    {% if not profile.hide_email %}
    <tr><th>Email</th><td>{{ subject.email }}</td></tr>
    {% endif %}
    {% if profile.icq %}
    <tr><th>ICQ</th><td>{{ profile.icq }}</td></tr>
    {% endif %}
-   {% if profile.aim %}
-   <tr><th>AIM</th><td>{{ profile.aim }}</td></tr>
-   {% endif %}
-   {% if profile.yim %}
-   <tr><th>YIM</th><td>{{ profile.yim }}</td></tr>
-   {% endif %}
-   {% if profile.msnm %}
-   <tr><th>MSN</th><td>{{ profile.msnm }}</td></tr>
-   {% endif %}
-   {% if profile.twitter %}
-   <tr><th>Twitter</th><td><a href="{{ profile.twitter }}">{{ profile.twitter }}</a></td></tr>
-   {% endif %}
    {% if profile.profile_html %}
    <tr><th>Profile</th><td>{{ profile.profile_html|safe }}</td></tr>
    {% endif %}
@@ -66,6 +45,8 @@
    <a href="{% url bio-edit_profile %}">Edit Profile</a></li>
    <li><a href="{% url bio-change_avatar %}"><img src="{{ MEDIA_URL }}icons/image_edit.png" alt="Change Avatar" /></a>
       <a href="{% url bio-change_avatar %}">Change Avatar</a></li>
+   <li><a href="{% url bio-edit_elsewhere %}"><img src="{{ MEDIA_URL }}icons/link_edit.png" alt="Edit Links" /></a>
+   <a href="{% url bio-edit_elsewhere %}">Edit Elsewhere Links</a></li>
    <li><a href="{% url django.contrib.auth.views.password_change %}"><img src="{{ MEDIA_URL }}icons/key.png" alt="Change Password" /></a>
       <a href="{% url django.contrib.auth.views.password_change %}">Change Password</a></li>
 </ul>