diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-21 18:54:27 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-21 18:54:27 +0200 |
| commit | eae78a7605cfe7e54207e4ecc75e7b4fabdbbe02 (patch) | |
| tree | ba23470dffdd96bf857584d49315db4ebf7a6c32 /chimere/feeds.py | |
| parent | a966ee5c1cc4e21fe33d284221a0dffd8e227a8b (diff) | |
| parent | 087919acf3e4945313034715f045c686ae3c543b (diff) | |
| download | Chimère-eae78a7605cfe7e54207e4ecc75e7b4fabdbbe02.tar.bz2 Chimère-eae78a7605cfe7e54207e4ecc75e7b4fabdbbe02.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/static/chimere/js/jquery.chimere.js
Diffstat (limited to 'chimere/feeds.py')
| -rw-r--r-- | chimere/feeds.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chimere/feeds.py b/chimere/feeds.py index 057fe5e..c4ee7a5 100644 --- a/chimere/feeds.py +++ b/chimere/feeds.py @@ -40,7 +40,7 @@ class BaseFeed(Feed): cat = 0 if item.categories.all() and item.categories.all()[0]: cat = item.categories.all()[0].pk - return reverse('chimere:index') + '?zoom=16&lat=%d&lon=%d&'\ + return reverse('chimere:index') + '?zoom=16&lat=%f&lon=%f&'\ 'current_feature=%d&checked_categories=%d' % (coord.y, coord.x, item.id, cat) @@ -57,8 +57,8 @@ class LatestPOIsByCategory(BaseFeed): ''' Last Points of interests by category in Feeds ''' - title_template = "rss_title.html" - description_template = "rss_descr.html" + title_template = "chimere/feeds/rss_title.html" + description_template = "chimere/feeds/rss_descr.html" def get_object(self, request, category_id, area_name=''): return get_object_or_404(Category, id=category_id) @@ -92,8 +92,8 @@ class LatestPOIsBySubCategory(BaseFeed): ''' Last Points of interests by SubCategory in Feeds ''' - title_template = "rss_title.html" - description_template = "rss_descr.html" + title_template = "chimere/feeds/rss_title.html" + description_template = "chimere/feeds/rss_descr.html" def get_object(self, request, category_id, area_name=''): return get_object_or_404(SubCategory, id=category_id) @@ -117,8 +117,8 @@ class LatestPOIs(BaseFeed): ''' Last Points of interests ''' - title_template = "rss_title.html" - description_template = "rss_descr.html" + title_template = "chimere/feeds/rss_title.html" + description_template = "chimere/feeds/rss_descr.html" def title(self): return settings.PROJECT_NAME + u" - " + _(u"Last points of interest") @@ -138,8 +138,8 @@ class LatestPOIsByZone(BaseFeed): ''' Last Points of interests by zone by coordinates ''' - title_template = "rss_title.html" - description_template = "rss_descr.html" + title_template = "chimere/feeds/rss_title.html" + description_template = "chimere/feeds/rss_descr.html" upper_left_lat = 0 upper_left_lon = 0 lower_right_lat = 0 @@ -200,8 +200,8 @@ class LatestPOIsByZoneID(BaseFeed): ''' Last Points of interests by zone by id ''' - title_template = "rss_title.html" - description_template = "rss_descr.html" + title_template = "chimere/feeds/rss_title.html" + description_template = "chimere/feeds/rss_descr.html" def get_object(self, request, area_id, area_name=''): return get_object_or_404(Area, id=area_id) |