Minor tweaks to the templates.

2 years ago · 114db959bd
parent b497aa6e0f
commit 114db959bd
19 changed files with 106 additions and 81 deletions
--- a/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2
+++ b/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2
@ -18,7 +18,11 @@

 <tr>
 <td style="padding:2px 5px;">
-    ATMM check: dr &le; {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (&#9651;) <br>
+    CC Attack -2 DRM
+
+<tr>
+<td style="padding:2px 5px;">
+    <b>ATMM check</b>: dr &le; {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (&#9651;) <br>
    <table style="margin-left:10px;">
        <tr>
            <td style="width:25px;"> +1 <td> HS
@ -30,7 +34,6 @@
            <td> +1 <td> vs. non-armored vehicle
    </table>
    original 6 = pinned (CCV reduced by 1) <br>
-    <span class="exc"> EXC: CC DRM is -2 </span>

 </table>

--- a/vasl_templates/webapp/data/default-template-pack/atmm.j2
+++ b/vasl_templates/webapp/data/default-template-pack/atmm.j2
@ -18,7 +18,7 @@

 <tr>
 <td style="padding:2px 5px;">
-    ATMM check: dr &le; 3 (&#9651;) <br>
+    <b>ATMM check</b>: dr &le; 3 (&#9651;) <br>
    <table style="margin-left:10px;">
        <tr>
            <td style="width:25px;"> +1 <td> HS/crew
--- a/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2
@ -23,7 +23,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
@ -38,14 +38,16 @@

 <td valign="top" style="padding:0 5px;">
    <table>
-        <tr>
-            <td> <b>X#:</b>
-            <td class="r"> 11
        <tr>
            <td> <b>TK#:</b>
            <td class="r"> 16
        <tr>
            <td colspan="2" class="r"> 8-4
+        <tr>
+            <td> &nbsp;
+        <tr>
+            <td> <b>X#:</b>
+            <td class="r"> 11
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2
@ -23,7 +23,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
@ -40,14 +40,16 @@

 <td valign="top" style="padding:0 5px;">
    <table>
-        <tr>
-            <td> <b>X#:</b>
-            <td class="r"> 10
        <tr>
            <td> <b>TK#:</b>
            <td class="r"> 22
        <tr>
            <td colspan="2" class="r"> 12-5
+        <tr>
+            <td> &nbsp;
+        <tr>
+            <td> <b>X#:</b>
+            <td class="r"> 10
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/baz.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz.j2
@ -23,7 +23,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
 {%if BAZ_TYPE == 45%}
    <tr>
        <td class="c"> 0 <td class="c"> 11
@ -53,6 +53,13 @@

 <td valign="top" style="padding:0 5px;">
    <table>
+        <tr>
+            <td> <b>TK#:</b>
+            <td class="r"> {{BAZ_TK}}
+        <tr>
+            <td colspan="2" class="r"> 8-{{BAZ_RANGE}}
+        <tr>
+            <td> &nbsp;
        <tr>
            <td> <b>X#:</b>
            <td class="r"> {{BAZ_BREAKDOWN}}
@ -61,11 +68,6 @@
            <td> <b>WP#:</b>
            <td class="r"> {{BAZ_WP}}
 {%endif%}
-        <tr>
-            <td> <b>TK#:</b>
-            <td class="r"> {{BAZ_TK}}
-        <tr>
-            <td colspan="2" class="r"> 8-{{BAZ_RANGE}}
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/baz45.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz45.j2
@ -23,7 +23,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 11
    <tr>
@ -40,17 +40,19 @@

 <td valign="top" style="padding:0 5px;">
    <table>
+        <tr>
+            <td> <b>TK#:</b>
+            <td class="r"> 16
+        <tr>
+            <td colspan="2" class="r"> 8-5
+        <tr>
+            <td> &nbsp;
        <tr>
            <td> <b>X#:</b>
            <td class="r"> 11
        <tr>
            <td> <b>WP#:</b>
            <td class="r"> 6
-        <tr>
-            <td> <b>TK#:</b>
-            <td class="r"> 16
-        <tr>
-            <td colspan="2" class="r"> 8-5
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/baz50.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz50.j2
@ -23,7 +23,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 11
    <tr>
@ -40,6 +40,13 @@

 <td valign="top" style="padding:0 5px;">
    <table>
+        <tr>
+            <td> <b>TK#:</b>
+            <td class="r"> 32
+        <tr>
+            <td colspan="2" class="r"> 12-5
+        <tr>
+            <td> &nbsp;
        <tr>
            <td> <b>X#:</b>
            <td class="r"> 11
@ -48,11 +55,6 @@
            <td> <b>WP#:</b>
            <td class="r"> 6
 {%endif%}
-        <tr>
-            <td> <b>TK#:</b>
-            <td class="r"> 32
-        <tr>
-            <td colspan="2" class="r"> 12-5
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/extras/kgs/grenade-bundles.j2
+++ b/vasl_templates/webapp/data/default-template-pack/extras/kgs/grenade-bundles.j2
@ -22,11 +22,11 @@

 <tr>
 <td style="padding:3px 5px 0 5px;">
-    -2 CC Attack DRM
+    CC Attack -2 DRM

 <tr>
 <td style="padding:3px 5px 0 5px;">
-    ATMM check: dr &le; 3 (&#9651;)
+    <b>ATMM check</b>: dr &le; 3 (&#9651;)
    <table style="margin-left:10px;">
        <tr>
            <td style="width:20px;"> +1
--- a/vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2
+++ b/vasl_templates/webapp/data/default-template-pack/extras/kgs/molotov-cocktails.j2
@ -22,11 +22,11 @@

 <tr>
 <td style="padding:3px 5px 0 5px;">
-    vs. AFV only
+    Against AFV only.

 <tr>
 <td style="padding:3px 5px 0 5px;">
-    MOL check: dr &le; 3 (&#9651;)
+    <b>MOL check</b>: dr &le; 3 (&#9651;)
    <table style="margin-left:10px;">
        <tr>
            <td style="width:20px;"> +1
@ -41,7 +41,7 @@

 <tr>
 <td style="padding:3px 5px 0 5px;">
-    IFT DR original colored dr:
+    <b>IFT DR original colored dr</b>:
    <ul>
        <li> 1 = Flame in target Location
        <li> 6 = thrower breaks, Flame in their Location
@ -49,7 +49,7 @@

 <tr>
 <td style="padding:3px 5px 0 5px;">
-    Kindling Attempt: +2 DRM
+    <b>Kindling Attempt</b>: +2 DRM

 </table>

--- a/vasl_templates/webapp/data/default-template-pack/mol-p.j2
+++ b/vasl_templates/webapp/data/default-template-pack/mol-p.j2
@ -23,7 +23,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
@ -36,21 +36,23 @@
        <td class="c"> 4 <td class="c"> 4
    </table>

-<td valign="top" style="padding:0 5px;">
+<td valign="top" style="padding:0 5px;" width="170">
    <table>
+        <tr>
+            <td colspan="2" class="r"> 4-4
+        <tr>
+            <td> &nbsp;
        <tr>
            <td> <b>X#:</b>
            <td class="r"> 12
        <tr>
            <td> <b>B#:</b>
            <td class="r"> 11
-        <tr>
-            <td colspan="2" class="r"> 4-4
    </table>

 <tr>
 <td colspan="2">
-    IFT DR original colored dr:
+    <b>IFT DR original colored dr</b>:
    <ul>
        <li> 1 = Flame in target Location
        <li> 6 = thrower breaks, Flame in their Location
--- a/vasl_templates/webapp/data/default-template-pack/mol.j2
+++ b/vasl_templates/webapp/data/default-template-pack/mol.j2
@ -20,7 +20,7 @@

 <tr>
 <td style="padding:0 5px;">
-    MOL check: dr &le; 3 (&#9651;) <br>
+    <b>MOL check</b>: dr &le; 3 (&#9651;) <br>
    <table style="margin:0 0 5px 10px;">
        <tr>
            <td style="width:25px;"> +1 <td> HS/crew
@ -31,12 +31,12 @@
        <tr>
            <td> +1 <td> non-AFV target
    </table>
-    IFT DR original colored dr:
+    <b>IFT DR original colored dr</b>:
    <ul style="margin-bottom:5px;">
        <li> 1 = Flame in target Location
        <li> 6 = thrower breaks, Flame in their Location
    </ul>
-    Kindling Attempt: +2 DRM
+    <b>Kindling Attempt</b>: +2 DRM

 </table>

--- a/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2
@ -16,11 +16,14 @@
 ">
    {{INCLUDE:player_flag_large}}Panzerfaust

+<tr>
+<td colspan="2" style="padding:2px 5px;">
+    Elite &amp; 1<sup>st</sup> Line MMC only.
+
 <tr>

 <td valign="top" rowspan="2" style="padding:2px 5px;">
-    Elite &amp; 1<sup>st</sup> Line MMC only <br>
-    PF check: dr &le; 2 (&#9651;)
+    <b>PF check</b>: dr &le; 2 (&#9651;)
    <table style="margin-left:10px;">
        <tr>
            <td style="width:25px;"> +1 <td> HS/crew
@ -36,19 +39,17 @@
 <td valign="top" style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c" width="50"> Range <td class="c"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
        <td class="c"> 1 <td class="c"> 8
+    <tr>
+        <td colspan="2" class="r" style="padding-top:5px;">
+            <b>TK#:</b> 31 <br>
+            16-3
    </table>

-<tr>
-
-<td style="padding:0 5px;text-align:right;">
-    <b>TK#:</b> 31 <br>
-    16-3
-
 </table>

 </html>
--- a/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2
@ -17,10 +17,12 @@
    {{INCLUDE:player_flag_large}}Panzerfaust

 <tr>
+<td colspan="2" style="padding:2px 5px;">
+    Non-Crew MMC only.

+<tr>
 <td valign="top" rowspan="2" style="padding:2px 5px;">
-    Non-Crew MMC only <br>
-    PF check: dr &le; 2 (&#9651;)
+    <b>PF check</b>: dr &le; 2 (&#9651;)
    <table style="margin-left:10px;">
        <tr>
            <td style="width:25px;"> +1 <td> HS/crew
@ -38,21 +40,19 @@
 <td valign="top" style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c" width="50"> Range <td class="c"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
        <td class="c"> 1 <td class="c"> 8
    <tr>
        <td class="c"> 2 <td class="c"> 6
+    <tr>
+        <td colspan="2" class="r" style="padding-top:5px;">
+            <b>TK#:</b> 31 <br>
+            16-3
    </table>

-<tr>
-
-<td style="padding:0 5px;text-align:right;">
-    <b>TK#:</b> 31 <br>
-    16-3
-
 </table>

 </html>
--- a/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2
@ -16,11 +16,14 @@
 ">
    {{INCLUDE:player_flag_large}}Panzerfaust

+<tr>
+<td colspan="2" style="padding:2px 5px;">
+    Non-Crew MMC only.
+
 <tr>

 <td valign="top" rowspan="2" style="padding:2px 5px;">
-    Non-Crew MMC only <br>
-    PF check: dr &le; {%if SCENARIO_YEAR >= 1945%} 1 {%else%} 2 {%endif%} (&#9651;)
+    <b>PF check</b>: dr &le; {%if SCENARIO_YEAR >= 1945%} 1 {%else%} 2 {%endif%} (&#9651;)
    <table style="margin-left:10px;">
        <tr>
            <td style="width:25px;"> +1 <td> HS/crew
@ -40,7 +43,7 @@
 <td valign="top" style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c" width="50"> Range <td class="c"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
@ -49,14 +52,14 @@
    <tr>
        <td class="c"> 2 <td class="c"> 6
 {%endif%}
+    <tr>
+        <td colspan="2" class="r" style="padding-top:5px;">
+            <b>TK#:</b> 31 <br>
+            16-3
    </table>

 <tr>

-<td style="padding:0 5px;text-align:right;">
-    <b>TK#:</b> 31 <br>
-    16-3
-
 </table>

 </html>
--- a/vasl_templates/webapp/data/default-template-pack/pf.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf.j2
@ -46,7 +46,7 @@
 <td valign="top" style="padding:0 5px;">
    <table>
    <tr>
-        <td> Range <td> &nbsp; <b>TH#</b> &nbsp;
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 10
    <tr>
@ -64,7 +64,7 @@

 <tr>

-<td style="padding:0 5px;">
+<td style="padding:5px 5px 0 5px;">
    <div>
        <b>TK#</b>: 31 <i>(16-3)</i>
    </div>
--- a/vasl_templates/webapp/data/default-template-pack/piat.j2
+++ b/vasl_templates/webapp/data/default-template-pack/piat.j2
@ -21,7 +21,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 11
    <tr>
@ -34,14 +34,16 @@

 <td valign="top" style="padding:0 5px;">
    <table>
-        <tr>
-            <td> <b>B#:</b>
-            <td class="r"> 10
        <tr>
            <td> <b>TK#:</b>
            <td class="r"> 15
        <tr>
            <td colspan="2" class="r"> 8-3
+        <tr>
+            <td> &nbsp;
+        <tr>
+            <td> <b>B#:</b>
+            <td class="r"> 10
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/psk.j2
+++ b/vasl_templates/webapp/data/default-template-pack/psk.j2
@ -21,7 +21,7 @@
 <td style="padding:0 5px;">
    <table>
    <tr>
-        <td> <b>Range</b> <td> <b>TH#</b>
+        <td class="c"> Range <td class="c" width="35"> <b>TH#</b>
    <tr>
        <td class="c"> 0 <td class="c"> 11
    <tr>
@ -36,14 +36,16 @@

 <td valign="top" style="padding:0 5px;">
    <table>
-        <tr>
-            <td> <b>X#:</b>
-            <td class="r"> 10
        <tr>
            <td> <b>TK#:</b>
            <td class="r"> 26
        <tr>
            <td colspan="2" class="r"> 12-4
+        <tr>
+            <td> &nbsp;
+        <tr>
+            <td> <b>X#:</b>
+            <td class="r"> 10
    </table>

 </table>
--- a/vasl_templates/webapp/data/default-template-pack/thh.j2
+++ b/vasl_templates/webapp/data/default-template-pack/thh.j2
@ -19,7 +19,7 @@
 <tr>

 <td valign="top" style="padding:2px 5px;">
-    THH creation: dr &le; 3 (&#9651;)
+    <b>THH creation</b>: dr &le; 3 (&#9651;)
    <table style="margin-left:10px;">
        <tr>
            <td style="width:25px;"> +2 <td> if Conscript
@ -33,8 +33,8 @@
 <tr>

 {% if SCENARIO_YEAR %}
-<td valign="top" style="padding:10px 5px;">
-    ATMM check: dr &le; {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (&#9651;)
+<td valign="top" style="padding:5px;">
+    <b>ATMM check</b>: dr &le; {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (&#9651;)
 {%endif%}

 </table>
--- a/vasl_templates/webapp/tests/test_vassal.py
+++ b/vasl_templates/webapp/tests/test_vassal.py
@ -879,6 +879,8 @@ def _check_vsav_dump( vsav_dump, expected, ignore=None ):
        snippet_id = mo2.group( 1 )
        if snippet_id.startswith( "extras/" ):
            continue
+        for tag in [ "b", "em" ]:
+            label = label.replace( "<{}>".format( tag ), "" ).replace( "</{}>".format( tag ), "" )
        labels[snippet_id] = label

    # compare what we extracted from the dump with what's expected