Skip to content
This repository was archived by the owner on Aug 12, 2020. It is now read-only.

remove differences #34

Merged
merged 9 commits into from
Aug 23, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fileupload/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -53,4 +53,4 @@ <h1>No content set</h1>

{% endblock %}
</body>
</html>
</html>
6 changes: 1 addition & 5 deletions fileupload/templates/fileupload/picture_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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 %}
5 changes: 0 additions & 5 deletions fileupload/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions urls.py
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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')}),
)