Syntax correction (refs #65)

5 files changed, 13 insertions, 17 deletions

diff --git a/chimere/main/actions.py b/chimere/main/actions.py
index c6d2060..2dba2ac 100644
--- a/chimere/main/actions.py
+++ b/chimere/main/actions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2008  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2008-2010  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -38,5 +38,5 @@ if EMAIL_HOST:
     actions.append((Action('contact', 'contact', _('Contact us')), []),)
 
 if 'chimere.rss' in INSTALLED_APPS:
-    actions.append(Action('rss', 'rss', _('Feeds')), [])
+    actions.append((Action('rss', 'rss', _('Feeds')), []))
 
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
     '''
diff --git a/chimere/urls.py b/chimere/urls.py
index d32b628..7b9b3c7 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -23,7 +23,7 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 admin.autodiscover()
 
-from settings import ROOT_PATH, EXTRA_URL
+from settings import ROOT_PATH, EXTRA_URL, INSTALLED_APPS
 
 from main.models import Area
 
@@ -76,6 +76,6 @@ urlpatterns += patterns('chimere.main.views',
 (BASE + EXTRA + r'ty/(?P<tiny_urn>\w+)$', 'redirectFromTinyURN', default_dct),
 )
 
-if 'chimere.rss' in settings.INSTALLED_APPS:
+if 'chimere.rss' in INSTALLED_APPS:
     urlpatterns += patterns('',
                             (r'^' + EXTRA_URL, include('chimere.rss.urls')),)