Skip to content

Commit aa325ef

Browse files
topwebmastertopwebmaster
authored
Merge pull request #1 from sigurdga/master
Update
2 parents da99c92 + 0f819ad commit aa325ef

File tree

9 files changed

+45
-38
lines changed

9 files changed

+45
-38
lines changed

‎README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,17 @@ fileupload/models.py as commented in the file.
3232
Installation
3333
============
3434

35-
* pip install -r requirements.txt (will install django and pillow)
36-
* python manage.py migrate
37-
* python manage.py runserver
38-
* go to localhost:8000/upload/new/ and upload some files
35+
I recommend to install this within a virtualenv.
36+
37+
```sh
38+
virtualenv -p python3 venv
39+
source venv/bin/activate
40+
pip install -r requirements.txt
41+
./manage.py migrate
42+
./manage.py runserver
43+
```
44+
45+
And then go to localhost:8000 and try to upload some files.
3946

4047
License
4148
=======

‎django-jquery-file-upload/urls.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.conf.urls import include, url
1+
from django.urls import include, path
22
from django.http import HttpResponseRedirect
33
from django.conf import settings
44

@@ -7,9 +7,9 @@
77
admin.autodiscover()
88

99
urlpatterns = [
10-
url(r'^$', lambda x: HttpResponseRedirect('/upload/new/')),
11-
url(r'^upload/', include('fileupload.urls')),
12-
url(r'^admin/', include(admin.site.urls)),
10+
path('', lambda x: HttpResponseRedirect('/upload/new/')),
11+
path('upload/', include('fileupload.urls')),
12+
path('admin/', admin.site.urls),
1313
]
1414

1515
if settings.DEBUG:

‎fileupload/serialize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# encoding: utf-8
22
import mimetypes
33
import re
4-
from django.core.urlresolvers import reverse
4+
from django.urls import reverse
55

66

77
def order_name(name):

‎fileupload/templates/fileupload/picture_basic_form.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<h1>Django jQuery File Upload Demo</h1>
3939
<h2 class="lead">Basic version</h2>
4040
<ul class="nav nav-tabs">
41-
<li class="active"><a href="/upload/basic">Basic</a></li>
42-
<li><a href="/upload/basic/plus">Basic Plus</a></li>
43-
<li><a href="/upload/new">Basic Plus UI</a></li>
44-
<li><a href="/upload/angular">AngularJS</a></li>
45-
<li><a href="/upload/jquery-ui">jQuery UI</a></li>
41+
<li class="active"><a href="/upload/basic/">Basic</a></li>
42+
<li><a href="/upload/basic/plus/">Basic Plus</a></li>
43+
<li><a href="/upload/new/">Basic Plus UI</a></li>
44+
<li><a href="/upload/angular/">AngularJS</a></li>
45+
<li><a href="/upload/jquery-ui/">jQuery UI</a></li>
4646
</ul>
4747
<br>
4848
<blockquote>

‎fileupload/templates/fileupload/picture_basicplus_form.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<h1>Django jQuery File Upload Demo</h1>
3939
<h2 class="lead">Basic Plus version</h2>
4040
<ul class="nav nav-tabs">
41-
<li><a href="/upload/basic">Basic</a></li>
42-
<li class="active"><a href="/upload/basic/plus">Basic Plus</a></li>
43-
<li><a href="/upload/new">Basic Plus UI</a></li>
44-
<li><a href="/upload/angular">AngularJS</a></li>
45-
<li><a href="/upload/jquery-ui">jQuery UI</a></li>
41+
<li><a href="/upload/basic/">Basic</a></li>
42+
<li class="active"><a href="/upload/basic/plus/">Basic Plus</a></li>
43+
<li><a href="/upload/new/">Basic Plus UI</a></li>
44+
<li><a href="/upload/angular/">AngularJS</a></li>
45+
<li><a href="/upload/jquery-ui/">jQuery UI</a></li>
4646
</ul>
4747
<br>
4848
<blockquote>

‎fileupload/templates/fileupload/picture_form.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<h1>Django jQuery File Upload Demo</h1>
77
<h2 class="lead">Basic Plus UI version</h2>
88
<ul class="nav nav-tabs">
9-
<li><a href="/upload/basic">Basic</a></li>
10-
<li><a href="/upload/basic/plus">Basic Plus</a></li>
9+
<li><a href="/upload/basic/">Basic</a></li>
10+
<li><a href="/upload/basic/plus/">Basic Plus</a></li>
1111
<li class="active"><a href="/upload/new/">Basic Plus UI</a></li>
12-
<li><a href="/upload/angular">AngularJS</a></li>
13-
<li><a href="/upload/jquery-ui">jQuery UI</a></li>
12+
<li><a href="/upload/angular/">AngularJS</a></li>
13+
<li><a href="/upload/jquery-ui/">jQuery UI</a></li>
1414
</ul>
1515
<br>
1616
<blockquote>

‎fileupload/templates/fileupload/picture_jquery_form.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ <h2>jQuery UI version</h2>
8282
</select>
8383
</form>
8484
<ul class="navigation">
85-
<li><a href="/upload/basic">Basic</a></li>
86-
<li><a href="/upload/basic/plus">Basic Plus</a></li>
87-
<li><a href="/upload/new">Basic Plus UI</a></li>
88-
<li><a href="/upload/angular">AngularJS</a></li>
89-
<li class="active"><a href="/upload/jquery-ui">jQuery UI</a></li>
85+
<li><a href="/upload/basic/">Basic</a></li>
86+
<li><a href="/upload/basic/plus/">Basic Plus</a></li>
87+
<li><a href="/upload/new/">Basic Plus UI</a></li>
88+
<li><a href="/upload/angular/">AngularJS</a></li>
89+
<li class="active"><a href="/upload/jquery-ui/">jQuery UI</a></li>
9090
</ul>
9191
<blockquote>
9292
<p>File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery UI.<br>

‎fileupload/urls.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# encoding: utf-8
2-
from django.conf.urls import url
2+
from django.urls import path
33
from fileupload.views import (
44
BasicVersionCreateView, BasicPlusVersionCreateView,
55
jQueryVersionCreateView, AngularVersionCreateView,
66
PictureCreateView, PictureDeleteView, PictureListView,
77
)
88

99
urlpatterns = [
10-
url(r'^basic/$', BasicVersionCreateView.as_view(), name='upload-basic'),
11-
url(r'^basic/plus/$', BasicPlusVersionCreateView.as_view(), name='upload-basic-plus'),
12-
url(r'^new/$', PictureCreateView.as_view(), name='upload-new'),
13-
url(r'^angular/$', AngularVersionCreateView.as_view(), name='upload-angular'),
14-
url(r'^jquery-ui/$', jQueryVersionCreateView.as_view(), name='upload-jquery'),
15-
url(r'^delete/(?P<pk>\d+)$', PictureDeleteView.as_view(), name='upload-delete'),
16-
url(r'^view/$', PictureListView.as_view(), name='upload-view'),
10+
path('basic/', BasicVersionCreateView.as_view(), name='upload-basic'),
11+
path('basic/plus/', BasicPlusVersionCreateView.as_view(), name='upload-basic-plus'),
12+
path('new/', PictureCreateView.as_view(), name='upload-new'),
13+
path('angular/', AngularVersionCreateView.as_view(), name='upload-angular'),
14+
path('jquery-ui/', jQueryVersionCreateView.as_view(), name='upload-jquery'),
15+
path('delete/<int:pk>', PictureDeleteView.as_view(), name='upload-delete'),
16+
path('view/', PictureListView.as_view(), name='upload-view'),
1717
]

‎requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
django
2-
pillow
1+
django>=2.2.13,<2.0.99
2+
pillow>=7.1.0

0 commit comments

Comments
 (0)