diff options
| -rw-r--r-- | app/locations/models.py | 8 | ||||
| -rw-r--r-- | config/base_urls.py | 23 |
2 files changed, 16 insertions, 15 deletions
diff --git a/app/locations/models.py b/app/locations/models.py index ac8ec44..0148327 100644 --- a/app/locations/models.py +++ b/app/locations/models.py @@ -147,12 +147,12 @@ class Route(models.Model): return self.name -class WritingbyLocationSitemap(Sitemap): +class WritingbyCountrySitemap(Sitemap): changefreq = "weekly" priority = 0.6 - def location(): - return '/writing/%s' % self.slug + def location(self, item): + return '/writing/%s' % item.slug def items(self): - return Location.objects.all() + return Country.objects.filter(visited=True) diff --git a/config/base_urls.py b/config/base_urls.py index 35a057b..e4a4999 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -1,11 +1,10 @@ from django.conf.urls import * from django.contrib import admin from django.views.generic import TemplateView -from django.contrib.sitemaps import FlatPageSitemap from django.conf import settings -from blog.models import BlogSitemap,LatestFull -from locations.models import WritingbyLocationSitemap +from blog.models import BlogSitemap, LatestFull +from locations.models import WritingbyCountrySitemap from links.models import LatestLinks from photos.models import PhotoGallerySitemap from projects.models.base import ProjectSitemap @@ -15,17 +14,19 @@ admin.autodiscover() sitemaps = { 'blog': BlogSitemap, + 'writingbyloc': WritingbyCountrySitemap, 'photos': PhotoGallerySitemap, 'projects': ProjectSitemap } feeds = { 'writing': LatestFull, - 'fblinks' : LatestLinks, + 'fblinks': LatestLinks, } urlpatterns = patterns('', - (r'^media/js/mainmap.js$', 'locations.views.map_data'), - (r'^media/admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT+'/admin'}), + (r'^media/js/mainmap.js$', 'locations.views.map_data'), + (r'^media/admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': + settings.MEDIA_ROOT + '/admin'}), (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), ) @@ -58,16 +59,16 @@ urlpatterns += patterns('', #about #(r'^about/$', 'blog.views.about'), #'blog.views.home'), #homepage - (r'^$', 'blog.views.home'), #'blog.views.home'), + (r'^$', 'blog.views.home'), #pages - (r'^(?P<slug>[-\w]+)/$', 'pages.views.page'), + (r'^(?P<slug>[-\w]+)/$', 'pages.views.page'), ) urlpatterns += patterns('', - url(r'^static/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.STATIC_ROOT,} - ), + url(r'^static/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': settings.STATIC_ROOT, } + ), ) urlpatterns += patterns('', url(r'^blog/comments/', include('fluent_comments.urls')), |