Merge branch 'master' into carte-ouverte

Conflicts:

	.gitignore
	chimere/main/actions.py
	chimere/urls.py

1 files changed, 13 insertions, 5 deletions

diff --git a/chimere/main/admin.py b/chimere/main/admin.py
index f63daa1..ea79f7a 100644
--- a/chimere/main/admin.py
+++ b/chimere/main/admin.py
@@ -21,6 +21,7 @@
 Settings for administration pages
 """
 
+from chimere import settings
 from chimere.main.models import Category, Icon, SubCategory, Marker, \
                              PropertyModel, News, Route, Area, ColorTheme, Color
 from chimere.main.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\
@@ -47,8 +48,11 @@ class MarkerAdmin(admin.ModelAdmin):
     Specialized the Point field.
     """
     search_fields = ("name",)
-    list_display = ('name', 'subcategory', 'status')
-    list_filter = ('status', 'subcategory')
+    list_display = ('name', 'status')
+    list_filter = ('status', 'categories')
+    exclude = ['height', 'width']
+    if 'chimere.rss' in settings.INSTALLED_APPS:
+        exclude.append('available_date')
     form = MarkerAdminForm
 
     def queryset(self, request):
@@ -68,8 +72,9 @@ class RouteAdmin(admin.ModelAdmin):
     Specialized the Route field.
     """
     search_fields = ("name",)
-    list_display = ('name', 'subcategory', 'status')
-    list_filter = ('status', 'subcategory')
+    list_display = ('name', 'status')
+    list_filter = ('status', 'categories')
+    exclude = ['height', 'width']
     form = RouteAdminForm
 
     def queryset(self, request):
@@ -118,10 +123,13 @@ class ColorInline(admin.TabularInline):
 class ColorThemeAdmin(admin.ModelAdmin):
     inlines = [ColorInline,]
 
+class IconAdmin(admin.ModelAdmin):
+    exclude = ['height', 'width']
+
 # register of differents database fields
 admin.site.register(News, NewsAdmin)
 admin.site.register(Category, CategoryAdmin)
-admin.site.register(Icon)
+admin.site.register(Icon, IconAdmin)
 admin.site.register(SubCategory, SubCategoryAdmin)
 admin.site.register(Marker, MarkerAdmin)
 admin.site.register(Route, RouteAdmin)