--- a/src/metadatacomposer/views.py	Thu May 16 18:11:00 2013 +0200
+++ b/src/metadatacomposer/views.py	Tue May 21 14:54:41 2013 +0200
@@ -1,13 +1,13 @@
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import ObjectDoesNotExist
 from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.http import HttpResponseNotFound, HttpResponse
 from django.shortcuts import redirect
 from django.utils.decorators import method_decorator
 from django.views.generic.base import View, TemplateResponseMixin
+from django.views.generic.edit import FormView
 from ldt.ldt_utils.models import Project, Content
+from metadatacomposer.forms import ImageUploadModelForm
+from metadatacomposer.models import Image
 
 
 import logging #@UnresolvedImport
@@ -39,10 +39,12 @@
         self.branding = branding
         
         projects = Project.safe_objects.filter(owner=request.user).order_by('-modification_date')[:6]
+        images = Image.objects.order_by('-modification_date')[:6]
+        logger.debug(images)
         contents = Content.safe_objects.order_by('-update_date')[:6]
         
         context = self.get_context_dict(request)
-        context.update({"projects":projects, "contents": contents})
+        context.update({"projects":projects, "images": images, "contents": contents})
         return self.render_to_response(context)
 
 
@@ -173,6 +175,33 @@
     
     def get(self, request, branding="iri", **kwargs):
         self.branding = branding
+        
+        # Add form
+        form = ImageUploadModelForm()
+        
         context = self.get_context_dict(request)
+        context.update({"form":form})
         return self.render_to_response(context)
-    
\ No newline at end of file
+    
+    def post(self, request, branding="iri", **kwargs):
+        self.branding = branding
+        
+        # Check form
+        form = ImageUploadModelForm(request.POST, request.FILES)
+        logger.debug("COUCOU 1")
+        logger.debug(form)
+        logger.debug(form.is_valid())
+        if form.is_valid():
+            logger.debug("COUCOU 2")
+            # If an image id was in the form, we update the existing image
+            if 'image_pk' in request.POST:
+                form = ImageUploadModelForm(request.POST, request.FILES, instance=Image.objects.get(pk=request.POST['image_pk']))
+            form.save()
+        else:
+            logger.debug("COUCOU 3")
+            context = self.get_context_dict(request)
+            context.update({"form":form})
+        return redirect(request.META['HTTP_REFERER'])
+
+
+