Mercurial > agora-palash

annotate templates/bundle/bundle.djhtml @ 177:86129d185ddb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add versioning to bundles Some other bundle-related changes were made, including: * Editing the snippetform CSS and HTML to allow bundle/form.djhtml to be reused for editing * Changing {% block title %} to {% block section %} in the base template for bundles to allow for more flexibility when creating breadcrumbs * Saved common URL patterns in variables in bundle/urls.py * Renamed explore.html to explore.djhtml for consistency You should now be able to upload new versions as well as view the files (or a particular file) for a bundle at a specific version. Coming soon: the ability to add a timestamp and a comment for each new uploaded version (if this feature is desirable).
author dellsystem <ilostwaldo@gmail.com>
date Sat, 20 Oct 2012 23:28:50 -0400
parents c7be7def8b57
children df160069b769
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
1 {% extends "bundle/base.djhtml" %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
2
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
3
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
4 {% load mptt_tags %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
5 {% load sizefieldtags %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
6
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
7
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
8 {% block section %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
9 <a href="{{ bundle.get_absolute_url }}">{{ bundle }}</a>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
10 by <a href="{{ bundle.uploader.get_absolute_url }}">{{ bundle.uploader }}</a>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
11 (version {{ this_version }})
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
12 {% if file %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
13 &raquo;
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
14 {{ file }}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
15 {% endif %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
16 {% endblock %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
17
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
18 {% block title %}
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
19 {% if file %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
20 {{ file }} in
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
21 {% endif %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
22 {{ bundle }} by {{ bundle.uploader }}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
23 {% endblock %}
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
24
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
25
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
26 {% block content %}
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
27 <div class="right-float">
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
28 <h2><a href="{% url bundle_edit request.user.username bundle.name %}">Edit this bundle</a></h2>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
29 </div>
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
30 <h1>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
31 <a href="{{ bundle.get_absolute_url }}">{{ bundle.name }}</a>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
32 by
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
33 <a href="{{ bundle.uploader.get_absolute_url }}">{{ bundle.uploader }}</a>
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
34 (version {{ this_version }})
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
35 </h1>
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
36
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
37 {% if not bundle.done_uploading %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
38 <p class="hint">This bundle is being processed.</p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
39 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
40 {% if files %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
41 <div id="bundle-filebrowser">
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
42 <ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
43 {% recursetree files %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
44 <li class="{% if not node.is_leaf_node %}bundle-folder {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
45 {% if node == file %}selected{% endif %}">
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
46 {% if node.is_leaf_node %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
47 <a href="{{ node.get_absolute_url }}">{{ node.name }}</a>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
48 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
49 {{ node.name }}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
50 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
51 {% if not node.is_leaf_node %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
52 <ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
53 {{ children }}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
54 </ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
55 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
56 </li>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
57 {% endrecursetree %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
58 </ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
59 </div>
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
60
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
61 <div id="bundle-file">
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
62 {% if file %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
63 <h2>{{ file.full_path }} <small>{{ file.file_size|filesize }}</small></h2>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
64
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
65 {% if file.code %}
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
66 <p>
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
67 {% include "snippet/snippet_options.djhtml" %}
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
68 </p>
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
69 {% include "snippet/snippet_box.djhtml" with lines=file.get_lines %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
70 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
71 <p>This file is a binary file.</p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
72 <p><a href="#">Download file (feature not yet available)</a></p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
73 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
74 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
75 <p><strong>Description:</strong> {{ bundle.description|default:"N/A" }}</p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
76 <p><strong>License:</strong> {{ bundle.free_license }}</p>
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
77 <p><strong>Latest version number:</strong> {{ bundle.latest_version }}</p>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
78 {% if previous_versions %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
79 <h3>Versions</h3>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
80 <ul>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
81 {% for version in previous_versions %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
82 <li>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
83 <a href="{{ bundle.get_absolute_url }}/{{ version }}">
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
84 {% if version == this_version %}<strong>{% endif %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
85 Version {{ version }}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
86 {% if version == this_version %}</strong>{% endif %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
87 </a>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
88 </li>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
89 {% endfor %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
90 </ul>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
91 {% endif %}
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
92 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
93 </div>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
94 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
95 <p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
96 No files in this bundle!
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
97 {% if request.user == bundle.uploader %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
98 Upload something? (Not yet available)
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
99 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
100 </p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
101 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
102 {% endif %}
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
103
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
104 {% endblock %}