Merge pull request sigurdga#34 from ET-CS/master

Great work again!

I think you should be able to set my repo as a remote and push to that. But it is also good to have a little code review before a merge :)

Author: sigurdga

fileupload/templates/base.html

@@ -9,7 +9,7 @@
     <meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Bootstrap CSS Toolkit styles -->
-    <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
+    -<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
     <!-- Generic page styles -->
     <link rel="stylesheet" href="{{ STATIC_URL }}css/style.css">
     <!-- Bootstrap styles for responsive website layout, supporting different screen sizes -->
@@ -53,4 +53,4 @@ <h1>No content set</h1>
 
     {% endblock %}
 </body>
-</html>
+</html>

fileupload/templates/fileupload/picture_form.html

@@ -45,10 +45,6 @@ <h2 class="lead">Basic Plus UI version</h2>
         <!-- The table listing the files available for upload/download -->
         <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
     </form>
-    <div class="fileupload-content">
-        <table class="files"></table>
-        <div class="fileupload-progressbar"></div>
-    </div>
 </div>
 <!-- The blueimp Gallery widget -->
 <div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
@@ -85,4 +81,4 @@ <h3 class="title"></h3>
 <!--[if gte IE 8]>
 <script src="{{ STATIC_URL }}js/cors/jquery.xdr-transport.js"></script>
 <![endif]-->
-{% endblock %}
+{% endblock %}

fileupload/views.py

@@ -41,11 +41,6 @@ def form_valid(self, form):
         response['Content-Disposition'] = 'inline; filename=files.json'
         return response
 
-    def get_context_data(self, **kwargs):
-        context = super(PictureCreateView, self).get_context_data(**kwargs)
-        context['pictures'] = Picture.objects.all()
-        return context
-
 
 class PictureDeleteView(DeleteView):
     model = Picture

urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
 from django.http import HttpResponseRedirect
 
 # Uncomment the next two lines to enable the admin:
@@ -21,5 +21,5 @@
 
 import os
 urlpatterns += patterns('',
-        (r'^media/(.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.abspath(os.path.dirname(__file__)), 'media')}),
+    (r'^media/(.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.abspath(os.path.dirname(__file__)), 'media')}),
 )