xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

rest of martin's changes, without reverting lineend issues

Browse Source
This commit is contained in:
Wookey
2011-07-11 23:28:23 +01:00
parent 97c388dba0 21ff3b8b5d
commit c23fcc5b06
77 changed files with 6650 additions and 6652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/models.py
View File

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

1
parsers/cavetab.py
View File

@@ -122,7 +122,6 @@ def LoadCaveTab():
addToDefaultArgs(header,"description_file") addToDefaultArgs(header,"description_file")
break break
#The following checks if this cave is non-public i.e. we don't have rights to display it online. #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 #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. #set the non_public field of the model instance to true.

2
templates/base.html
View File

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