rest of martin's changes, without reverting lineend issues

core/models.py

@@ -384,15 +384,14 @@ class Cave(TroggleModel):
             return "%s-%s" % (self.kat_area(), self.unofficial_number)
     
     def get_absolute_url(self):
-        return urlparse.urljoin(settings.URL_ROOT, self.url)
-        #if self.kataster_number:
-        #    href = self.kataster_number
-        #elif self.unofficial_number:
-        #    href = self.unofficial_number
-        #else:
-        #    href = official_name.lower()
-        ##return settings.URL_ROOT + '/cave/' + href + '/'
-        #return urlparse.urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,}))
+        if self.kataster_number:
+            href = self.kataster_number
+        elif self.unofficial_number:
+            href = self.unofficial_number
+        else:
+            href = official_name.lower()
+        #return settings.URL_ROOT + '/cave/' + href + '/'
+        return urlparse.urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,}))
 
     def __unicode__(self):
         if self.kataster_number:

parsers/cavetab.py

@@ -122,7 +122,6 @@ def LoadCaveTab():
                     addToDefaultArgs(header,"description_file")
                     break
 
-
             #The following checks if this cave is non-public i.e. we don't have rights to display it online.
             #Noinfo was the name of the old password protected directory, so if it has that then we will
             #set the non_public field of the model instance to true.

templates/base.html

@@ -18,7 +18,7 @@
 <div id="header"> 
   <h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
   <div id="editLinks"> {% block loginInfo %}
-    <a href="{{ settings.EXPOWEB_URL }}">ExpoWeb</a> |
+    <a href="{{ settings.EXPOWEB_URL }}/index.htm">ExpoWeb</a> |
     <a href="{{ settings.URL_ROOT }}">Home</a> | 
     {% if user.username %}
     You are logged in as {{ user.username }}