Cleanup

2 files changed, 16 insertions, 15 deletions

diff --git a/servo/templates/devices/upload_devices.html b/servo/templates/devices/upload_devices.html
index 04cdc47..ba857bf 100755
--- a/servo/templates/devices/upload_devices.html
+++ b/servo/templates/devices/upload_devices.html
@@ -13,4 +13,4 @@
 {% block footer %}
     <a class="btn btn-default" href="{{ STATIC_URL }}/examples/upload_devices.xlsx">{% trans "Download example" %}</a>
     <button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>
-{% endblock footer %}
\ No newline at end of file
+{% endblock footer %}
diff --git a/servo/templates/devices/view.html b/servo/templates/devices/view.html
index 8234cd7..b2cd3db 100755
--- a/servo/templates/devices/view.html
+++ b/servo/templates/devices/view.html
@@ -21,9 +21,9 @@
   {% else %}
     <a href="#" class="btn btn-primary disabled"><i class="icon-share-alt icon-white"></i> {% trans "Use in current order" %}</a>
   {% endif %}
-    {% if device.pk %}
+  {% if device.pk %}
     <a href="{% url 'devices-create_order' device.pk %}" class="btn"><i class="icon-plus"></i> {% trans "Create Service Order" %}</a>
-    {% endif %}
+  {% endif %}
     <div class="btn-group">
       <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
         <i class="icon-cog"></i> <span class="caret"></span>
@@ -62,12 +62,22 @@
     </div>
   </div>
   <div class="tab-pane" id="tab2">
-    {% include "orders/list.html" with orders=device.order_set.all %}
+    {% include "orders/list.html" %}
+  </div>
+  {% if device.is_apple_device %}
+  <div class="tab-pane" id="tab3">
+    <h4>{% trans "Submitted GSX repairs" %}</h4>
+    <div id="gsx-container" data-source="{% url 'devices-search_gsx_repairs' pk=device.pk %}">
+      <div class="progress active">
+        <div class="bar" style="width:100%;" data-progress="0"></div>
+      </div>
+      <p class="text-center muted">{% trans "Fetching repairs..." %}</p>
+    </div>
     <hr/>
     <h4>{% trans "Local GSX repairs" %}</h4>
     <table class="table">
       <tbody>
-      {% for r in device.repair_set.all %}
+      {% for r in repairs %}
         <tr>
           <td>{{ r.confirmation }}</td>
           <td>{{ r.created_at|date }}</td>
@@ -77,21 +87,12 @@
         </tr>
       {% empty %}
         <tr>
-          <td colspan="4">{% trans "No local GSX repairs found" %}</td>
+          <td colspan="5">{% trans "No local GSX repairs found" %}</td>
         </tr>
       {% endfor %}
       </tbody>
     </table>
   </div>
-  {% if device.is_apple_device %}
-  <div class="tab-pane" id="tab3">
-    <div id="gsx-container" data-source="{% url 'devices-search_gsx_repairs' pk=device.pk %}">
-      <div class="progress active">
-        <div class="bar" style="width:100%;" data-progress="0"></div>
-      </div>
-      <p class="text-center muted">{% trans "Fetching repairs..." %}</p>
-    </div>
-  </div>
   {% endif %}
 </div>
 {% endblock fourth_column %}