Provide a description for categories - #61

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@41 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

2 files changed, 15 insertions, 3 deletions

diff --git a/main/models.py b/main/models.py
index ee0d11c..f56f854 100644
--- a/main/models.py
+++ b/main/models.py
@@ -55,7 +55,7 @@ class Color(models.Model):
     """Color
     """
     code = models.CharField(_("Code"), max_length=6)
-    order = models.IntegerField(_("Ordre"))
+    order = models.IntegerField(_("Order"))
     color_theme = models.ForeignKey(ColorTheme, verbose_name=_("Color theme"))
     def __unicode__(self):
         return self.code
@@ -69,6 +69,7 @@ class Category(models.Model):
     name = models.CharField(_("Name"), max_length=150)
     available = models.BooleanField(_("Available"))
     order = models.IntegerField(_("Order"))
+    description = models.CharField(_("Description"), max_length=5000)
     def __unicode__(self):
         return self.name
     class Meta:
diff --git a/main/views.py b/main/views.py
index aba24f0..d19c345 100644
--- a/main/views.py
+++ b/main/views.py
@@ -30,8 +30,8 @@ from django.core import serializers
 
 from chimere import settings
 from chimere.main.actions import actions
-from chimere.main.models import SubCategory, PropertyModel, Marker, Route, \
-                                News, Area, Color
+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
@@ -186,6 +186,17 @@ def getDetail(request, marker_id):
     response_dct= {'media_path':settings.MEDIA_URL, 'marker':marker}
     return render_to_response('detail.html', response_dct)
 
+def getDescriptionDetail(request, category_id):
+    '''
+    Get the description for a category
+    '''
+    try:
+        category = Category.objects.filter(id=int(category_id))[0]
+    except (ValueError, IndexError):
+        return HttpResponse('no results')
+    response_dct= {'media_path':settings.MEDIA_URL, 'category':category}
+    return render_to_response('category_detail.html', response_dct)
+
 def getGeoObjects(request, category_ids, status='A'):
     '''
     Get the JSON for a route