Icon app updates

apps/icons/classes.py

@@ -22,14 +22,14 @@ class Icon(object):
         # TODO: Move name + size resolution to sets to support size/name and
         # name_size filename conventions
         try:
-            return '%s/%s/%s' % (ICON_THEMES[ICON_SET].path, size, ICON_THEMES[ICON_SET].dictionary[self.literal])
+            return '%s/%s/%s' % (ICON_THEMES[ICON_SET].PATH, size, ICON_THEMES[ICON_SET].DICTIONARY[self.literal])
         except KeyError:
-            return '%s/%s/%s' % (ICON_THEMES[ICON_SET].path, size, ICON_THEMES[ICON_SET].dictionary[ERROR])
+            return '%s/%s/%s' % (ICON_THEMES[ICON_SET].PATH, size, ICON_THEMES[ICON_SET].DICTIONARY[ERROR])
         except AttributeError:
             pass
 
     def display(self, size): # TODO: move to widgets?
-        return mark_safe(u'<img src="%sicons/%s" />' % (settings.STATIC_URL, self.get_file_name(self.literal)))
+        return mark_safe(u'<img src="%s/icons/%s" />' % (settings.STATIC_URL, self.get_file_name(size)))
 
     def display_small(self):
         return self.display(SIZE_SMALL)

apps/icons/literals.py

@@ -21,6 +21,7 @@ LOCK = 'lock'
 MEDAL_GOLD = 'medal_gold'
 MEDAL_GOLD_ADD = 'medal_gold_add'
 MEDAL_GOLD_DELETE = 'medal_gold_delete'
+PICTURES = 'pictures'
 PLUGIN = 'plugin'
 USER = 'user'
 USER_ADD = 'user_add'

apps/icons/sets/famfamfam.py

@@ -2,6 +2,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from icons.literals import *
 
+PATH = 'famfamfam'
 ID = 'famfamfam'
 LABEL = _(u'FamFamFam')
 

apps/icons/sets/fat_cow.py

@@ -1,10 +1,8 @@
-import os
-
 from django.utils.translation import ugettext_lazy as _
 
 from icons.literals import *
 
-PATH = os.path.join('fat_cow')
+PATH = 'fat_cow'
 ID = 'fat_cow'
 LABEL = _(u'Fat cow')
 
@@ -20,5 +18,6 @@ DICTIONARY = {
     MEDAL_GOLD: 'medal_gold_1.png',
     MEDAL_GOLD_ADD: 'medal_gold_add.png',
     MEDAL_GOLD_DELETE: 'medal_gold_delete.png',  
+    PICTURES: 'pictures.png',
     PLUGIN: 'plugin.png',
 }