old_contents: from django import template
  from django.utils.safestring import mark_safe
  from django.utils.translation import ugettext as _
  
  from mygpo.api.models import DEVICE_TYPES
  
  register = template.Library()
  
  # Create a dictionary of device_type -> caption mappings
  DEVICE_TYPES_DICT = dict(DEVICE_TYPES)
  
  # This dictionary maps device types to their icon files
  DEVICE_TYPE_ICONS = {
          'desktop': 'computer.png',
          'laptop': 'stock_notebook.png',
          'mobile': 'stock_cell-phone.png',
          'server': 'server.png',
          'other': 'audio-x-generic.png',
  }
  
  @register.filter
  def device_icon(device, size=16):
      icon = DEVICE_TYPE_ICONS.get(device, None)
      caption = DEVICE_TYPES_DICT.get(device, None)
  
      if icon is not None and caption is not None:
          html = ('<img src="/media/%(size)dx%(size)d/%(icon)s" '+
                  'alt="%(caption)s" class="device_icon"/>') % locals()
          return mark_safe(html)
  
      return ''
  
  @register.filter
  def device_list(devices):
      return mark_safe(', '.join([ '<a href="/device/%s">%s&nbsp;%s</a>' % (d.id, device_icon(d), d.name) for d in devices]))
  
  
new_contents: from django import template
  from django.utils.safestring import mark_safe
  from django.utils.translation import ugettext as _
  
  from mygpo.api.models import DEVICE_TYPES
  
  register = template.Library()
  
  # Create a dictionary of device_type -> caption mappings
  DEVICE_TYPES_DICT = dict(DEVICE_TYPES)
  
  # This dictionary maps device types to their icon files
  DEVICE_TYPE_ICONS = {
          'desktop': 'computer.png',
          'laptop': 'stock_notebook.png',
          'mobile': 'stock_cell-phone.png',
          'server': 'server.png',
          'other': 'audio-x-generic.png',
  }
  
  @register.filter
  def device_icon(device, size=16):
      icon = DEVICE_TYPE_ICONS.get(device.type, None)
      caption = DEVICE_TYPES_DICT.get(device.type, None)
  
      if icon is not None and caption is not None:
          html = ('<img src="/media/%(size)dx%(size)d/%(icon)s" '+
                  'alt="%(caption)s" class="device_icon"/>') % locals()
          return mark_safe(html)
  
      return ''
  
  @register.filter
  def device_list(devices):
      return mark_safe(', '.join([ '<a href="/device/%s">%s&nbsp;%s</a>' % (d.id, device_icon(d), d.name) for d in devices]))
  
  
subject: Fix problem with device icons