diff options
| -rw-r--r-- | app/builder/base.py | 6 | ||||
| -rw-r--r-- | app/notes/models.py | 2 | ||||
| -rw-r--r-- | design/templates/base.html | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/builder/base.py b/app/builder/base.py index 7c85ad9..34ecb4c 100644 --- a/app/builder/base.py +++ b/app/builder/base.py @@ -91,7 +91,7 @@ class BuildWriting(Build): def build_writing_archives(self): qs = self.get_model_querset() - self.build_archive_pages(qs, 'writing/') + self.build_archive_pages(qs, 'jrnl/') def build_region_archive_pages(self): model = get_model('locations', 'Region') @@ -99,7 +99,7 @@ class BuildWriting(Build): regions = model.objects.all() for c in regions: qs = blog.objects.filter(status__exact=1, location__state__country__lux_region=c.id).order_by('-pub_date') - path = 'writing/%s/' % (c.slug) + path = 'jrnl/%s/' % (c.slug) self.build_archive_pages(qs, path) def build_country_archive_pages(self): @@ -108,7 +108,7 @@ class BuildWriting(Build): countries = model.objects.filter(visited=True) for c in countries: qs = blog.objects.filter(status__exact=1, location__state__country=c).order_by('-pub_date') - path = 'writing/%s/' % (c.slug) + path = 'jrnl/%s/' % (c.slug) self.build_archive_pages(qs, path) def writing_year_archives(self): diff --git a/app/notes/models.py b/app/notes/models.py index 818a139..62b8992 100644 --- a/app/notes/models.py +++ b/app/notes/models.py @@ -48,7 +48,7 @@ class Note(models.Model): return self.slug def get_absolute_url(self): - return '/notes/%s/%s' % (self.date_created.strftime("%Y/%m").lower(), self.slug) + return '/field-notes/%s/%s' % (self.date_created.strftime("%Y/%m").lower(), self.slug) @property def state(self): diff --git a/design/templates/base.html b/design/templates/base.html index ae6042f..3ca9ff6 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -33,10 +33,10 @@ </header> <nav role="navigation" class="bl"> <ul> - <li id="stories"><a href="/writing/" title="An archive of writings from around the world">Writing</a></li> + <li id="stories"><a href="/jrnl/" title="An archive of writings from around the world">Journal</a></li> <li id="photos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li> <!--<li id="guides"><a href="/travel-guide/1/" title="Travel Guides, Tips, Tricks and Recommendations">Guides</a>,</li>--> - <li id="notes"><a href="/notes/" title="Shorter thoughts, sometimes syndicated to twitter">Notes</a></li> + <li id="field-notes"><a href="/field-notes/" title="Shorter thoughts, sometimes syndicated to twitter">Notes</a></li> <li id="maps"><a href="/map" title="Maps and miscellanea">Map</a></li> <li id="projects" ><a href="/projects/" title="Luxagraf: Projects">Projects</a></li> <li id="etc" class="last"><a href="/about" title="About Luxagraf">Etc</a></li> |