From 2845ce5aeb9221fadb1a99311433b93505b9d6cb Mon Sep 17 00:00:00 2001 From: Taka Date: Wed, 8 May 2019 15:29:21 +0000 Subject: [PATCH] Increased the size of headers in snippets. --- .../webapp/data/default-template-pack/atmm.j2 | 6 ++--- .../webapp/data/default-template-pack/baz.j2 | 6 ++--- .../extras/blank-space.j2 | 4 +++ .../extras/count-remaining.j2 | 5 ++++ .../data/default-template-pack/extras/grid.j2 | 3 +++ .../default-template-pack/extras/hip-guns.j2 | 8 +++++- .../extras/kgs/grenade-bundles.j2 | 20 +++++++++----- .../extras/kgs/molotov-cocktails.j2 | 27 +++++++++++++------ .../extras/turn-track-shading.j2 | 13 ++++++--- .../extras/victory-points.j2 | 7 ++++- .../data/default-template-pack/mol-p.j2 | 6 ++--- .../webapp/data/default-template-pack/mol.j2 | 2 +- .../data/default-template-pack/ob_ma_notes.j2 | 6 ++--- .../data/default-template-pack/ob_vo.j2 | 2 +- .../data/default-template-pack/ob_vo_note.css | 2 +- .../data/default-template-pack/ob_vo_note.j2 | 2 +- .../webapp/data/default-template-pack/pf.j2 | 12 ++++----- .../webapp/data/default-template-pack/piat.j2 | 10 +++---- .../data/default-template-pack/players.j2 | 4 +-- .../webapp/data/default-template-pack/psk.j2 | 10 +++---- .../data/default-template-pack/scenario.j2 | 7 ++--- .../default-template-pack/scenario_note.j2 | 4 +-- .../webapp/data/default-template-pack/ssr.j2 | 5 ++-- .../webapp/data/default-template-pack/thh.j2 | 10 +++---- .../victory_conditions.j2 | 8 +++--- vasl_templates/webapp/static/extras.js | 2 ++ vasl_templates/webapp/static/snippets.js | 5 +++- 27 files changed, 117 insertions(+), 79 deletions(-) diff --git a/vasl_templates/webapp/data/default-template-pack/atmm.j2 b/vasl_templates/webapp/data/default-template-pack/atmm.j2 index 1d7e72d..86fb691 100644 --- a/vasl_templates/webapp/data/default-template-pack/atmm.j2 +++ b/vasl_templates/webapp/data/default-template-pack/atmm.j2 @@ -2,9 +2,7 @@ - + @@ -14,7 +12,7 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}Anti-Tank Magnetic Mines diff --git a/vasl_templates/webapp/data/default-template-pack/baz.j2 b/vasl_templates/webapp/data/default-template-pack/baz.j2 index 755a4b3..78342b1 100644 --- a/vasl_templates/webapp/data/default-template-pack/baz.j2 +++ b/vasl_templates/webapp/data/default-template-pack/baz.j2 @@ -14,13 +14,13 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}Bazooka {%if BAZ_TYPE%} ('{{BAZ_TYPE}}) {%endif%} -
+
Range TH# @@ -51,7 +51,7 @@ {%endif%}
-		 + {%if BAZ_BREAKDOWN%} diff --git a/vasl_templates/webapp/data/default-template-pack/extras/blank-space.j2 b/vasl_templates/webapp/data/default-template-pack/extras/blank-space.j2 index e2e7c74..1cc87ee 100644 --- a/vasl_templates/webapp/data/default-template-pack/extras/blank-space.j2 +++ b/vasl_templates/webapp/data/default-template-pack/extras/blank-space.j2 @@ -3,6 +3,10 @@ + + + +
  diff --git a/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2 b/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2 index 0506a2a..8e83fb7 100644 --- a/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2 +++ b/vasl_templates/webapp/data/default-template-pack/extras/count-remaining.j2 @@ -4,4 +4,9 @@ + + + + +{# NOTE: We specify the font size in pixels, rather than as a percentage, since this label should be added to a counter. #}
{{COUNT:/3|Number}} diff --git a/vasl_templates/webapp/data/default-template-pack/extras/grid.j2 b/vasl_templates/webapp/data/default-template-pack/extras/grid.j2 index 2ba50ec..116d45e 100644 --- a/vasl_templates/webapp/data/default-template-pack/extras/grid.j2 +++ b/vasl_templates/webapp/data/default-template-pack/extras/grid.j2 @@ -4,7 +4,10 @@ + + + - - +
+ {# Some versions of Java require tags to have the width and height specified!?! #} {%if PLAYER_FLAGS["german"]%} {%endif%}Grenade Bundles
- -2 CC Attack DRM
- ATMM check: dr ≤ 3 (△)
+		 + -2 CC Attack DRM + +
+ ATMM check: dr ≤ 3 (△)
+1 diff --git 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 index 95b73d5..797220e 100644 --- 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 @@ -5,23 +5,28 @@ - + - - + + +
+ {# Some versions of Java require tags to have the width and height specified!?! #} {%if PLAYER_FLAGS["german"]%} {%endif%}Molotov Cocktails
- vs. AFV only
- MOL check: dr ≤ 3 (△)
+		 + vs. AFV only + +
+ MOL check: dr ≤ 3 (△)
+1 @@ -33,11 +38,17 @@ ul { margin: 0 0 0 10px ; padding: 0 ; } +1 CX
+ +
IFT DR original colored dr:
  • 1 = Flame in target Location
  • 6 = thrower breaks, Flame in their Location
+ +
Kindling Attempt: +2 DRM
diff --git a/vasl_templates/webapp/data/default-template-pack/extras/turn-track-shading.j2 b/vasl_templates/webapp/data/default-template-pack/extras/turn-track-shading.j2 index 449aac1..8ce168b 100644 --- a/vasl_templates/webapp/data/default-template-pack/extras/turn-track-shading.j2 +++ b/vasl_templates/webapp/data/default-template-pack/extras/turn-track-shading.j2 @@ -3,9 +3,16 @@ - - - -
  + + + + + +
diff --git a/vasl_templates/webapp/data/default-template-pack/extras/victory-points.j2 b/vasl_templates/webapp/data/default-template-pack/extras/victory-points.j2 index 55f79ee..bdb0701 100644 --- a/vasl_templates/webapp/data/default-template-pack/extras/victory-points.j2 +++ b/vasl_templates/webapp/data/default-template-pack/extras/victory-points.j2 @@ -4,4 +4,9 @@ -
{{TYPE:Victory Points::Casualty VP::Exit VP|Type}}: 0 + + + + +
+ {{TYPE:Victory Points::Casualty VP::Exit VP|Type}}: 0 diff --git a/vasl_templates/webapp/data/default-template-pack/mol-p.j2 b/vasl_templates/webapp/data/default-template-pack/mol-p.j2 index 37dee2e..f4128cb 100644 --- a/vasl_templates/webapp/data/default-template-pack/mol-p.j2 +++ b/vasl_templates/webapp/data/default-template-pack/mol-p.j2 @@ -14,13 +14,13 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}MOL Projector
+
Range TH# @@ -36,7 +36,7 @@ 4 4
-		 +
X#: diff --git a/vasl_templates/webapp/data/default-template-pack/mol.j2 b/vasl_templates/webapp/data/default-template-pack/mol.j2 index c639f45..1195ebb 100644 --- a/vasl_templates/webapp/data/default-template-pack/mol.j2 +++ b/vasl_templates/webapp/data/default-template-pack/mol.j2 @@ -14,7 +14,7 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}Molotov Cocktail diff --git a/vasl_templates/webapp/data/default-template-pack/ob_ma_notes.j2 b/vasl_templates/webapp/data/default-template-pack/ob_ma_notes.j2 index 415de81..e4e100b 100644 --- a/vasl_templates/webapp/data/default-template-pack/ob_ma_notes.j2 +++ b/vasl_templates/webapp/data/default-template-pack/ob_ma_notes.j2 @@ -26,19 +26,19 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}{{PLAYER_NAME}} {{VO_TYPE}} Notes {%if OB_MA_NOTES%} -
+
{%for ma_note in OB_MA_NOTES%}
{{ma_note}}
{%endfor%} {%endif%} {%if OB_EXTRA_MA_NOTES%} -
+
{%if OB_EXTRA_MA_NOTES_CAPTION%}
{{OB_EXTRA_MA_NOTES_CAPTION}}
{%endif%} {%for ma_note in OB_EXTRA_MA_NOTES%}
{{ma_note}}
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vo.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vo.j2 index 994388d..3018b28 100644 --- a/vasl_templates/webapp/data/default-template-pack/ob_vo.j2 +++ b/vasl_templates/webapp/data/default-template-pack/ob_vo.j2 @@ -20,7 +20,7 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px 0 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}{{PLAYER_NAME|nbsp}} {{VO_TYPES}} diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vo_note.css b/vasl_templates/webapp/data/default-template-pack/ob_vo_note.css index 192a722..427432d 100644 --- a/vasl_templates/webapp/data/default-template-pack/ob_vo_note.css +++ b/vasl_templates/webapp/data/default-template-pack/ob_vo_note.css @@ -16,6 +16,6 @@ img.piece { float: left ; margin-right: 0.5em ; } .content table th { padding: 2px 10px 2px 5px ; text-align: left ; background: #f0f0f0 ; } .content table td { padding: 0 10px 0 5px ; } -table.layout td { padding: 0 5px 0 5px ; } +table.layout td { padding: 0 5px ; } .content .rf { display: none ; } diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vo_note.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vo_note.j2 index 1f374f6..23ebdc6 100644 --- a/vasl_templates/webapp/data/default-template-pack/ob_vo_note.j2 +++ b/vasl_templates/webapp/data/default-template-pack/ob_vo_note.j2 @@ -15,7 +15,7 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}{{VO_NAME}} diff --git a/vasl_templates/webapp/data/default-template-pack/pf.j2 b/vasl_templates/webapp/data/default-template-pack/pf.j2 index 9f9640b..dcee8ac 100644 --- a/vasl_templates/webapp/data/default-template-pack/pf.j2 +++ b/vasl_templates/webapp/data/default-template-pack/pf.j2 @@ -2,9 +2,7 @@ - + @@ -14,13 +12,13 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}Panzerfaust -
+ PF check: dr ≤ {{PF_CHECK_DR}} (△) @@ -34,7 +32,7 @@
original 6 = pinned -		 + -
Range TH# @@ -54,7 +52,7 @@
+ TK#: 31
16-3 diff --git a/vasl_templates/webapp/data/default-template-pack/piat.j2 b/vasl_templates/webapp/data/default-template-pack/piat.j2 index b18a9bb..145e974 100644 --- a/vasl_templates/webapp/data/default-template-pack/piat.j2 +++ b/vasl_templates/webapp/data/default-template-pack/piat.j2 @@ -2,9 +2,7 @@ - + @@ -14,13 +12,13 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}PIAT -
+
Range TH# @@ -34,7 +32,7 @@ 3 5
-		 +
B#: diff --git a/vasl_templates/webapp/data/default-template-pack/players.j2 b/vasl_templates/webapp/data/default-template-pack/players.j2 index 44962d5..634d53d 100644 --- a/vasl_templates/webapp/data/default-template-pack/players.j2 +++ b/vasl_templates/webapp/data/default-template-pack/players.j2 @@ -2,9 +2,7 @@ - + - +
@@ -14,13 +12,13 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}Panzerschrek -
+
Range TH# @@ -36,7 +34,7 @@ 4 4
-		 +
X#: diff --git a/vasl_templates/webapp/data/default-template-pack/scenario.j2 b/vasl_templates/webapp/data/default-template-pack/scenario.j2 index 1accd31..2f2ce87 100644 --- a/vasl_templates/webapp/data/default-template-pack/scenario.j2 +++ b/vasl_templates/webapp/data/default-template-pack/scenario.j2 @@ -4,6 +4,7 @@ @@ -13,17 +14,17 @@
{%if SCENARIO_NAME%} {{SCENARIO_NAME}} {%else%} Untitled scenario {%endif%} - {%if SCENARIO_ID%} ({{SCENARIO_ID}}) {%endif%} + {%if SCENARIO_ID%} ({{SCENARIO_ID}}) {%endif%}
{%if SCENARIO_LOCATION%} {{SCENARIO_LOCATION}} {%endif%} {%if SCENARIO_DATE%} - ({{SCENARIO_DAY_OF_MONTH_POSTFIX}} {{SCENARIO_MONTH_NAME}}, {{SCENARIO_YEAR}}) + ({{SCENARIO_DAY_OF_MONTH_POSTFIX}} {{SCENARIO_MONTH_NAME}}, {{SCENARIO_YEAR}}) {%endif%}
diff --git a/vasl_templates/webapp/data/default-template-pack/scenario_note.j2 b/vasl_templates/webapp/data/default-template-pack/scenario_note.j2 index d34ace4..f885d1f 100644 --- a/vasl_templates/webapp/data/default-template-pack/scenario_note.j2 +++ b/vasl_templates/webapp/data/default-template-pack/scenario_note.j2 @@ -2,9 +2,7 @@ - + diff --git a/vasl_templates/webapp/data/default-template-pack/ssr.j2 b/vasl_templates/webapp/data/default-template-pack/ssr.j2 index 21e5e7a..b58dfea 100644 --- a/vasl_templates/webapp/data/default-template-pack/ssr.j2 +++ b/vasl_templates/webapp/data/default-template-pack/ssr.j2 @@ -4,7 +4,7 @@ @@ -18,8 +18,9 @@ ul#ssr li { margin-top: 2px ; } background: #f0f0f0 ; border-bottom: 1px solid #c0c0c0 ; padding: 2px 5px ; + font-size: 105% ; font-weight: bold ; "> - Scenario Special Rules + Scenario Special Rules
diff --git a/vasl_templates/webapp/data/default-template-pack/thh.j2 b/vasl_templates/webapp/data/default-template-pack/thh.j2 index f70286f..7744ef3 100644 --- a/vasl_templates/webapp/data/default-template-pack/thh.j2 +++ b/vasl_templates/webapp/data/default-template-pack/thh.j2 @@ -2,9 +2,7 @@ - + @@ -14,13 +12,13 @@ background: {{OB_COLOR}} ; border-bottom: 1px solid {{OB_COLOR_2}} ; padding: 2px 5px ; - font-weight: bold ; + font-size: 105% ; font-weight: bold ; "> {{INCLUDE:player_flag}}Tank-Hunter Heroes -
+ THH creation: dr ≤ 3 (△) @@ -35,7 +33,7 @@ {% if SCENARIO_YEAR %} -
+ ATMM check: dr ≤ {%if SCENARIO_YEAR < 1944%} 2 {%else%} 3 {%endif%} (△) {%endif%} diff --git a/vasl_templates/webapp/data/default-template-pack/victory_conditions.j2 b/vasl_templates/webapp/data/default-template-pack/victory_conditions.j2 index e5fe5a6..3f27f75 100644 --- a/vasl_templates/webapp/data/default-template-pack/victory_conditions.j2 +++ b/vasl_templates/webapp/data/default-template-pack/victory_conditions.j2 @@ -2,9 +2,7 @@ - + Victory Conditions -
+ {{VICTORY_CONDITIONS}}
diff --git a/vasl_templates/webapp/static/extras.js b/vasl_templates/webapp/static/extras.js index 85def64..4fffe18 100644 --- a/vasl_templates/webapp/static/extras.js +++ b/vasl_templates/webapp/static/extras.js @@ -150,6 +150,8 @@ function _parse_extra_template( template_id, template ) continue ; var val = param.name.substr( pos+1 ) ; param.name = param.name.substr( 0, pos ) ; + if ( param.name === "CSS" ) + continue ; // figure out what type of parameter we have if ( val.indexOf( "::" ) !== -1 ) { // we have a