--- a/lib/folder.py	Fri Dec 21 20:36:03 2007 +0000
+++ b/lib/folder.py	Fri Dec 21 20:45:03 2007 +0000
@@ -1,6 +1,6 @@
 import os, os.path
 
-import settings, image, utils
+import settings, image, utils, helpers
 from log import index, render
 from template import gallery as gallery_tpl
 from helpers import url_for_page
@@ -178,7 +178,7 @@
         """
         return 'dir', self.path, ''
 
-    def breadcrumb (self) :
+    def breadcrumb (self, forImg=None) :
         """
             Returns a [(fname, title)] list of this dir's parent dirs
         """
@@ -188,12 +188,25 @@
         d = 0
         
         while f :
-            b.insert(0, (dirUp(d), f.title))
+            # functionality of the slightly-hacked-in variety
+            if f is self and forImg is not None :
+                url = helpers.url_for_page(self.getPageNumber(forImg))
+            else :
+                url = dirUp(d)
+                
+            b.insert(0, (url, f.title))
 
             d += 1
             f = f.parent
         
         return b
+        
+    def getPageNumber (self, img) :
+        """
+            Get the page number that the given image is on
+        """
+        
+        return self.sorted_images.index(img) // settings.IMAGE_COUNT
 
     def countParents (self, acc=0) :
         if self.parent :