diff blast2html.html.jinja @ 118:7f3f8c10f44b

fix for Rikilt issues 8, 11, 12, 14

--- a/blast2html.html.jinja	Thu Jul 31 14:55:07 2014 +0200
+++ b/blast2html.html.jinja	Thu Jul 31 13:09:30 2014 +0200
@@ -422,9 +422,8 @@
 
         {% for result in blast.BlastOutput_iterations.Iteration %}
         <div class=indexentry><a href="#match{{result|nodeid}}">
-            {% set hits = result|hits %}
             {{result['Iteration_query-ID']}}: {{result['Iteration_query-def']}}
-            ({{result|len}} letters, {{hits|length}} hits)
+            ({{result|len}} letters, {{result|hits|length}} hits)
         </a></div>
         {% endfor %}
 
@@ -476,7 +475,7 @@
                   <div class=graphicitem style="background-color: {{colors[1]}}">40–50</div>
                   <div class=graphicitem style="background-color: {{colors[2]}}">50–80</div>
                   <div class=graphicitem style="background-color: {{colors[3]}}">80–200</div>
-                  <div class=graphicitem style="background-color: {{colors[4]}}">200≤</div>
+                  <div class=graphicitem style="background-color: {{colors[4]}}">≥200</div>
               </div></div>
               <div style="clear: left"></div>
 
@@ -611,12 +610,12 @@
                       <th>Score</th><th>Expect</th><th>Identities</th><th>Gaps</th><th>Strand</th>
                     </tr>
                     <tr>
-                      <td>{{hsp['Hsp_bit-score']|fmt('.1f')}} bits({{hsp.Hsp_score}})</td>
-                      <td>{{hsp.Hsp_evalue|fmt('.1f')}}</td>
-                      <td>{{ hsp.Hsp_identity }}/{{ hsp|len }}({{
+                      <td>{{hsp['Hsp_bit-score']}} bits ({{hsp.Hsp_score}})</td>
+                      <td>{{hsp.Hsp_evalue}}</td>
+                      <td>{{ hsp.Hsp_identity }}/{{ hsp|len }} ({{
                         ((hsp.Hsp_identity|float)/hsp|len) | fmt('.0%') }})</td>
                       <td>{{ hsp.Hsp_gaps }}/{{ hsp|len
-                        }}({{ ((hsp.Hsp_gaps|float) / hsp|len) | fmt('.0%') }})</td>
+                        }} ({{ ((hsp.Hsp_gaps|float) / hsp|len) | fmt('.0%') }})</td>
                       <td>{{ hsp['Hsp_query-frame']|asframe }}/{{ hsp['Hsp_hit-frame']|asframe }}</td>
                     </tr>
                   </table>