First steps towards bios and photos in the tracker

 - Legacy-Id: 11247

Author: rjsparks

ietf/group/urls_info.py

@@ -19,5 +19,6 @@
     (r'^bofs/$', views.bofs),
     (r'^email-aliases/$', 'ietf.group.views.email_aliases'),
     (r'^bofs/create/$', views_edit.edit, {'action': "create"}, "bof_create"),
+    (r'^chair-photos/$', views.chair_photos),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
 )

ietf/group/views.py

@@ -870,3 +870,12 @@ def derived_archives(request, acronym=None, group_type=None):
                      'group':group,
                      'list_acronym':list_acronym,
                   }))
+
+def chair_photos(request, group_type=None):
+    if not group_type=='wg':
+        raise Http404
+    chair_roles = sorted(Role.objects.filter(group__type='wg',group__state='active',name_id='chair'),key=lambda x: x.person.last_name()+x.person.name+x.group.acronym)
+    for role in chair_roles:
+        role.last_initial = role.person.last_name()[0]
+    return render(request, 'group/chair_photos.html', {'chair_roles':chair_roles})
+

ietf/nomcom/models.py

@@ -4,7 +4,6 @@
 from django.db import models
 from django.db.models.signals import post_delete
 from django.conf import settings
-from django.core.files.storage import FileSystemStorage
 from django.contrib.auth.models import User
 from django.template.loader import render_to_string
 from django.template.defaultfilters import linebreaks
@@ -22,6 +21,8 @@
                                initialize_requirements_for_position,
                                delete_nomcom_templates)
 
+from ietf.utils.storage import NoLocationMigrationFileSystemStorage
+
 
 def upload_path_handler(instance, filename):
     return os.path.join(instance.group.acronym, 'public.cert')
@@ -32,14 +33,6 @@ class ReminderDates(models.Model):
     nomcom = models.ForeignKey('NomCom')
 
 
-class NoLocationMigrationFileSystemStorage(FileSystemStorage):
-
-    def deconstruct(obj):
-        path, args, kwargs = FileSystemStorage.deconstruct(obj)
-        kwargs["location"] = None
-        return (path, args, kwargs)
-    
-
 class NomCom(models.Model):
     public_key = models.FileField(storage=NoLocationMigrationFileSystemStorage(location=settings.NOMCOM_PUBLIC_KEYS_DIR),
                                   upload_to=upload_path_handler, blank=True, null=True)

ietf/person/migrations/0008_add_biography_field.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0007_auto_20160520_0304'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='biography',
+            field=models.TextField(help_text=b'Short biography for use on leadership pages.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='personhistory',
+            name='biography',
+            field=models.TextField(help_text=b'Short biography for use on leadership pages.', blank=True),
+            preserve_default=True,
+        ),
+    ]

ietf/person/migrations/0009_populate_biography.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import ietf.utils.storage
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0009_populate_biography'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='photo',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos/', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='person',
+            name='photo_thumb',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos/', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='personhistory',
+            name='photo',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos/', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='personhistory',
+            name='photo_thumb',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos/', blank=True),
+            preserve_default=True,
+        ),
+    ]

ietf/person/migrations/0010_add_photo_fields.py

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import os
+
+from hashids import Hashids
+
+from django.db import migrations
+from django.conf import settings
+from django.utils.text import slugify
+
+def photo_name(person,thumb=False):
+    hasher = Hashids(salt='Person photo name salt',min_length=5)
+    return '%s-%s%s' % ( slugify(person.ascii), hasher.encode(person.id), '-th' if thumb else '' )
+
+def forward(apps,schema_editor):
+    Person = apps.get_model('person','Person')
+    images_dir = os.path.join(settings.PHOTOS_DIR,settings.PHOTO_URL_PREFIX)
+    image_filenames = []
+    for (dirpath, dirnames, filenames) in os.walk(images_dir):
+        image_filenames.extend(filenames)
+        break # Only interested in the files in the top directory
+    image_basenames = [os.path.splitext(name)[0] for name in image_filenames]
+    for person in Person.objects.all():
+        dirty = False
+        if photo_name(person,thumb=False) in image_basenames:
+            person.photo = image_filenames[image_basenames.index(photo_name(person,thumb=False))]
+            dirty = True
+        if photo_name(person,thumb=True) in image_basenames:
+            person.photo_thumb = image_filenames[image_basenames.index(photo_name(person,thumb=True))]
+            dirty = True
+        if dirty:
+            person.save()
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0010_add_photo_fields'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse)
+    ]

ietf/person/migrations/0011_populate_photos.py

@@ -2,15 +2,19 @@
 
 import datetime
 from urlparse import urljoin
+from hashids import Hashids
 
 from django.conf import settings
 
 from django.db import models
 from django.contrib.auth.models import User
 from django.template.loader import render_to_string
+from django.utils.text import slugify
+
 
 from ietf.person.name import name_parts, initials
 from ietf.utils.mail import send_mail_preformatted
+from ietf.utils.storage import NoLocationMigrationFileSystemStorage
 
 class PersonInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)      # When this Person record entered the system
@@ -23,6 +27,9 @@ class PersonInfo(models.Model):
     ascii_short = models.CharField("Abbreviated Name (ASCII)", max_length=32, null=True, blank=True, help_text="Example: A. Nonymous.  Fill in this with initials and surname only if taking the initials and surname of the ASCII name above produces an incorrect initials-only form. (Blank is OK).")
     affiliation = models.CharField(max_length=255, blank=True, help_text="Employer, university, sponsor, etc.")
     address = models.TextField(max_length=255, blank=True, help_text="Postal mailing address.")
+    biography = models.TextField(blank=True, help_text="Short biography for use on leadership pages.")
+    photo = models.ImageField(storage=NoLocationMigrationFileSystemStorage(location=settings.PHOTOS_DIR),upload_to=settings.PHOTO_URL_PREFIX,blank=True)
+    photo_thumb = models.ImageField(storage=NoLocationMigrationFileSystemStorage(location=settings.PHOTOS_DIR),upload_to=settings.PHOTO_URL_PREFIX,blank=True)
 
     def __unicode__(self):
         return self.plain_name()
@@ -84,6 +91,11 @@ def formatted_email(self):
     def full_name_as_key(self):
         # this is mostly a remnant from the old views, needed in the menu
         return self.plain_name().lower().replace(" ", ".")
+
+    def photo_name(self,thumb=False):
+        hasher = Hashids(salt='Person photo name salt',min_length=5)
+        return '%s-%s%s' % ( slugify(self.ascii), hasher.encode(self.id), '-th' if thumb else '' )
+
     class Meta:
         abstract = True
 

ietf/person/models.py

@@ -104,6 +104,8 @@
 IETF_ID_URL = MEDIA_URL + 'id/'
 IETF_ID_ARCHIVE_URL = MEDIA_URL + 'archive/id/'
 
+PHOTOS_DIR = '/a/www/www6/'
+PHOTO_URL_PREFIX = 'photos/'
 
 # Absolute path to the directory static files should be collected to.
 # Example: "/var/www/example.com/static/"

ietf/settings.py

@@ -0,0 +1,62 @@
+{% extends "base.html" %}
+{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{% load origin staticfiles %}
+
+{% block morecss %}
+.well { max-width: 150px;}
+{% endblock %}
+
+{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
+
+{% block title %}Chair Photos{% endblock %}
+
+{% block content %}
+  {% origin %}
+  {% load ietf_filters %}
+
+  <h1>Chair Photos</h1>
+
+  {% regroup chair_roles by last_initial as alphabet_blocks %}
+  <div class="col-md-11">
+  {% for letter in alphabet_blocks %}
+   <div class="row anchor-target" id="{{letter.grouper}}">
+    <div class="panel panel-default">
+      <div class="panel-heading">{{letter.grouper}}</div>
+      <div class="panel-body">
+        <ul class="list-inline">
+        {% regroup letter.list by person as person_groups %}
+        {% for person_with_groups in person_groups %}
+         <li>
+         <div class="well">
+           {% if person_with_groups.grouper.photo_thumb %}
+             <img width=100px src="{{person_with_groups.grouper.photo_thumb.url}}"/>
+           {% endif %}
+           {% if person_with_groups.grouper.photo %}
+             <div><a href="{{person_with_groups.grouper.photo.url}}"><strong>{{person_with_groups.grouper.plain_name}}</strong></a></div>
+           {% else %}
+             <div><strong>{{person_with_groups.grouper.plain_name}}</strong></div>
+           {% endif %}
+           <div>
+           {% for role in person_with_groups.list %}   
+               {{role.group.acronym}}
+           {% endfor %}
+           </div>
+         </div>
+         </li>
+        {% endfor %}
+        </ul>
+      </div>
+    </div>
+   </div>
+  {% endfor %}
+  </div>
+
+  <div class="col-md-1 hidden-print bs-docs-sidebar" id="affix">
+    <ul class="nav nav-pills nav-stacked small fixed" data-spy="affix">
+      {% for letter in alphabet_blocks %}
+        <li><a href="#{{letter.grouper}}">{{letter.grouper}}</a></li>
+      {% endfor %}
+    </ul>
+  </div>
+
+{% endblock %}