Merge branch 'release' into develop

diff --combined philo/models/nodes.py
index ab3bca5,93f772a..5b8b8ed
--- 1/philo/models/nodes.py
--- 2/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@@ -1,4 -1,6 +1,6 @@@
  from inspect import getargspec
+ import mimetypes
+ from os.path import basename
  
  from django.contrib.contenttypes import generic
  from django.contrib.contenttypes.models import ContentType
@@@ -29,8 -31,8 +31,8 @@@ class Node(SlugTreeEntity)
        :class:`Node`\ s are the basic building blocks of a website using Philo. They define the URL hierarchy and connect each URL to a :class:`View` subclass instance which is used to generate an HttpResponse.
        
        """
 -      view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter)
 -      view_object_id = models.PositiveIntegerField()
 +      view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter, blank=True, null=True)
 +      view_object_id = models.PositiveIntegerField(blank=True, null=True)
        #: :class:`GenericForeignKey` to a non-abstract subclass of :class:`View`
        view = generic.GenericForeignKey('view_content_type', 'view_object_id')
        
@@@ -42,15 -44,11 +44,15 @@@
                return False
        
        def handles_subpath(self, subpath):
 -              return self.view.handles_subpath(subpath)
 +              if self.view:
 +                      return self.view.handles_subpath(subpath)
 +              return False
        
        def render_to_response(self, request, extra_context=None):
                """This is a shortcut method for :meth:`View.render_to_response`"""
 -              return self.view.render_to_response(request, extra_context)
 +              if self.view:
 +                      return self.view.render_to_response(request, extra_context)
 +              raise Http404
        
        def get_absolute_url(self, request=None, with_domain=False, secure=False):
                """
@@@ -374,23 -372,32 +376,32 @@@ class Redirect(TargetURLModel, View)
  
  class File(View):
        """Stores an arbitrary file."""
-       #: Defines the mimetype of the uploaded file. This will not be validated.
-       mimetype = models.CharField(max_length=255)
+       #: The name of the uploaded file. This is meant for finding the file again later, not for display.
+       name = models.CharField(max_length=255)
+       #: Defines the mimetype of the uploaded file. This will not be validated. If no mimetype is provided, it will be automatically generated based on the filename.
+       mimetype = models.CharField(max_length=255, blank=True)
        #: Contains the uploaded file. Files are uploaded to ``philo/files/%Y/%m/%d``.
        file = models.FileField(upload_to='philo/files/%Y/%m/%d')
        
+       def clean(self):
+               if not self.mimetype:
+                       self.mimetype = mimetypes.guess_type(self.file.name, strict=False)[0]
+                       if self.mimetype is None:
+                               raise ValidationError("Unknown file type.")
+       
        def actually_render_to_response(self, request, extra_context=None):
                wrapper = FileWrapper(self.file)
                response = HttpResponse(wrapper, content_type=self.mimetype)
                response['Content-Length'] = self.file.size
+               response['Content-Disposition'] = "inline; filename=%s" % basename(self.file.name)
                return response
        
        class Meta:
                app_label = 'philo'
        
        def __unicode__(self):
-               """Returns the path of the uploaded file."""
-               return self.file.name
+               """Returns the value of :attr:`File.name`."""
+               return self.name
  
  
  register_value_model(Node)