From 2d92ba358e69cb22489e6b32820e6187ba5a5096 Mon Sep 17 00:00:00 2001 From: Sigurd Gartmann Date: Sat, 30 Jun 2012 13:17:39 +0200 Subject: [PATCH 01/80] Add missing loading.gif Part of fixing #12 --- fileupload/static/img/loading.gif | Bin 0 -> 3897 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 fileupload/static/img/loading.gif diff --git a/fileupload/static/img/loading.gif b/fileupload/static/img/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..90f28cbdbb390b095e0d619cbe8d91208798e58f GIT binary patch literal 3897 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 D^>?LD literal 0 HcmV?d00001 From 5b3a907b547020572e5d28a748e5052461a723a0 Mon Sep 17 00:00:00 2001 From: Sigurd Gartmann Date: Sat, 30 Jun 2012 13:24:56 +0200 Subject: [PATCH 02/80] Use modern capitalization --- fileupload/templates/fileupload/picture_form.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fileupload/templates/fileupload/picture_form.html b/fileupload/templates/fileupload/picture_form.html index e520bde..28b1db8 100644 --- a/fileupload/templates/fileupload/picture_form.html +++ b/fileupload/templates/fileupload/picture_form.html @@ -13,7 +13,7 @@ // --> - Django Jquery File Upload Example + Django Jquery file upload demo @@ -37,7 +37,7 @@ - Django jQuery File Upload + Django Jquery file upload
{% csrf_token %}
From 6f71a82ce9b3f87c18bd880e62ccec36a16f2bfb Mon Sep 17 00:00:00 2001 From: Sigurd Gartmann Date: Sat, 30 Jun 2012 13:27:35 +0200 Subject: [PATCH 03/80] Remove console.log something --- fileupload/static/js/main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/fileupload/static/js/main.js b/fileupload/static/js/main.js index 067e673..01c86fe 100644 --- a/fileupload/static/js/main.js +++ b/fileupload/static/js/main.js @@ -66,8 +66,6 @@ $(function () { // Load existing files: $('#fileupload').each(function () { var that = this; - console.log("something"); - console.log(this.action); $.getJSON(this.action, function (result) { if (result && result.length) { $(that).fileupload('option', 'done') From fda28e1ecd3e73d6439a8d37d7a9f70cda7c6353 Mon Sep 17 00:00:00 2001 From: Sigurd Gartmann Date: Sat, 30 Jun 2012 13:39:27 +0200 Subject: [PATCH 04/80] On delete, actually delete file from file system Needed for #12 and #14 --- fileupload/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fileupload/models.py b/fileupload/models.py index eed5f86..4b4cb85 100644 --- a/fileupload/models.py +++ b/fileupload/models.py @@ -17,3 +17,7 @@ def get_absolute_url(self): def save(self, *args, **kwargs): self.slug = self.file.name super(Picture, self).save(*args, **kwargs) + + def delete(self, *args, **kwargs): + self.file.delete(False) + super(Picture, self).delete(*args, **kwargs) From ea20c29be724f9b005bc78e498fdecc679beae72 Mon Sep 17 00:00:00 2001 From: Sigurd Gartmann Date: Sat, 30 Jun 2012 15:10:17 +0200 Subject: [PATCH 05/80] Templates: extends from base.html, using content block. Add picture_confirm_delete.html, needed to fix #12 --- fileupload/templates/base.html | 45 ++++ .../fileupload/picture_confirm_delete.html | 18 ++ .../templates/fileupload/picture_form.html | 208 +++++++----------- 3 files changed, 144 insertions(+), 127 deletions(-) create mode 100644 fileupload/templates/base.html create mode 100644 fileupload/templates/fileupload/picture_confirm_delete.html diff --git a/fileupload/templates/base.html b/fileupload/templates/base.html new file mode 100644 index 0000000..a00beec --- /dev/null +++ b/fileupload/templates/base.html @@ -0,0 +1,45 @@ + + + + Django Jquery file upload demo + + + + + + + + + + + + + + + + + {% block content %} + +

No content set

+ + {% endblock %} + + diff --git a/fileupload/templates/fileupload/picture_confirm_delete.html b/fileupload/templates/fileupload/picture_confirm_delete.html new file mode 100644 index 0000000..7f2e1bd --- /dev/null +++ b/fileupload/templates/fileupload/picture_confirm_delete.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block content %} +
+ + + + {% csrf_token %} +
+ + +
+ +
+ +{% endblock %} diff --git a/fileupload/templates/fileupload/picture_form.html b/fileupload/templates/fileupload/picture_form.html index 28b1db8..2bd1e85 100644 --- a/fileupload/templates/fileupload/picture_form.html +++ b/fileupload/templates/fileupload/picture_form.html @@ -1,133 +1,87 @@ -{% load upload_tags %} - - - - Django Jquery file upload demo - - - - - - - - - - - - - - - -