2 files changed, 14 insertions, 9 deletions
diff --git a/expo/imagekit_specs.py b/expo/imagekit_specs.py
index 243cb9f..fd2e0a1 100644
--- a/expo/imagekit_specs.py
+++ b/expo/imagekit_specs.py
@@ -3,20 +3,19 @@ from imagekit import processors
 
 class ResizeThumb(processors.Resize): 
     width = 100 
-    height = 75 
-    crop = True
+    crop = False
 
 class ResizeDisplay(processors.Resize):
     width = 600 
     
-class EnhanceThumb(processors.Adjustment): 
-    contrast = 1.2 
-    sharpness = 1.1 
+#class EnhanceThumb(processors.Adjustment): 
+    #contrast = 1.2
+    #sharpness = 2
 
 class Thumbnail(ImageSpec): 
     access_as = 'thumbnail_image' 
     pre_cache = True 
-    processors = [ResizeThumb, EnhanceThumb] 
+    processors = [ResizeThumb] 
 
 class Display(ImageSpec):
     increment_count = True
diff --git a/expo/models.py b/expo/models.py
index 4c8332b..74a26d4 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -17,8 +17,11 @@ from models_survex import *
 class TroggleModel(models.Model):
     new_since_parsing = models.BooleanField(default=False, editable=False)
     
+    def object_name(self):
+        return self._meta.object_name
+
     def get_admin_url(self):
-        return settings.URL_ROOT + "/admin/expo/" + self._meta.object_name.lower() + "/" + str(self.pk)
+        return settings.URL_ROOT + "/admin/expo/" + self.object_name.lower() + "/" + str(self.pk)
 
     class Meta:
 	    abstract = True
@@ -26,8 +29,11 @@ class TroggleModel(models.Model):
 class TroggleImageModel(ImageModel):
     new_since_parsing = models.BooleanField(default=False, editable=False)
     
+    def object_name(self):
+        return self._meta.object_name
+
     def get_admin_url(self):
-        return settings.URL_ROOT + "/admin/expo/" + self._meta.object_name.lower() + "/" + str(self.pk)
+        return settings.URL_ROOT + "/admin/expo/" + self.object_name.lower() + "/" + str(self.pk)
 
     class Meta:
 	    abstract = True
@@ -42,7 +48,7 @@ class Expedition(TroggleModel):
         return self.year
 
     class Meta:
-        ordering = ('year',)
+        ordering = ('-year',)
         get_latest_by = 'date_from'
     
     def get_absolute_url(self):