Annotations and context labels have to co-exist

1 files changed, 18 insertions, 16 deletions

diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html
index 85f79f18..01659dd8 100644
--- a/coverage/htmlfiles/pyfile.html
+++ b/coverage/htmlfiles/pyfile.html
@@ -74,23 +74,25 @@
         <p id="t{{line.number}}" class="{{line.css_class}}">{#-#}
             <span class="n"><a href="#t{{line.number}}">{{line.number}}</a></span>{#-#}
             <span class="t">{{line.html}}&nbsp;</span>{#-#}
-            {% if line.annotate -%}
-                <span class="annotate short">{{line.annotate}}</span>{#-#}
-                <span class="annotate long">{{line.annotate_long}}</span>{#-#}
+            {% if line.context_list -%}
+                <input type="checkbox" id="ctxs{{line.number}}" />{#-#}
             {% endif -%}
-            {% if line.contexts -%}
-                <span class="ctx">
-                    {% if line.context_list -%}
-                        <input type="checkbox" id="ctxs{{line.number}}" />
-                    {% endif -%}
-                    <label for="ctxs{{line.number}}">{{ line.contexts_label }}</label>{#-#}
-                    {% if line.context_list -%}
-                        <span class="ctxs">
-                            {% for context in line.context_list -%}
-                                <span>{{context}}</span>{#-#}
-                            {% endfor -%}
-                        </span>{#-#}
-                    {% endif -%}
+            {# Things that should float right in the line. -#}
+            <span class="r">{#-#}
+                {% if line.annotate -%}
+                    <span class="annotate short">{{line.annotate}}</span>{#-#}
+                    <span class="annotate long">{{line.annotate_long}}</span>{#-#}
+                {% endif -%}
+                {% if line.contexts -%}
+                    <label for="ctxs{{line.number}}" class="ctx">{{ line.contexts_label }}</label>{#-#}
+                {% endif -%}
+            </span>{#-#}
+            {# Things that should appear below the line. -#}
+            {% if line.context_list -%}
+                <span class="ctxs">{#-#}
+                    {% for context in line.context_list -%}
+                        <span>{{context}}</span>{#-#}
+                    {% endfor -%}
                 </span>{#-#}
             {% endif -%}
         </p>