Merge remote branch 'upstream/master'

Author: ET-CS

.gitignore

@@ -1,10 +1,10 @@
+db
 /media
-/db
 /bin
 /include
 /lib
 /local
 /share
+/env
 /venv
-db
-*.pyc
+*.pyc

README.md

@@ -7,7 +7,7 @@ This is a small example on how to setup Sebastian Tschan's jQuery File Upload in
 
 Here, you'll find a minimal Django project with a minimal app. You can run the example standalone by cloning the repository, running the migrations and starting the server.
 
-I want to give a thank to Sebastian Tschan, the original author, and Jørgen Bergquist for helping me over the first hurdles.
+I want to give a thank to [Sebastian Tschan](https://github.com/blueimp), the original author, [Etay Cohen-Solal](https://github.com/et-cs), for the latest major update, and [Jørgen Bergquist](https://github.com/bergquis) for helping me over the first hurdles.
 
 Features
 ========

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,6 +45,10 @@ <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">
@@ -81,4 +85,4 @@ <h3 class="title"></h3>
 <!--[if gte IE 8]>
 <script src="{{ STATIC_URL }}js/cors/jquery.xdr-transport.js"></script>
 <![endif]-->
-{% endblock %}
+{% endblock %}

fileupload/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from fileupload.views import PictureCreateView, PictureDeleteView
 
 urlpatterns = patterns('',

fileupload/views.py

@@ -41,6 +41,11 @@ 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