Merge remote-tracking branch 'horada112/align-matrix-axis-names-to-le…

…ft' into merge-align-matrix-axis-names-to-left
inorton · May 15, 2021 · fb7ce79 · fb7ce79
2 parents 9786479 + 07f046c
commit fb7ce79
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/junit2htmlreport/templates/matrix.html b/junit2htmlreport/templates/matrix.html
@@ -9,7 +9,7 @@ <h1>
     {% set n_reports = report_names.__len__() %}
     {% if n_reports > 0 %}
     <tr><!-- top row, stats and each matrix axis -->
-        <td colspan="2" rowspan="{{n_reports + 1}}"> <!-- stats -->
+        <td colspan="1" rowspan="{{n_reports + 2}}"> <!-- stats -->
             <table class="stats-table">
                 {% for outcome in matrix.result_stats %}
                 <tr>
@@ -19,26 +19,24 @@ <h1>
                 {% endfor %}
             </table>
         </td>
+        <td colspan="{{n_reports + 1}}"></td>
 
-        <td colspan="{{n_reports}}" class="matrix-axis-name">
-            <a href="{{report_names[0]}}.html">{{matrix.short_axis(report_names[0])}}</a>
-        </td>
     </tr>
     {% endif %}
     <!-- matrix column index - {{report_names}} -->
-    {% for i in range(n_reports - 1) %}
+    {% for i in range(n_reports) %}
     <tr>
-        {% for n in range(1 + i) %}
-        <td class="matrix-axis-line"></td>
-        {% endfor %}
-        <td colspan="{{n_reports - 1 - i}}" class="matrix-axis-name">
-            <a href="{{report_names[i + 1]}}.html">{{matrix.short_axis(report_names[i + 1])}}</a>
+        <td colspan="{{n_reports + 1 - i}}" class="matrix-axis-name {% if (n_reports - i) % 2 == 0 %}matrix-even{% endif %}">
+            <a href="{{report_names[n_reports - 1 - i]}}.html">{{matrix.short_axis(report_names[n_reports - 1 - i])}}</a>
         </td>
+        {% for n in range(i) %}
+        <td class="matrix-axis-line {% if (n_reports - n) % 2 != i % 2 %}matrix-even{% endif %}"></td>
+        {% endfor %}
     </tr>
     {% endfor %}
     <tr>
-        {% for n in range(n_reports) %}
-        <td class="matrix-axis-line"></td>
+        {% for n in range(n_reports + 1) %}
+        <td class="matrix-axis-line {% if n % 2 == 0 %}matrix-even{% endif %}"></td>
         {% endfor %}
     </tr>
 
@@ -47,7 +45,7 @@ <h1>
     <tr>
         <th class="matrix-classname" colspan="2">{{classname}}</th>
         {% for n in range(n_reports) %}
-        <td class="matrix-axis-line"></td>
+        <td class="matrix-axis-line {% if n % 2 == 1 %}matrix-even{% endif %}"></td>
         {% endfor %}
     </tr>
     {% for casename in matrix.casenames[classname] %}
@@ -57,9 +55,10 @@ <h1>
         <td class="matrix-casename matrix-result-combined">
             {{ matrix.combined_result_list(classname, casename)[1] }}
         </td>
-        {% for axis in report_names %}
+        {% for n in range(n_reports) %}
+        {% set axis = report_names[n] %}
 
-        <td class="matrix-axis-line">
+        <td class="matrix-axis-line {% if n % 2 == 1 %}matrix-even{% endif %}">
             {% if axis in xcase %}
             <a href="{{axis}}.html#{{xcase[axis].anchor()}}">
                         <span class="matrix-result matrix-result-{{xcase[axis].outcome()}}">
@@ -77,4 +76,4 @@ <h1>
     {% endfor %}
 
 </table>
-{% endblock %}
+{% endblock %}
diff --git a/junit2htmlreport/templates/styles.css b/junit2htmlreport/templates/styles.css
@@ -127,9 +127,10 @@ h1 {
 
 .matrix-axis-name {
     white-space: nowrap;
-    padding-left: 0.5em;
+    padding-right: 0.5em;
     border-left: 1px solid black;
     border-top: 1px solid black;
+    text-align: right;
 }
 
 .matrix-axis-line {
@@ -177,3 +178,7 @@ h1 {
 .matrix-result-skipped {
     background-color: lightyellow;
 }
+
+.matrix-even {
+    background-color: lightgray;
+}