Manage JSON overlay

Conflicts:
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templatetags/chimere_tags.py

1 files changed, 9 insertions, 3 deletions

diff --git a/chimere/admin.py b/chimere/admin.py
index cdcd053..e18288c 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -48,8 +48,8 @@ from chimere import models
 from chimere.models import Category, Icon, SubCategory, Marker, \
     PropertyModel, News, Route, Area, ColorTheme, Color, \
     MultimediaFile, PictureFile, Importer, Layer, AreaLayers,\
-    PropertyModelChoice, Page, get_areas_for_user, \
-    ImporterKeyCategories, SubCategoryUserLimit
+    PropertyModelChoice, Page, get_areas_for_user, Overlay, \
+    ImporterKeyCategories, SubCategoryUserLimit, AreaOverlays
 from chimere.utils import ShapefileManager, KMLManager, CSVManager
 
 
@@ -443,13 +443,18 @@ class LayerInline(admin.TabularInline):
     extra = 1
 
 
+class OverlayInline(admin.TabularInline):
+    model = AreaOverlays
+    extra = 1
+
+
 class AreaAdmin(admin.ModelAdmin):
     """
     Specialized the area field.
     """
     form = AreaAdminForm
     exclude = ['upper_left_corner', 'lower_right_corner']
-    inlines = [LayerInline]
+    inlines = [LayerInline, OverlayInline]
     list_display = ['name', 'order', 'available', 'default']
 
 
@@ -600,3 +605,4 @@ if not settings.CHIMERE_HIDE_PROPERTYMODEL:
 admin.site.register(Area, AreaAdmin)
 admin.site.register(ColorTheme, ColorThemeAdmin)
 admin.site.register(Layer)
+admin.site.register(Overlay)