sanify templates

builds/models.py

@@ -20,7 +20,7 @@ class Build(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('build_detail', [self.project.slug, self.pk])
+        return ('build_detail', [self.project.user.username, self.project.slug, self.pk])
 
 
 

builds/views.py

@@ -31,7 +31,7 @@ def build_list(request, username=None, tag=None):
 
 def build_detail(request, username, project_slug, pk):
     user = get_object_or_404(User, username=username)
-    queryset = user.projects.all()
+    queryset = Build.objects.all()
 
     return object_detail(
         request,

templates/builds/build_detail.html

@@ -1,59 +1,25 @@
 {% extends "base.html" %}
 
-{% block title %}{{ build.name }}{% endblock %}
-
-{% block build_editing %}
-    <!-- BEGIN build bar -->
-    <div id="build_bar">
-      <div class="wrapper">
-
-        <div class="build-title">
-          <h2>{{ build }}</h2>
-          <a href="{% url builds_user_list build.user.username %}" class="quiet">({{ build.user }})</a>
-          <span class="quiet">{% if build.version %}version {{ build.version }} -{% endif %} {{ build.modified_date|date:"j F, Y" }}</span>
-        </div>
-
-        <div class="editing-options">
-          <ul>
-            <li {% block editing-option-view %}{% endblock %}><a href="{{ build.get_docs_url }}">View Docs</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-    <!-- END build bar -->
-{% endblock %}
+{% block title %}{{ build.project.name }}{% endblock %}
 
 {% block content %}
 
-  {% if build.build_url %}
-  <a href="{{ build.build_url }}" rel="nofollow,noindex">Project Homepage</a>
-  {% endif %}
 
-  <h3>Tags</h3>
-  <ul>
-    {% for tag in build.tags.all %}
-      <li><a href="{% url builds_tag_detail tag.slug %}">{{ tag.name }}</a></li>
-    {% empty %}
-      <li>No tags</li>
-    {% endfor %}
-  </ul>
+<p>
+Built: {{ build.date|date:"j F, Y" }}
+</p>
+
+<p>
+Outcome: {{ build.success|yesno:"Passed,Failed" }}
+</p>
+
+<p>
+<h3>Output</h3> <pre>{{ build.output }}</pre>
+</p>
+
+
+{% if build.error %}
+Error: <pre>{{ build.error }}</pre>
+{% endif %}
 
-  <h3>Latest Revisions</h3>
-  <ul>
-    {% for revision in build.get_latest_revisions|slice:":5" %}
-      <li>{{ revision }} {{ revision.created_date|timesince }} ago</li>
-    {% endfor %}
-  </ul>
-  
-  <h3>Projects by {{ build.user.username }}</h3>
-  <ul>
-    {% for user_build in user.builds.all %}
-      {% if build.pk != user_build.pk %}
-        <li><a href="{{ user_build.get_absolute_url }}">{{ user_build.name }}</a></li>
-      {% endif %}
-    {% endfor %}
-    {% if user.builds.all|length == 1 %}
-      <li>No other builds by {{ build.user.username }}</li>
-    {% endif %}
-  </ul>
 {% endblock %}

templates/core/build_list_detailed.html

@@ -1,6 +1,6 @@
 {% for build in build_list %}
   <li class="module-item">
-    <a class="module-item-title" href="{{ build.project.get_absolute_url }}">{{ build.project.name }}</a>
+    <a class="module-item-title" href="{{ build.get_absolute_url }}">{{ build.project.name }}</a>
     <a href="{% url projects_user_list build.project.user.username %}" class="quiet">({{ build.project.user }})</a>
     <span class="quiet">{% if build.project.version %}version {{ build.project.version }} -{% endif %} {{ build.date|date:"j F, Y" }}</span>
     <strong class="success">{{ build.success|yesno:"Passed,Failed" }}</strong>