Mercurial > agora

annotate templates/bundle/bundle.djhtml @ 211:2a234e11185c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in Wendy's changes
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 21 Aug 2013 14:43:48 -0400
parents 4033ebe1867f baf8776dc44d
children
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 %}
195
baf8776dc44d added code for the integration of comment system into bundles and snippets.
ahsanalishahid <ahsan.ali.shahid@gmail.com>
parents: 184
diff changeset
16
baf8776dc44d added code for the integration of comment system into bundles and snippets.
ahsanalishahid <ahsan.ali.shahid@gmail.com>
parents: 184
diff changeset
17
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
18 {% endblock %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
19
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
20 {% block title %}
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
21 {% if file %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
22 {{ file }} in
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
23 {% endif %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
24 {{ bundle }} by {{ bundle.uploader }}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
25 {% endblock %}
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
26
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
27
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
28 {% block content %}
180
a803a1544126 Hide bundle edit link from other users
dellsystem <ilostwaldo@gmail.com>
parents: 178
diff changeset
29 {% if request.user == bundle.uploader %}
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
30 <div class="right-float">
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
31 <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
32 </div>
180
a803a1544126 Hide bundle edit link from other users
dellsystem <ilostwaldo@gmail.com>
parents: 178
diff changeset
33 {% endif %}
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
34 <h1>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
35 <a href="{{ bundle.get_absolute_url }}">{{ bundle.name }}</a>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
36 by
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
37 <a href="{{ bundle.uploader.get_absolute_url }}">{{ bundle.uploader }}</a>
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
38 (version {{ this_version }})
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
39 </h1>
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
40
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
41 {% if not bundle.done_uploading %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
42 <p class="hint">This bundle is being processed.</p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
43 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
44 {% if files %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
45 <div id="bundle-filebrowser">
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
46 <ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
47 {% recursetree files %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
48 <li class="{% if not node.is_leaf_node %}bundle-folder {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
49 {% if node == file %}selected{% endif %}">
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
50 {% if node.is_leaf_node %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
51 <a href="{{ node.get_absolute_url }}">{{ node.name }}</a>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
52 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
53 {{ node.name }}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
54 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
55 {% if not node.is_leaf_node %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
56 <ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
57 {{ children }}
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 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
60 </li>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
61 {% endrecursetree %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
62 </ul>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
63 </div>
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
64
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
65 <div id="bundle-file">
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
66 {% if file %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
67 <h2>{{ file.full_path }} <small>{{ file.file_size|filesize }}</small></h2>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
68
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
69 {% if file.code %}
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
70 <p>
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
71 {% include "snippet/snippet_options.djhtml" %}
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
72 </p>
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
73 {% include "snippet/snippet_box.djhtml" with lines=file.get_lines %}
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>This file is a binary file.</p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
76 <p><a href="#">Download file (feature not yet available)</a></p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
77 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
78 {% else %}
184
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
79 <h2>Description</h2>
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
80 {% if bundle.description %}
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
81 <p>{{ bundle.description }}</p>
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
82 {% else %}
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
83 {% if bundle.description_file %}
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
84 <p class="bundle-description">{{ bundle.description_file.code|safe }}</p>
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
85 {% else %}
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
86 <p>N/A</p>
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
87 {% endif %}
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
88 {% endif %}
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
89
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
90 {% if bundle.description %}
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
91 <p><strong>License:</strong> {{ bundle.free_license }}</p>
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
92 <p><strong>Latest version number:</strong> {{ bundle.latest_version }}</p>
184
b711f0087709 Use DESCRIPTION file for bundles (SCHEMA CHANGE)
dellsystem <ilostwaldo@gmail.com>
parents: 180
diff changeset
93 {% endif %}
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
94 {% if previous_versions %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
95 <h3>Versions</h3>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
96 <ul>
178
df160069b769 Show list of bundle versions in reverse order
dellsystem <ilostwaldo@gmail.com>
parents: 177
diff changeset
97 {% for version in previous_versions reversed %}
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
98 <li>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
99 <a href="{{ bundle.get_absolute_url }}/{{ version }}">
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
100 {% if version == this_version %}<strong>{% endif %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
101 Version {{ version }}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
102 {% if version == this_version %}</strong>{% endif %}
209
4033ebe1867f Add ability to download files
dellsystem <ilostwaldo@gmail.com>
parents: 184
diff changeset
103 </a> :: <a href="{% url bundle_download bundle.uploader.username bundle.name version %}">Download &raquo;</a>
177
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
104 </li>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
105 {% endfor %}
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
106 </ul>
86129d185ddb Add versioning to bundles
dellsystem <ilostwaldo@gmail.com>
parents: 151
diff changeset
107 {% endif %}
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
108 {% endif %}
195
baf8776dc44d added code for the integration of comment system into bundles and snippets.
ahsanalishahid <ahsan.ali.shahid@gmail.com>
parents: 184
diff changeset
109 <h2 class = "names"> Comments for this bundle: </h2>
baf8776dc44d added code for the integration of comment system into bundles and snippets.
ahsanalishahid <ahsan.ali.shahid@gmail.com>
parents: 184
diff changeset
110 {% with bundle as object %}
baf8776dc44d added code for the integration of comment system into bundles and snippets.
ahsanalishahid <ahsan.ali.shahid@gmail.com>
parents: 184
diff changeset
111 {% include "comments/rawcomment.html" %}{% endwith %}.
baf8776dc44d added code for the integration of comment system into bundles and snippets.
ahsanalishahid <ahsan.ali.shahid@gmail.com>
parents: 184
diff changeset
112
151
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
113 </div>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
114 {% else %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
115 <p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
116 No files in this bundle!
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
117 {% if request.user == bundle.uploader %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
118 Upload something? (Not yet available)
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
119 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
120 </p>
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
121 {% endif %}
c7be7def8b57 Bundles! (basic functionality)
dellsystem <ilostwaldo@gmail.com>
parents: 90
diff changeset
122 {% endif %}
65
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
123
98e91bb33000 Just trying to sort thing out
rettaw
parents:
diff changeset
124 {% endblock %}