diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-19 20:45:52 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-19 20:45:52 +0100 |
| commit | 992d117bd212e487f040227be111709ca7d50c48 (patch) | |
| tree | b326393d602b6b3f0868bfcb5a336dd289d2c02f /chimere/rss | |
| parent | df7280ea8573db04f496cb3dea4f693d3fd782a5 (diff) | |
| download | Chimère-992d117bd212e487f040227be111709ca7d50c48.tar.bz2 Chimère-992d117bd212e487f040227be111709ca7d50c48.zip | |
Syntax correction (refs #65)
Diffstat (limited to 'chimere/rss')
| -rw-r--r-- | chimere/rss/feeds.py | 10 | ||||
| -rw-r--r-- | chimere/rss/urls.py | 4 | ||||
| -rw-r--r-- | chimere/rss/views.py | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/chimere/rss/feeds.py b/chimere/rss/feeds.py index af7956b..1c4e015 100644 --- a/chimere/rss/feeds.py +++ b/chimere/rss/feeds.py @@ -75,7 +75,7 @@ class LatestPOIsBySubCategory(Feed): Last Points of interests by SubCategory in Feeds ''' title_template = "rss_title.html" - description_template = "rss_descr.html" + description_template = "rss_descr.html" def get_object(self, bits): if len(bits) != 1: raise ObjectDoesNotExist @@ -112,7 +112,7 @@ class LatestPOIs(Feed): Last Points of interests ''' title_template = "rss_title.html" - description_template = "rss_descr.html" + description_template = "rss_descr.html" def title(self): return u"%s - Last POIs" % settings.PROJECT_NAME @@ -236,8 +236,8 @@ class LatestPOIsByZoneID(Feed): return "" def item_link(self, item): - coord = item.point - coord.transform(settings.EPSG_PROJECTION) + coord = item.point + coord.transform(settings.EPSG_PROJECTION) return settings.BASE_URL + '?zoom=16&lat=' + str(coord.y) + '&lon=' + \ str(coord.x) + '&layers=BTT&checked_categories=1&display_submited=false' @@ -245,7 +245,7 @@ str(coord.x) + '&layers=BTT&checked_categories=1&display_submited=false' return item.available_date def items(self, obj): - upper_left_lat = float(obj.upper_left_corner.x) + upper_left_lat = float(obj.upper_left_corner.x) upper_left_lon = float(obj.upper_left_corner.y) lower_right_lat = float(obj.lower_right_corner.x) lower_right_lon = float(obj.lower_right_corner.y) diff --git a/chimere/rss/urls.py b/chimere/rss/urls.py index 3b61969..9c841c8 100644 --- a/chimere/rss/urls.py +++ b/chimere/rss/urls.py @@ -35,8 +35,8 @@ feeds = { } urlpatterns = patterns('', - (BASE + EXTRA + r'rss/$', 'chimere.rss.views.rss'), - (BASE + EXTRA + r'rss/(?P<url>.*)/$', + (EXTRA + r'rss/$', 'chimere.rss.views.rss'), + (EXTRA + r'rss/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), ) diff --git a/chimere/rss/views.py b/chimere/rss/views.py index dc42584..305d255 100644 --- a/chimere/rss/views.py +++ b/chimere/rss/views.py @@ -36,15 +36,11 @@ from chimere.main.actions import actions from chimere.main.models import Category, SubCategory, PropertyModel, Marker, \ Route, News, Area, Color -# Pierre CLARENC : 19/01/2010 : Add AreaWidget from chimere.main.widgets import getMapJS, PointChooserWidget, \ - RouteChooserWidget, URL_OSM_JS, URL_OSM_CSS, AreaWidget -# Pierre CLARENC : 19/01/2010 : End -# Pierre CLARENC : 19/01/2010 : Add AreaAdminForm + RouteChooserWidget, URL_OSM_JS, URL_OSM_CSS, AreaWidget from chimere.main.forms import MarkerForm, RouteForm, AreaForm, notifyStaff -# Pierre CLARENC : 19/01/2010 : End -def rss(request): +def rss(request, area_name=''): ''' Redirect to RSS subscription page ''' |