Skip to content

Commit ea20c29

Browse files
sigurdgasigurdga
committed
Templates: extends from base.html, using content block.
Add picture_confirm_delete.html, needed to fix sigurdga#12
1 parent fda28e1 commit ea20c29

File tree

3 files changed

+144
-127
lines changed

3 files changed

+144
-127
lines changed

‎fileupload/templates/base.html‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<html lang="en">
2+
<head>
3+
<meta charset="utf-8">
4+
<title>Django Jquery file upload demo</title>
5+
<meta name="description" content="">
6+
<meta name="viewport" content="width=device-width">
7+
<!-- Bootstrap CSS Toolkit styles -->
8+
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
9+
<!-- Generic page styles -->
10+
<link rel="stylesheet" href="{{ STATIC_URL }}css/style.css">
11+
<!-- Bootstrap styles for responsive website layout, supporting different screen sizes -->
12+
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap-responsive.min.css">
13+
<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
14+
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap-image-gallery.min.css">
15+
<link rel="stylesheet" href="{{ STATIC_URL }}css/jquery.fileupload-ui.css">
16+
<!-- Shim to make HTML5 elements usable in older Internet Explorer versions -->
17+
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
18+
</head>
19+
<body>
20+
<div class="navbar navbar-fixed-top">
21+
<div class="navbar-inner">
22+
<div class="container">
23+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
24+
<span class="icon-bar"></span>
25+
<span class="icon-bar"></span>
26+
<span class="icon-bar"></span>
27+
</a>
28+
<a class="brand" href="https://github.com/sigurdga/django-jquery-file-upload">Django Jquery file upload</a>
29+
<div class="nav-collapse">
30+
<ul class="nav">
31+
<li class="active"><a href="#">Demo</a></li>
32+
<li><a href="https://github.com/sigurdga/django-jquery-file-upload">Source Code</a></li>
33+
<li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
34+
</ul>
35+
</div>
36+
</div>
37+
</div>
38+
</div>
39+
{% block content %}
40+
41+
<h1>No content set</h1>
42+
43+
{% endblock %}
44+
</body>
45+
</html>

‎fileupload/templates/fileupload/picture_confirm_delete.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{% extends "base.html" %}
2+
3+
{% block content %}
4+
<div class="container">
5+
<div class="page-header">
6+
<h1>Delete {{ object.file.name }}?</h1>
7+
</div>
8+
<img src="{{ object.file.url }}" alt="">
9+
10+
<form method="post" action="" class="form">{% csrf_token %}
11+
<div class="form-actions">
12+
<button type="submit" class="btn btn-danger"><i class="icon-trash icon-white"></i> Delete</button>
13+
<button type="button" onclick="window.history.back();" class="btn"><i class="icon-remove"></i> Cancel</button>
14+
</div>
15+
</form>
16+
</div>
17+
18+
{% endblock %}

‎fileupload/templates/fileupload/picture_form.html‎

Lines changed: 81 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,87 @@
1-
<html lang="en">{% load upload_tags %}
2-
<!--
3-
/*
4-
* jQuery File Upload Plugin Demo 6.8
5-
* https://github.com/blueimp/jQuery-File-Upload
6-
*
7-
* Copyright 2010, Sebastian Tschan
8-
* https://blueimp.net
9-
*
10-
* Licensed under the MIT license:
11-
* http://www.opensource.org/licenses/MIT
12-
*/
13-
// -->
14-
<head>
15-
<meta charset="utf-8">
16-
<title>Django Jquery file upload demo</title>
17-
<meta name="description" content="">
18-
<meta name="viewport" content="width=device-width">
19-
<!-- Bootstrap CSS Toolkit styles -->
20-
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap.min.css">
21-
<!-- Generic page styles -->
22-
<link rel="stylesheet" href="{{ STATIC_URL }}css/style.css">
23-
<!-- Bootstrap styles for responsive website layout, supporting different screen sizes -->
24-
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap-responsive.min.css">
25-
<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
26-
<link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap-image-gallery.min.css">
27-
<link rel="stylesheet" href="{{ STATIC_URL }}css/jquery.fileupload-ui.css">
28-
<!-- Shim to make HTML5 elements usable in older Internet Explorer versions -->
29-
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
30-
</head>
31-
<body>
32-
<div class="navbar navbar-fixed-top">
33-
<div class="navbar-inner">
34-
<div class="container">
35-
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
36-
<span class="icon-bar"></span>
37-
<span class="icon-bar"></span>
38-
<span class="icon-bar"></span>
39-
</a>
40-
<a class="brand" href="https://github.com/sigurdga/django-jquery-file-upload">Django Jquery file upload</a>
41-
<div class="nav-collapse">
42-
<ul class="nav">
43-
<li class="active"><a href="#">Demo</a></li>
44-
<li><a href="https://github.com/sigurdga/django-jquery-file-upload">Source Code</a></li>
45-
<li><a href="https://github.com/blueimp/jQuery-File-Upload/wiki">Documentation</a></li>
46-
</ul>
47-
</div>
48-
</div>
49-
</div>
1+
{% extends "base.html" %}
2+
{% load upload_tags %}
3+
4+
{% block content %}
5+
<div class="container">
6+
<div class="page-header">
7+
<h1>Django Jquery file upload demo</h1>
508
</div>
51-
<div class="container">
52-
<div class="page-header">
53-
<h1>Django Jquery file upload demo</h1>
54-
</div>
55-
<form id="fileupload" method="post" action="." enctype="multipart/form-data">{% csrf_token %}
56-
<div class="row fileupload-buttonbar">
57-
<div class="span7">
58-
<span class="btn btn-primary fileinput-button">
59-
<i class="icon-plus icon-white"></i>
60-
<span>Add files...</span>
61-
<input type="file" name="file" multiple>
62-
</span>
63-
<button type="submit" class="btn btn-success start">
64-
<i class="icon-upload icon-white"></i>
65-
<span>Start upload</span>
66-
</button>
67-
<button type="reset" class="btn btn-warning cancel">
68-
<i class="icon-ban-circle icon-white"></i>
69-
<span>Cancel upload</span>
70-
</button>
71-
<button type="button" class="btn btn-danger delete">
72-
<i class="icon-trash icon-white"></i>
73-
<span>Delete files</span>
74-
</button>
75-
<input type="checkbox" class="toggle">
76-
</div>
77-
<div class="span5 fileupload-progress fade">
78-
<div class="progress progress-success progres-striped active">
79-
<div class="bar" style="width:0%"></div>
80-
</div>
81-
<div class="progress-extended">&nbsp;</div>
9+
<form id="fileupload" method="post" action="." enctype="multipart/form-data">{% csrf_token %}
10+
<div class="row fileupload-buttonbar">
11+
<div class="span7">
12+
<span class="btn btn-primary fileinput-button">
13+
<i class="icon-plus icon-white"></i>
14+
<span>Add files...</span>
15+
<input type="file" name="file" multiple>
16+
</span>
17+
<button type="submit" class="btn btn-success start">
18+
<i class="icon-upload icon-white"></i>
19+
<span>Start upload</span>
20+
</button>
21+
<button type="reset" class="btn btn-warning cancel">
22+
<i class="icon-ban-circle icon-white"></i>
23+
<span>Cancel upload</span>
24+
</button>
25+
<button type="button" class="btn btn-danger delete">
26+
<i class="icon-trash icon-white"></i>
27+
<span>Delete files</span>
28+
</button>
29+
<input type="checkbox" class="toggle">
30+
</div>
31+
<div class="span5 fileupload-progress fade">
32+
<div class="progress progress-success progres-striped active">
33+
<div class="bar" style="width:0%"></div>
8234
</div>
35+
<div class="progress-extended">&nbsp;</div>
8336
</div>
84-
<div class="fileupload-loading"></div>
85-
<table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
86-
</form>
87-
<div class="fileupload-content">
88-
<table class="files"></table>
89-
<div class="fileupload-progressbar"></div>
9037
</div>
38+
<div class="fileupload-loading"></div>
39+
<table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
40+
</form>
41+
<div class="fileupload-content">
42+
<table class="files"></table>
43+
<div class="fileupload-progressbar"></div>
9144
</div>
92-
<!-- modal-gallery is the modal dialog used for the image gallery -->
93-
<div id="modal-gallery" class="modal modal-gallery hide fade" data-filter=":odd">
94-
<div class="modal-header">
95-
<a class="close" data-dismiss="modal">&times;</a>
96-
<h3 class="modal-title"></h3>
97-
</div>
98-
<div class="modal-body"><div class="modal-image"></div></div>
99-
<div class="modal-footer">
100-
<a class="btn modal-download" target="_blank">
101-
<i class="icon-download"></i>
102-
<span>Download</span>
103-
</a>
104-
<a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000">
105-
<i class="icon-play icon-white"></i>
106-
<span>Slideshow</span>
107-
</a>
108-
<a class="btn btn-info modal-prev">
109-
<i class="icon-arrow-left icon-white"></i>
110-
<span>Previous</span>
111-
</a>
112-
<a class="btn btn-primary modal-next">
113-
<span>Next</span>
114-
<i class="icon-arrow-right icon-white"></i>
115-
</a>
116-
</div>
45+
</div>
46+
<!-- modal-gallery is the modal dialog used for the image gallery -->
47+
<div id="modal-gallery" class="modal modal-gallery hide fade" data-filter=":odd">
48+
<div class="modal-header">
49+
<a class="close" data-dismiss="modal">&times;</a>
50+
<h3 class="modal-title"></h3>
51+
</div>
52+
<div class="modal-body"><div class="modal-image"></div></div>
53+
<div class="modal-footer">
54+
<a class="btn modal-download" target="_blank">
55+
<i class="icon-download"></i>
56+
<span>Download</span>
57+
</a>
58+
<a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000">
59+
<i class="icon-play icon-white"></i>
60+
<span>Slideshow</span>
61+
</a>
62+
<a class="btn btn-info modal-prev">
63+
<i class="icon-arrow-left icon-white"></i>
64+
<span>Previous</span>
65+
</a>
66+
<a class="btn btn-primary modal-next">
67+
<span>Next</span>
68+
<i class="icon-arrow-right icon-white"></i>
69+
</a>
11770
</div>
118-
{% upload_js %}
119-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
120-
<script src="{{ STATIC_URL }}js/jquery.ui.widget.js"></script>
121-
<script src="{{ STATIC_URL }}js/tmpl.min.js"></script>
122-
<script src="{{ STATIC_URL }}js/load-image.min.js"></script>
123-
<script src="{{ STATIC_URL }}js/canvas-to-blob.min.js"></script>
124-
<script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
125-
<script src="{{ STATIC_URL }}js/bootstrap-image-gallery.min.js"></script>
126-
<script src="{{ STATIC_URL }}js/jquery.iframe-transport.js"></script>
127-
<script src="{{ STATIC_URL }}js/jquery.fileupload.js"></script>
128-
<script src="{{ STATIC_URL }}js/jquery.fileupload-fp.js"></script>
129-
<script src="{{ STATIC_URL }}js/jquery.fileupload-ui.js"></script>
130-
<script src="{{ STATIC_URL }}js/locale.js"></script>
131-
<script src="{{ STATIC_URL }}js/main.js"></script>
132-
</body>
133-
</html>
71+
</div>
72+
{% upload_js %}
73+
74+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
75+
<script src="{{ STATIC_URL }}js/jquery.ui.widget.js"></script>
76+
<script src="{{ STATIC_URL }}js/tmpl.min.js"></script>
77+
<script src="{{ STATIC_URL }}js/load-image.min.js"></script>
78+
<script src="{{ STATIC_URL }}js/canvas-to-blob.min.js"></script>
79+
<script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
80+
<script src="{{ STATIC_URL }}js/bootstrap-image-gallery.min.js"></script>
81+
<script src="{{ STATIC_URL }}js/jquery.iframe-transport.js"></script>
82+
<script src="{{ STATIC_URL }}js/jquery.fileupload.js"></script>
83+
<script src="{{ STATIC_URL }}js/jquery.fileupload-fp.js"></script>
84+
<script src="{{ STATIC_URL }}js/jquery.fileupload-ui.js"></script>
85+
<script src="{{ STATIC_URL }}js/locale.js"></script>
86+
<script src="{{ STATIC_URL }}js/main.js"></script>
87+
{% endblock %}

0 commit comments

Comments
 (0)