Added templates and tempplatetags paths in setup.py

.gitignore

@@ -1,2 +1,3 @@
 *.pyc
-.svn
+.svn
+*.swp

README.rst

@@ -0,0 +1,95 @@
+Works on Django >= 1.2 <= 1.6. Note that there is support of different Uploadify versions and UploadiFive.
+
+django-uploadify
+================
+
+A "Django":http://www.djangoproject.com/ re-usable app to integrate "Uploadify and UploadiFive":http://www.uploadify.com/.
+
+.. contents::
+
+Installation
+============
+
+Installing django-uploadify
+---------------------------
+
+#) Install package ::
+
+    pip install git+git://github.com/frol/django-uploadify.git
+
+#) Add 'uploadify' to your INSTALLED_APPS in your project's settings.py file
+#) There is support of Uploadify 2 (default), Uploadify 3 and UploadiFive v1.1.1. You can decide what version you would like to use by settings option UPLOADIFY_VERSION, available values are 2 (just int), 3 (just int) and 'uploadifive'.
+#) Add a reference to uploadify in your urls.py... ::
+
+    (r'^uploadify/', include('uploadify.urls')),
+
+
+Installing Uploadify
+--------------------
+
+.. _Download uploadify: http://www.uploadify.com/
+#) "`Download uploadify`_"
+#) Copy all of the 'uploadify' folder from the Uploadify distribution into your media root.  Default is: MEDIA_URL\js\uploadify\
+#) Rename the uploadify file from "jquery.uploadify.v2.1.0.min.js" (or whatever version it is) to simply "jquery.uploadify.js"
+#) In uploadify/settings.py, make sure the setting UPLOADIFY_PATH is set to the correct value if the uploadify folder is installed to a location other than the default.  Note that the UPLOADIFY_PATH setting is relative to the MEDIA_URL value.
+
+Requrements
+-----------
+
+* django >= 1.2
+.. _django-misc: https://github.com/ilblackdragon/django-misc/
+* django-misc_ - application with a lot of useful stuff
+
+Using django-uploadify
+======================
+
+How It Works
+------------
+
+Django-uploadify works by providing a template tag, {% multi_file_upload <upload_complete_url> %}., which takes a single parameter.  The template tag will render the Uploadify jquery/flash multi-file upload interface on the page.  A user may operate Uploadify, selecting and uploading multiple files.  For each file that is uploaded a Django signal will be fired, containing the file data.  After all uploads have been completed, the template tag will use the value of 'upload_complete_url'.  It will fetch that page via AJAX, and replace the Uploadify GUI with the contents of the page (a jQuery $.load).
+
+Code Examples
+-------------
+
+To insert the django-uploadify template tag... ::
+
+    {% load uploadify_tags %}{% multi_file_upload '/your/url/upload/complete/' %}
+
+To add custom parameters to uploadify... ::
+
+    {% multi_file_upload '/your/url/upload/complete/' unique_id=someobj.id auto=1 %}
+
+Creating a signal receiver... ::
+
+    def upload_received_handler(sender, request, data, **kwargs):
+        if data:
+            # process the received file here
+            try:
+                related_obj = SomeObj.objects.get(id=request.GET.get('unique_id'), owner=request.user)
+            except SomeObj.DoesNotExist:
+                return {'status': 'failed', 'status_msg': 'SomeObj not found'}
+            Media = Media.objects.create(image=data)
+            return {'status': 'ok', 'url': photo.get_preview_url()}
+        raise Http404
+
+    upload_received.connect(upload_received_handler, dispatch_uid='yourapp.whatever.upload_received')
+
+
+Reference
+=========
+
+Client Side Event:  allUploadsComplete
+--------------------------------------
+On the client side, a javascript event is provided to capture when all uploads have been completed.  It can be bound with the following jQuery code: ::
+
+    $('#uploadify').bind('allUploadsComplete', function(e, data){
+         // This code executes on AllUploadsComplete event...
+    }
+
+upload_complete_url Parameter
+-----------------------------
+When this page is fetched by the client-side javascript, the following Uploadify values are POST'ed to it:
+* filesUploaded - The total number of files uploaded
+* errors - The total number of errors while uploading
+* allBytesLoaded - The total number of bytes uploaded
+* speed - The average speed of all uploaded files

setup.py

@@ -1,14 +1,18 @@
 #!/usr/bin/env python
 
-#This project forked from http://github.com/tstone/django-uploadify
-#which lacked a setup.py file.
+#This project forked from http://github.com/gsiegman/django-uploadify
 
 from distutils.core import setup
+from uploadify import PROJECT, VERSION
 
-setup(name='django-uploadify',
-        description='Django integration of Uploadify jQuery plugin.',
-        author='Glenn Siegman',
-        author_email='gsiegman@gsiegman.com',
-        url='http://github.com/gsiegman/django-uploadify',
-        packages=['uploadify']
-)
+setup(
+    name=PROJECT,
+    version=VERSION,
+    description='Django integration of Uploadify jQuery plugin.',
+    author='Vlad Frolov',
+    author_email='frolvlad@gmail.com',
+    url='http://github.com/frol/django-uploadify',
+    packages=['uploadify', 'uploadify.templatetags'],
+    package_data={'uploadify': ['templates/uploadify/*.html']},
+    install_requires = [ 'django >= 1.3', 'django-misc' ],
+)

uploadify/__init__.py

@@ -0,0 +1,2 @@
+__version__ = VERSION = '0.3.1'
+__project__ = PROJECT = 'django-uploadify'

uploadify/settings.py

@@ -1,10 +1,14 @@
 from django.conf import settings
+STATIC_URL = getattr(settings, 'STATIC_URL', '')
 MEDIA_URL = getattr(settings, 'MEDIA_URL', '')
 
-
-
-# Uploadify root folder path, relative to MEDIA_ROOT
-UPLOADIFY_PATH = '%s%s' % (MEDIA_URL, 'js/uploadify/')
+# Uploadify root folder path, relative to STATIC_URL
+UPLOADIFY_PATH = getattr(settings, 'UPLOADIFY_PATH', 
+    '%s%s' % (STATIC_URL, 'js/uploadify/'))
 
 # Upload path that files are sent to
-UPLOADIFY_UPLOAD_PATH = '%s%s' % (MEDIA_URL, 'uploads/')
+UPLOADIFY_UPLOAD_PATH = getattr(settings, 'UPLOADIFY_UPLOAD_PATH', 
+    '%s%s' % (MEDIA_URL, 'uploads/'))
+
+# Version of uploadify that you use. Available versions are 2 or 3
+UPLOADIFY_VERSION = getattr(settings, 'UPLOADIFY_VERSION', 3)

uploadify/templates/uploadify/multi_file_upload.html

@@ -1,27 +1,102 @@
-<script type="text/javascript" src="{{ uploadify_path }}swfobject.js"></script>
-<script type="text/javascript" src="{{ uploadify_path }}jquery.uploadify.js"></script>
-<div id="uploadify" class="multi-file-upload"><input id="fileInput" name="fileInput" type="file" /></div>
+{% if uploadify_version == 'uploadifive' %}
+    <script type="text/javascript" src="{{ uploadify_path }}jquery.uploadifive.js"></script>
+    <link rel="stylesheet" type="text/css" href="{{ uploadify_path }}uploadifive.css" />
+{% else %}
+    <script type="text/javascript" src="{{ uploadify_path }}swfobject.js"></script>
+    <script type="text/javascript" src="{{ uploadify_path }}jquery.uploadify.js"></script>
+    <link rel="stylesheet" type="text/css" href="{{ uploadify_path }}uploadify.css" />
+{% endif %}
+<div id="uploadify" class="multi_file_upload">
+    <input id="fileInput" name="fileInput" type="file" />
+    {% if not uploadify_auto %}
+        <input type="button" value="Upload" id="upload" />
+    {% endif %}
+</div>
 <script type="text/javascript">// <![CDATA[
-$(document).ready(function() {
-$('#fileInput').uploadify({
-'uploader'  : '{{ uploadify_path }}uploadify.swf',
-'script'    : '{% url uploadify_upload %}',
-'cancelImg' : '{{ uploadify_path }}cancel.png',
-'auto'      : true,
-'folder'    : '{{ upload_path }}',
-'multi'     : true,
-'onAllComplete' : allComplete
-});
-});
+    $(document).ready(function() {
+        if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) { //test for MSIE x.x;
+            var ieversion=new Number(RegExp.$1) // capture x.x portion and store as a number
+            if (ieversion < 8)
+                return;
+        }
+        {% if uploadify_version == 'uploadifive' %}
+            $('#fileInput').uploadifive({
+        {% else %}
+            $('#fileInput').uploadify({
+        {% endif %}
+            {% if uploadify_version == 2 %}
+                'uploader': '{{ uploadify_path }}uploadify.swf',
+                'script': '{% url "uploadify_upload" %}{{ uploadify_query }}',
+                'scriptData': {'sessionid': '{{ request.session.session_key }}', {{ uploadify_data|safe }}},
+                'onAllComplete': uploadify_allComplete,
+                'onComplete': uploadify_complete,
+                'onCancel': uploadify_cancelUpload,
+            {% else %}
+                {% if uploadify_version == 'uploadifive'%}
+                    'uploadScript': '{% url "uploadify_upload" %}{{ uploadify_query }}',
+                    'onUploadComplete': uploadify_complete,
+                {% else %}
+                    'swf': '{{ uploadify_path }}uploadify.swf',
+                    'uploader': '{% url "uploadify_upload" %}{{ uploadify_query }}',
+                    'onUploadSuccess': uploadify_complete,
+                {% endif %}
+                'formData': {'sessionid': '{{ request.session.session_key }}', {{ uploadify_data|safe }}},
+                'onQueueComplete': uploadify_allComplete,
+                'onCancel': uploadify_cancelUpload,
+            {% endif %}
+            'cancelImg': '{{ uploadify_path }}cancel.png',
+            'removeCompleted': false,
+            {{ uploadify_options|safe }}
+        });
 
-function allComplete(event, data) {
-    $('#uploadify').load('{{ upload_complete_url }}', {
-        'filesUploaded': data.filesUploaded,
-        'errorCount': data.errors,
-        'allBytesLoaded': data.allBytesLoaded,
-        'speed': data.speed
+        $('#upload').click(function(){
+            $('#fileInput').uploadifyUpload();
+        });
     });
-    // Raise custom event
-    $('#uploadify').trigger('allUploadsComplete', data);
-}
-// ]]></script>
+
+    {% if uploadify_version == 2 %}
+        function uploadify_allComplete_old(event, data) {
+            $('#uploadify').trigger('allUploadsComplete', data);
+        }
+        function uploadify_cancelUpload_old(event, data) {
+            $('#uploadify').trigger('cancelUpload', data);
+        }
+        function uploadify_complete_old(event, ID, fileObj, response, data) {
+            var result = true;
+            response = $.parseJSON(response);
+            if (response.status == 'failed') {
+                var file_div = jQuery("#" + jQuery(event.target).attr('id') + ID);
+                file_div.addClass('uploadifyError');
+
+                file_div.find('.percentage').text(' - ' + response.status_msg);
+                result = false;
+            }
+            $('#uploadify').trigger('complete', [ID, fileObj, response, data]);
+            return result;
+        }
+    {% else %}
+        function uploadify_allComplete(queueData) {
+            $('#uploadify').trigger('allUploadsComplete', queueData);
+        }
+        function uploadify_cancelUpload(file) {
+            $('#uploadify').trigger('cancelUpload', file);
+        }
+        function uploadify_complete(file, data, response) {
+            var result = true;
+            data = $.parseJSON(data);
+            if (data.status == 'failed') {
+                {% if uploadify_version == 'uploadifive' %}
+                    file.queueItem.find('.fileinfo').html(' - ' +data.status_msg);
+                    file.queueItem.addClass('error');
+                {% else %}
+                    var file_div = jQuery("#" + file.id);
+                    file_div.addClass('uploadify-error');
+                    file_div.find('.data').text(' - ' + data.status_msg);
+                {% endif %}
+                result = false;
+            }
+            $('#uploadify').trigger('complete', [file, data, response]);
+            return result;
+        }
+    {% endif %}
+// ]]></script>

uploadify/templatetags/__init__.py

@@ -1,8 +0,0 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-__author__="tstone"
-__date__ ="$Sep 24, 2009 3:27:35 PM$"
-
-if __name__ == "__main__":
-    print "Hello World";