diff templates/bundle/bundle.djhtml @ 184:b711f0087709

Use DESCRIPTION file for bundles (SCHEMA CHANGE) * Added two new fields to the Bundle model: * octave_format, which allows users to specify if their bundle has been formatted according to octave packaging standards or not * description_file, which points to a file named DESCRIPTION in the root directory (or the next top-level directory), if the octave_format checkbox is ticked and if one exists * Fixed the uploader field for form by making it a hidden input and preventing hidden inputs from showing up entirely
author dellsystem <ilostwaldo@gmail.com>
date Sat, 27 Oct 2012 15:58:08 -0400
parents a803a1544126
children baf8776dc44d 4033ebe1867f
line wrap: on
line diff
--- a/templates/bundle/bundle.djhtml	Sat Oct 27 15:41:58 2012 -0400
+++ b/templates/bundle/bundle.djhtml	Sat Oct 27 15:58:08 2012 -0400
@@ -74,9 +74,21 @@
     <p><a href="#">Download file (feature not yet available)</a></p>
     {% endif %}
     {% else %}
-    <p><strong>Description:</strong> {{ bundle.description|default:"N/A" }}</p>
+    <h2>Description</h2>
+    {% if bundle.description %}
+    <p>{{ bundle.description }}</p>
+    {% else %}
+    {% if bundle.description_file %}
+    <p class="bundle-description">{{ bundle.description_file.code|safe }}</p>
+    {% else %}
+    <p>N/A</p>
+    {% endif %}
+    {% endif %}
+
+    {% if bundle.description %}
     <p><strong>License:</strong> {{ bundle.free_license }}</p>
     <p><strong>Latest version number:</strong> {{ bundle.latest_version }}</p>
+    {% endif %}
     {% if previous_versions %}
     <h3>Versions</h3>
     <ul>