1 files changed, 25 insertions, 7 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index 4c728e7..ae6fbc4 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -35,13 +35,14 @@ except ImportError:
     pass
 
 from chimere.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\
-                          NewsAdminForm, CategoryAdminForm, ImporterAdminForm
+     SubCategoryAdminForm, NewsAdminForm, CategoryAdminForm, ImporterAdminForm,\
+     PageAdminForm
 from chimere.models import Category, Icon, SubCategory, Marker, \
-     PropertyModel, News, Route, Area, ColorTheme, Color, MultimediaType, \
-     MultimediaFile, PictureFile, Importer, Layer, AreaLayers
+     PropertyModel, News, Route, Area, ColorTheme, Color, RouteFile,\
+     MultimediaType, MultimediaFile, PictureFile, Importer, Layer, AreaLayers,\
+     PropertyModelChoice, MultimediaExtension, Page
 from chimere.utils import unicode_normalize, ShapefileManager, KMLManager,\
                           CSVManager
-from chimere.widgets import TextareaWidget
 
 def get_areas_for_user(user):
     """
@@ -114,9 +115,9 @@ class MarkerAdmin(admin.ModelAdmin):
     list_filter = ('status', 'categories')
     actions = [validate, export_to_kml, export_to_shapefile, export_to_csv]
     exclude = ['submiter_session_key', 'import_key', 'import_version',
-               'available_date']
+               'available_date', 'ref_item']
     readonly_fields = ['submiter_email', 'submiter_comment', 'import_source',
-                       'ref_item', 'modified_since_import']
+                       'submiter_name', 'ref_item', 'modified_since_import']
     form = MarkerAdminForm
     inlines = [MultimediaInline, PictureInline]
 
@@ -205,6 +206,11 @@ class ImporterAdmin(admin.ModelAdmin):
     actions = [importing, cancel_import, export_to_osm, cancel_export]
 admin.site.register(Importer, ImporterAdmin)
 
+class PageAdmin(admin.ModelAdmin):
+    """
+    Use the TinyMCE widget for the page content
+    """
+    form = PageAdminForm
 
 class NewsAdmin(admin.ModelAdmin):
     """
@@ -238,14 +244,26 @@ class MultimediaTypeAdmin(admin.ModelAdmin):
     list_display = ('name', 'media_type', 'mime_type', 'iframe', 'available')
     list_filter = ('media_type', 'available')
 
+class MultimediaExtensionAdmin(admin.ModelAdmin):
+    list_display = ('name', 'multimedia_type')
+    list_filter = ('multimedia_type',)
+
+class PropertyModelChoiceInline(admin.TabularInline):
+    model = PropertyModelChoice
+    extra = 1
+class PropertyModelAdmin(admin.ModelAdmin):
+    inlines = [PropertyModelChoiceInline]
+
 # register of differents database fields
+admin.site.register(Page, PageAdmin)
 admin.site.register(News, NewsAdmin)
 admin.site.register(Category, CategoryAdmin)
 admin.site.register(Icon, IconAdmin)
 admin.site.register(Marker, MarkerAdmin)
 admin.site.register(Route, RouteAdmin)
-admin.site.register(PropertyModel)
+admin.site.register(PropertyModel, PropertyModelAdmin)
 admin.site.register(Area, AreaAdmin)
 admin.site.register(ColorTheme, ColorThemeAdmin)
+admin.site.register(MultimediaExtension, MultimediaExtensionAdmin)
 admin.site.register(MultimediaType, MultimediaTypeAdmin)
 admin.site.register(Layer)