Correct bad link on RSS page - Correct display of RSS page (refs #65)

3 files changed, 32 insertions, 58 deletions

diff --git a/chimere/main/actions.py b/chimere/main/actions.py
index 2dba2ac..b6ee06a 100644
--- a/chimere/main/actions.py
+++ b/chimere/main/actions.py
@@ -34,9 +34,10 @@ actions = [(Action('view', '', _('View')), []),
                     (Action('edit', 'edit', _('Add a new point of interest')),
                      Action('edit_route', 'edit_route', _('Add a new route')))
            ),]
-if EMAIL_HOST:
-    actions.append((Action('contact', 'contact', _('Contact us')), []),)
 
 if 'chimere.rss' in INSTALLED_APPS:
     actions.append((Action('rss', 'rss', _('Feeds')), []))
 
+if EMAIL_HOST:
+    actions.append((Action('contact', 'contact', _('Contact us')), []),)
+
diff --git a/chimere/rss/templates/rss.html b/chimere/rss/templates/rss.html
index 52f118e..885841d 100644
--- a/chimere/rss/templates/rss.html
+++ b/chimere/rss/templates/rss.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block content %}
-
+<div id='content'>
 <fieldset class='edit'>
 <legend>{% trans "Subscribe to RSS feed" %}</legend>
 <p>* {% trans "indicates a mandatory field" %}</p>
@@ -61,5 +61,5 @@
 </form>
 
 </fieldset>
-
+</div>
 {% endblock %}
diff --git a/chimere/rss/views.py b/chimere/rss/views.py
index b82d3ae..5dd9797 100644
--- a/chimere/rss/views.py
+++ b/chimere/rss/views.py
@@ -23,27 +23,23 @@
 Views of the project
 """
 
-import datetime
-
 from django.shortcuts import render_to_response
-from django.template import loader
-from django.http import HttpResponseRedirect, HttpResponse
-from django.core import serializers
+from django.http import HttpResponseRedirect
 
 from chimere import settings
+from chimere.main.views import get_base_response
 from chimere.main.actions import actions
-
-from chimere.main.models import Category, SubCategory, PropertyModel, Marker, \
-                                Route, News, Area, Color
-
-from chimere.main.widgets import getMapJS, PointChooserWidget, \
-                         RouteChooserWidget, URL_OSM_JS, URL_OSM_CSS, AreaWidget
-from chimere.main.forms import MarkerForm, RouteForm, AreaForm, notifyStaff
+from chimere.main.models import SubCategory,Area
+from chimere.main.forms import AreaForm
+from chimere.main.widgets import AreaWidget
 
 def rss(request, area_name=''):
     '''
     Redirect to RSS subscription page
     '''
+    response_dct = get_base_response()
+    response_dct.update({'actions':actions, 'action_selected':('rss',),
+                         'category_rss_feed':'',})
     # If the form has been submited
     if request.method == "POST":
         # User has defined the kind of POI he is interested in : POI in a area
@@ -55,39 +51,29 @@ def rss(request, area_name=''):
                 return HttpResponseRedirect(feeds_link)
             # User wants to follow all the new POI by category or subcategory
             elif request.POST['rss_category'] == 'poi':
-                response_dct = {'actions':actions, 'action_selected':'rss',
-                           'media_path':settings.MEDIA_URL,
-                           'extra_url':settings.EXTRA_URL,
-                           'category_rss_feed':'category',
-                           'sub_categories':SubCategory.getAvailable(['M', 'B'])
-                }
+                response_dct['category_rss_feed'] = 'category'
+                response_dct['sub_categories'] = SubCategory.getAvailable(['M',
+                                                                           'B'])
                 return render_to_response('rss.html', response_dct)
             # User wants to follow all the new POI situated in a defined area
             elif request.POST['rss_category'] == 'area':
                 # An unbound form
                 form = AreaForm()
-                response_dct = {'actions':actions, 'action_selected':'rss',
-                                'media_path':settings.MEDIA_URL,
-                                'extra_url':settings.EXTRA_URL,
-                                'map_layer':settings.MAP_LAYER,
-                                'extra_head':form.media,
-                                'form':form,
-                                'category_rss_feed':'area',
-                                'area_id':Area.getAvailable(),
-                                'area_widget':AreaWidget().render('area', None)
-                }
+                area_widget = AreaWidget().render('area', None)
+                response_dct.update({'map_layer':settings.MAP_LAYER,
+                                     'extra_head':form.media,
+                                     'form':form,
+                                     'category_rss_feed':'area',
+                                     'area_id':Area.getAvailable(),
+                                     'area_widget':area_widget
+                })
                 return render_to_response('rss.html', response_dct)
             # Error when submitting the form
             else:
-                error = _("Error - Please choose a correct choice in the list")
-                response_dct = {'actions':actions, 'action_selected':'rss',
-                                'media_path':settings.MEDIA_URL,
-                                'extra_url':settings.EXTRA_URL,
-                                'error_message':error,
-                                'category_rss_feed':'category',
-                                'sub_categories':SubCategory.getAvailable(['M',
-                                                                           'B'])
-                }
+                error = _("Please choose a correct choice in the list")
+                response_dct.update({'error_message':error,
+                    'category_rss_feed':'category',
+                    'sub_categories':SubCategory.getAvailable(['M', 'B'])})
                 return render_to_response('rss.html', response_dct)
 
         # User has specified the category or subcategory he wants to follow =>
@@ -135,33 +121,20 @@ request.POST['lower_right_lat'] + '_' + request.POST['lower_right_lon']
             feeds_link = '/' + settings.EXTRA_URL + 'rss/global/'
             return HttpResponseRedirect(feeds_link)
         if request.GET['rss_category'] == 'poi':
-            response_dct = {'actions':actions, 'action_selected':'rss',
-                           'media_path':settings.MEDIA_URL,
-                           'extra_url':settings.EXTRA_URL,
-                           'category_rss_feed':'category',
-                           'sub_categories':SubCategory.getAvailable(['M', 'B'])
-             }
+            response_dct['category_rss_feed'] = 'category'
+            response_dct['sub_categories'] = SubCategory.getAvailable(['M','B'])
             return render_to_response('rss.html', response_dct)
         if request.GET['rss_category'] == 'area':
             # An unbound form
             form = AreaForm()
-            response_dct = {'actions':actions, 'action_selected':'rss',
-                            'media_path':settings.MEDIA_URL,
-                            'extra_url':settings.EXTRA_URL,
-                            'map_layer':settings.MAP_LAYER,
+            response_dct.update({'map_layer':settings.MAP_LAYER,
                             'extra_head':form.media,
                             'form':form,
                             'category_rss_feed':'area',
                             'area_id':Area.getAvailable(),
-                            'area_widget':AreaWidget().render('area', None)
-             }
+                            'area_widget':AreaWidget().render('area', None)})
             return render_to_response('rss.html', response_dct)
 
     # User access to the RSS tab
     else:
-        response_dct = {'actions':actions, 'action_selected':'rss',
-        'media_path':settings.MEDIA_URL,
-        'category_rss_feed':'',
-        'extra_url':settings.EXTRA_URL
-        }
         return render_to_response('rss.html', response_dct)