Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/forms.py
	chimere/models.py
	chimere/static/chimere/js/jquery.chimere.js

1 files changed, 6 insertions, 29 deletions

diff --git a/chimere/admin.py b/chimere/admin.py
index 53362ec..24d28ed 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -170,14 +170,6 @@ class AreaAdmin(admin.ModelAdmin):
     exclude = ['upper_left_corner', 'lower_right_corner']
     inlines = [LayerInline]
 
-class SubCategoryAdmin(admin.ModelAdmin):
-    """
-    Specialized the subcategory admin
-    """
-    list_display = ('name', 'category', 'available')
-    list_filter = ('category',)
-    form = SubCategoryAdminForm
-
 def importing(modeladmin, request, queryset):
     for importer in queryset:
         importer.state = unicode(tasks.IMPORT_MESSAGES['import_pending'][0])
@@ -226,11 +218,17 @@ class NewsAdmin(admin.ModelAdmin):
     """
     form = NewsAdminForm
 
+class SubcatInline(admin.TabularInline):
+    model = SubCategory
+    extra = 1
+
 class CategoryAdmin(admin.ModelAdmin):
     """
     Use the TinyMCE widget for categories
     """
     form = CategoryAdminForm
+    inlines = [SubcatInline]
+    list_display = ['name', 'order']
 
 class ColorInline(admin.TabularInline):
     model = Color
@@ -241,28 +239,11 @@ class ColorThemeAdmin(admin.ModelAdmin):
 class IconAdmin(admin.ModelAdmin):
     exclude = ['height', 'width']
 
-class RouteFileAdmin(admin.ModelAdmin):
-    list_display = ['name', 'file_type']
-
-class MultimediaExtensionAdmin(admin.ModelAdmin):
-    list_display = ('name', 'multimedia_type')
-    list_filter = ('multimedia_type',)
-
 class MultimediaTypeAdmin(admin.ModelAdmin):
     search_fields = ("name",)
     list_display = ('name', 'media_type', 'mime_type', 'iframe', 'available')
     list_filter = ('media_type', 'available')
 
-class MultimediaFileAdmin(admin.ModelAdmin):
-    search_fields = ("name",)
-    list_display = ('name', 'multimedia_type', 'order')
-    list_filter = ('multimedia_type',)
-
-class PictureFileAdmin(admin.ModelAdmin):
-    search_fields = ("name",)
-    list_display = ('name', 'picture', 'miniature', 'order')
-    list_filter = ('miniature',)
-
 class PropertyModelChoiceInline(admin.TabularInline):
     model = PropertyModelChoice
     extra = 1
@@ -274,15 +255,11 @@ admin.site.register(Page, PageAdmin)
 admin.site.register(News, NewsAdmin)
 admin.site.register(Category, CategoryAdmin)
 admin.site.register(Icon, IconAdmin)
-admin.site.register(SubCategory, SubCategoryAdmin)
 admin.site.register(Marker, MarkerAdmin)
-admin.site.register(RouteFile, RouteFileAdmin)
 admin.site.register(Route, RouteAdmin)
 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(MultimediaFile, MultimediaFileAdmin)
-admin.site.register(PictureFile, PictureFileAdmin)
 admin.site.register(Layer)