nog mooier fitleren

rowers/templates/forcecurve_analysis.html

@@ -19,7 +19,7 @@
 
 <h1>Force Curve Analysis for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
-<form enctype="multipart/form-data" method="post">
+
 <ul class="main-content">
   {% if the_div %}
   <li class="grid_4">
@@ -28,6 +28,18 @@
     </div>
   </li>
   {% endif %}
+  <li class="grid_4">
+    <form method="get">
+    {{ searchform.as_table }}
+    {{ dateform.as_table }}
+    <input name='filter' type='submit' value="Filter">
+    </form>
+  </li>
+  <li class="grid_4">
+    <form enctype="multipart/form-data" method="post">
+    {% csrf_token %}
+    <input name='instroke_compare' type="submit" value="Compare Selected">
+  </li>
   {% if analyses %}
   {% for analysis in analyses %}
   <li class="grid_4 divlines" id="analysis_{{ analysis.id }}">
@@ -84,14 +96,11 @@
   {% endfor %}
   {% else %}
   <li class="grid_4">
-      <p>You have not saved any analyses for {{ rower.user.first_name }}</p>
+      <p>No analyses found for {{ rower.user.first_name }}</p>
   </li>
   {% endif %}
+  </form>
 </ul>
-{% csrf_token %}
-<input name='instroke_compare' type="submit" value="Compare Selected">
-</form>
-
 
 
 {% endblock %}