Show a larger flag in label headings that use a larger font.

3 years ago · da5ced479f
parent 540f770b3a
commit da5ced479f
58 changed files with 32 additions and 23 deletions
--- a/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2
+++ b/vasl_templates/webapp/data/default-template-pack/atmm-romanian.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Anti-Tank Magnetic Mines
+    {{INCLUDE:player_flag_large}}Anti-Tank Magnetic Mines

 <tr>
 <td style="padding:2px 5px;">
--- a/vasl_templates/webapp/data/default-template-pack/atmm.j2
+++ b/vasl_templates/webapp/data/default-template-pack/atmm.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Anti-Tank Magnetic Mines
+    {{INCLUDE:player_flag_large}}Anti-Tank Magnetic Mines

 <tr>
 <td style="padding:2px 5px;">
--- a/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz-cpva16.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Bazooka '44
+    {{INCLUDE:player_flag_large}}Bazooka '44

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz-cpva17.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Bazooka Type 51
+    {{INCLUDE:player_flag_large}}Bazooka Type 51

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/baz.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Bazooka {%if BAZ_TYPE%} ('{{BAZ_TYPE}}) {%endif%}
+    {{INCLUDE:player_flag_large}}Bazooka {%if BAZ_TYPE%} ('{{BAZ_TYPE}}) {%endif%}

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/baz45.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz45.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Bazooka '45
+    {{INCLUDE:player_flag_large}}Bazooka '45

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/baz50.j2
+++ b/vasl_templates/webapp/data/default-template-pack/baz50.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Bazooka '50
+    {{INCLUDE:player_flag_large}}Bazooka '50

 <tr>

--- 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
@ -18,7 +18,7 @@
    font-size: 105% ; font-weight: bold ;
 ">
    {# Some versions of Java require <img> tags to have the width and height specified!?! #}
-    {%if PLAYER_FLAGS["german"]%}<img src="{{PLAYER_FLAGS["german"]}}" {{PLAYER_FLAG_SIZE}}>&nbsp;{%endif%}Grenade Bundles
+    {%if PLAYER_FLAGS["german"]%}<img src="{{PLAYER_FLAGS["german"]}}" {{PLAYER_FLAG_SIZE_LARGE}}>&nbsp;{%endif%}Grenade Bundles

 <tr>
 <td style="padding:3px 5px 0 5px;">
--- 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
@ -18,7 +18,7 @@
    font-size: 105% ; font-weight: bold ;
 ">
    {# Some versions of Java require <img> tags to have the width and height specified!?! #}
-    {%if PLAYER_FLAGS["german"]%}<img src="{{PLAYER_FLAGS["german"]}}" {{PLAYER_FLAG_SIZE}}>&nbsp;{%endif%}Molotov Cocktails
+    {%if PLAYER_FLAGS["german"]%}<img src="{{PLAYER_FLAGS["german"]}}" {{PLAYER_FLAG_SIZE_LARGE}}>&nbsp;{%endif%}Molotov Cocktails

 <tr>
 <td style="padding:3px 5px 0 5px;">
--- a/vasl_templates/webapp/data/default-template-pack/mol-p.j2
+++ b/vasl_templates/webapp/data/default-template-pack/mol-p.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}MOL Projector
+    {{INCLUDE:player_flag_large}}MOL Projector

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/mol.j2
+++ b/vasl_templates/webapp/data/default-template-pack/mol.j2
@ -16,7 +16,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Molotov Cocktail
+    {{INCLUDE:player_flag_large}}Molotov Cocktail

 <tr>
 <td style="padding:0 5px;">
--- a/vasl_templates/webapp/data/default-template-pack/nat_caps.j2
+++ b/vasl_templates/webapp/data/default-template-pack/nat_caps.j2
@ -17,7 +17,7 @@ span.comment { font-size: 85% ; font-style: italic ; color: #404040 ; }
  border-bottom: 1px solid {{OB_COLOR_2}} ;
  font-size: 105% ; font-weight: bold ;
 ">
-    <nobr>{{INCLUDE:player_flag}}{{PLAYER_NAME|nbsp}}&nbsp;Capabilities</nobr>
+    <nobr>{{INCLUDE:player_flag_large}}{{PLAYER_NAME|nbsp}}&nbsp;Capabilities</nobr>

 <tr> <td>

--- a/vasl_templates/webapp/data/default-template-pack/ob_ma_notes.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_ma_notes.j2
@ -33,7 +33,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}{{PLAYER_NAME}} {{VO_TYPE}} Notes
+    {{INCLUDE:player_flag_large}}{{PLAYER_NAME}} {{VO_TYPE}} Notes

 {%if OB_MA_NOTES%}
 <tr> <td style="padding:0 5px;">
--- a/vasl_templates/webapp/data/default-template-pack/ob_vo.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vo.j2
@ -26,7 +26,7 @@
      white-space: nowrap ;
    ">
        {# CSS "white-space:nowrap" doesn't always work in VASSAL, we need to use <nobr> and &nbsp; here :-/ #}
-        <nobr>{{INCLUDE:player_flag}}{{PLAYER_NAME|nbsp}}&nbsp;{{VO_TYPES}}</nobr>
+        <nobr>{{INCLUDE:player_flag_large}}{{PLAYER_NAME|nbsp}}&nbsp;{{VO_TYPES}}</nobr>

 {%for vo in OB_VO%}

--- a/vasl_templates/webapp/data/default-template-pack/ob_vo_note.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vo_note.j2
@ -17,7 +17,7 @@
      padding: 2px 5px ;
      font-size: 105% ; font-weight: bold ;
    ">
-        {{INCLUDE:player_flag}}{{VO_NAME}}
+        {{INCLUDE:player_flag_large}}{{VO_NAME}}

 <tr>
    <td style="padding-top:2px;"> {{VO_NOTE_HTML}}
--- a/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf-finnish.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Panzerfaust
+    {{INCLUDE:player_flag_large}}Panzerfaust

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf-hungarian.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Panzerfaust
+    {{INCLUDE:player_flag_large}}Panzerfaust

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf-romanian.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Panzerfaust
+    {{INCLUDE:player_flag_large}}Panzerfaust

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/pf.j2
+++ b/vasl_templates/webapp/data/default-template-pack/pf.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Panzerfaust
+    {{INCLUDE:player_flag_large}}Panzerfaust

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/piat.j2
+++ b/vasl_templates/webapp/data/default-template-pack/piat.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}PIAT
+    {{INCLUDE:player_flag_large}}PIAT

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/player_flag_large.include
+++ b/vasl_templates/webapp/data/default-template-pack/player_flag_large.include
@ -0,0 +1,2 @@
+{# Some versions of Java require <img> tags to have the width and height specified!?! #}
+{%if PLAYER_FLAG%}<img src="{{PLAYER_FLAG}}" {{PLAYER_FLAG_SIZE_LARGE}}>&nbsp;{%endif%}
--- a/vasl_templates/webapp/data/default-template-pack/psk.j2
+++ b/vasl_templates/webapp/data/default-template-pack/psk.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Panzerschrek
+    {{INCLUDE:player_flag_large}}Panzerschrek

 <tr>

--- a/vasl_templates/webapp/data/default-template-pack/thh.j2
+++ b/vasl_templates/webapp/data/default-template-pack/thh.j2
@ -14,7 +14,7 @@
  padding: 2px 5px ;
  font-size: 105% ; font-weight: bold ;
 ">
-    {{INCLUDE:player_flag}}Tank-Hunter Heroes
+    {{INCLUDE:player_flag_large}}Tank-Hunter Heroes

 <tr>

--- a/vasl_templates/webapp/snippets.py
+++ b/vasl_templates/webapp/snippets.py
@ -194,7 +194,9 @@ def get_flag( nat ):
    if not re.search( "^[-a-z~]+$", nat ):
        abort( 404 )
    key = "flags:{}".format( nat )
-    height = app.config.get( "DEFAULT_FLAG_HEIGHT", 11 )
+    # NOTE: Most of the flags are at the larger size, so we default to that size (since we get better results
+    # doing that, and scaling down to the smaller size as needed, rather than the other way around).
+    height = app.config.get( "DEFAULT_FLAG_HEIGHT", 13 )

    # check if a custom flag has been configured
    if globvars.template_pack:
--- a/vasl_templates/webapp/static/images/flags/american.png
+++ b/vasl_templates/webapp/static/images/flags/american.png
--- a/vasl_templates/webapp/static/images/flags/anzac.png
+++ b/vasl_templates/webapp/static/images/flags/anzac.png
--- a/vasl_templates/webapp/static/images/flags/belgian.png
+++ b/vasl_templates/webapp/static/images/flags/belgian.png
--- a/vasl_templates/webapp/static/images/flags/british.png
+++ b/vasl_templates/webapp/static/images/flags/british.png
--- a/vasl_templates/webapp/static/images/flags/british~canadian.png
+++ b/vasl_templates/webapp/static/images/flags/british~canadian.png
--- a/vasl_templates/webapp/static/images/flags/british~newzealand.png
+++ b/vasl_templates/webapp/static/images/flags/british~newzealand.png
--- a/vasl_templates/webapp/static/images/flags/bulgarian.png
+++ b/vasl_templates/webapp/static/images/flags/bulgarian.png
--- a/vasl_templates/webapp/static/images/flags/burmese.png
+++ b/vasl_templates/webapp/static/images/flags/burmese.png
--- a/vasl_templates/webapp/static/images/flags/chinese.png
+++ b/vasl_templates/webapp/static/images/flags/chinese.png
--- a/vasl_templates/webapp/static/images/flags/chinese~gmd.png
+++ b/vasl_templates/webapp/static/images/flags/chinese~gmd.png
--- a/vasl_templates/webapp/static/images/flags/croatian.png
+++ b/vasl_templates/webapp/static/images/flags/croatian.png
--- a/vasl_templates/webapp/static/images/flags/danish.png
+++ b/vasl_templates/webapp/static/images/flags/danish.png
--- a/vasl_templates/webapp/static/images/flags/dutch.png
+++ b/vasl_templates/webapp/static/images/flags/dutch.png
--- a/vasl_templates/webapp/static/images/flags/filipino.png
+++ b/vasl_templates/webapp/static/images/flags/filipino.png
--- a/vasl_templates/webapp/static/images/flags/finnish.png
+++ b/vasl_templates/webapp/static/images/flags/finnish.png
--- a/vasl_templates/webapp/static/images/flags/free-french.png
+++ b/vasl_templates/webapp/static/images/flags/free-french.png
--- a/vasl_templates/webapp/static/images/flags/french.png
+++ b/vasl_templates/webapp/static/images/flags/french.png
--- a/vasl_templates/webapp/static/images/flags/german.png
+++ b/vasl_templates/webapp/static/images/flags/german.png
--- a/vasl_templates/webapp/static/images/flags/greek.png
+++ b/vasl_templates/webapp/static/images/flags/greek.png
--- a/vasl_templates/webapp/static/images/flags/hungarian.png
+++ b/vasl_templates/webapp/static/images/flags/hungarian.png
--- a/vasl_templates/webapp/static/images/flags/indonesian.png
+++ b/vasl_templates/webapp/static/images/flags/indonesian.png
--- a/vasl_templates/webapp/static/images/flags/italian.png
+++ b/vasl_templates/webapp/static/images/flags/italian.png
--- a/vasl_templates/webapp/static/images/flags/japanese.png
+++ b/vasl_templates/webapp/static/images/flags/japanese.png
--- a/vasl_templates/webapp/static/images/flags/kfw-cpva.png
+++ b/vasl_templates/webapp/static/images/flags/kfw-cpva.png
--- a/vasl_templates/webapp/static/images/flags/kfw-kpa.png
+++ b/vasl_templates/webapp/static/images/flags/kfw-kpa.png
--- a/vasl_templates/webapp/static/images/flags/kfw-ounc.png
+++ b/vasl_templates/webapp/static/images/flags/kfw-ounc.png
--- a/vasl_templates/webapp/static/images/flags/kfw-rok.png
+++ b/vasl_templates/webapp/static/images/flags/kfw-rok.png
--- a/vasl_templates/webapp/static/images/flags/polish.png
+++ b/vasl_templates/webapp/static/images/flags/polish.png
--- a/vasl_templates/webapp/static/images/flags/romanian.png
+++ b/vasl_templates/webapp/static/images/flags/romanian.png
--- a/vasl_templates/webapp/static/images/flags/russian.png
+++ b/vasl_templates/webapp/static/images/flags/russian.png
--- a/vasl_templates/webapp/static/images/flags/slovakian.png
+++ b/vasl_templates/webapp/static/images/flags/slovakian.png
--- a/vasl_templates/webapp/static/images/flags/thai.png
+++ b/vasl_templates/webapp/static/images/flags/thai.png
--- a/vasl_templates/webapp/static/images/flags/yugoslavian.png
+++ b/vasl_templates/webapp/static/images/flags/yugoslavian.png
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@ -138,6 +138,11 @@ function make_snippet( $btn, params, extra_params, show_date_warnings )
        params.CUSTOM_LIST_BULLETS = true ;
    // some versions of Java require <img> tags to have the width and height specified!?!
    params.PLAYER_FLAG_SIZE = "width='11' height='11'" ;
+    // FUDGE! A lot of labels use a larger font for their heading (e.g. V/O notes, PF, ATMM, etc.) and so
+    // we would like to show a larger flag to match, or at least vertically center the flag. This would be
+    // trivial to do with CSS, but VASSAL's HTML engine can't handle it, so we have to manually force
+    // the flag to render at a larger size >:-/
+    params.PLAYER_FLAG_SIZE_LARGE = "width='13' height='13'" ;

    // set player-specific parameters
    var player_no ;