diff --git a/vasl_templates/webapp/data/default-templates/ob_setup.j2 b/vasl_templates/webapp/data/default-templates/ob_setup.j2 index e9073a6..d83acf9 100644 --- a/vasl_templates/webapp/data/default-templates/ob_setup.j2 +++ b/vasl_templates/webapp/data/default-templates/ob_setup.j2 @@ -1 +1 @@ -[{{OB_SETUP}}] (col=[{{OB_SETUP_COLOR}}/{{OB_SETUP_COLOR_2}}]) +[{{OB_SETUP}}] (col=[{{OB_SETUP_COLOR}}/{{OB_SETUP_COLOR_2}}]){%if OB_SETUP_WIDTH%} (width=[{{OB_SETUP_WIDTH}}]){%endif%} diff --git a/vasl_templates/webapp/data/default-templates/scenario.j2 b/vasl_templates/webapp/data/default-templates/scenario.j2 index aefc950..9e81d82 100644 --- a/vasl_templates/webapp/data/default-templates/scenario.j2 +++ b/vasl_templates/webapp/data/default-templates/scenario.j2 @@ -1,3 +1,4 @@ name = [{{SCENARIO_NAME}}] loc = [{{SCENARIO_LOCATION}}] date = [{{SCENARIO_DATE}}]{%if SCENARIO_DATE%} aka "{{SCENARIO_DAY_OF_MONTH}} {{SCENARIO_MONTH_NAME}}, {{SCENARIO_YEAR}}"{%endif%} +{%if SCENARIO_WIDTH%}width = [{{SCENARIO_WIDTH}}]{%endif%} diff --git a/vasl_templates/webapp/data/default-templates/ssr.j2 b/vasl_templates/webapp/data/default-templates/ssr.j2 index 70397de..efa8e91 100644 --- a/vasl_templates/webapp/data/default-templates/ssr.j2 +++ b/vasl_templates/webapp/data/default-templates/ssr.j2 @@ -1,2 +1,2 @@ {% for ssr in SSR %}(*) [{{ssr}}] -{% endfor %} +{% endfor %}{%if SSR_WIDTH%}width = [{{SSR_WIDTH}}]{%endif%} diff --git a/vasl_templates/webapp/data/default-templates/victory_conditions.j2 b/vasl_templates/webapp/data/default-templates/victory_conditions.j2 index 03aa799..aa0f735 100644 --- a/vasl_templates/webapp/data/default-templates/victory_conditions.j2 +++ b/vasl_templates/webapp/data/default-templates/victory_conditions.j2 @@ -1 +1 @@ -VC: {{VICTORY_CONDITIONS}} +VC: [{{VICTORY_CONDITIONS}}]{%if VICTORY_CONDITIONS_WIDTH%} ; width=[{{VICTORY_CONDITIONS_WIDTH}}]{%endif%} diff --git a/vasl_templates/webapp/static/css/tabs-ob.css b/vasl_templates/webapp/static/css/tabs-ob.css index 54b4c95..e9c566c 100644 --- a/vasl_templates/webapp/static/css/tabs-ob.css +++ b/vasl_templates/webapp/static/css/tabs-ob.css @@ -8,12 +8,13 @@ .panel-obsetup .footer { -ms-grid-row: 2 ; -ms-grid-column: 1 ; } .panel-obsetup textarea { width: 100% ; height: 100% ; resize: none ; } -.panel-obsetup input[type="button"][data-id='mol'] { float: left ; } -.panel-obsetup input[type="button"][data-id='mol-p'] { float: left ; } -.panel-obsetup input[type="button"][data-id='pf'] { float: left ; } -.panel-obsetup input[type="button"][data-id='psk'] { float: left ; } -.panel-obsetup input[type="button"][data-id='atmm'] { float: left ; } -.panel-obsetup input[type="button"][data-id='baz'] { float: left ; } -.panel-obsetup input[type="button"][data-id='piat'] { float: left ; } -.panel-obsetup input[type="button"][data-id='ob_setup_1'] { float: right ; } -.panel-obsetup input[type="button"][data-id='ob_setup_2'] { float: right ; } +.panel-obsetup input[data-id='mol'] { float: left ; } +.panel-obsetup input[data-id='mol-p'] { float: left ; } +.panel-obsetup input[data-id='pf'] { float: left ; } +.panel-obsetup input[data-id='psk'] { float: left ; } +.panel-obsetup input[data-id='atmm'] { float: left ; } +.panel-obsetup input[data-id='baz'] { float: left ; } +.panel-obsetup input[data-id='piat'] { float: left ; } +.panel-obsetup input[data-id='ob_setup_1'] { float: right ; } +.panel-obsetup input[data-id='ob_setup_2'] { float: right ; } +.panel-obsetup div.r { float: right ; font-size: 75% ; } diff --git a/vasl_templates/webapp/static/css/tabs-scenario.css b/vasl_templates/webapp/static/css/tabs-scenario.css index 3cea13f..4b4bd8f 100644 --- a/vasl_templates/webapp/static/css/tabs-scenario.css +++ b/vasl_templates/webapp/static/css/tabs-scenario.css @@ -10,9 +10,10 @@ #panel-scenario div[data-labelfor="scenario_location"] { -ms-grid-row: 2 ; -ms-grid-column: 1 ; } #panel-scenario input[name="scenario_location"] { -ms-grid-row: 2 ; -ms-grid-column: 2 ; } #panel-scenario div[data-labelfor="scenario_date"] { -ms-grid-row: 3 ; -ms-grid-column: 1 ; } -#panel-scenario div.scenario_date { -ms-grid-row: 3 ; -ms-grid-column: 2 ; } +#panel-scenario div.last_row { -ms-grid-row: 3 ; -ms-grid-column: 2 ; } -#panel-scenario input[type="button"] { float: right ; } +#panel-scenario .last_row .r { display: block-inline ; float: right ; font-size: 75% ; } +#panel-scenario input[data-id="scenario"] { height: 2em ; } /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ @@ -53,7 +54,8 @@ #panel-vc .footer { -ms-grid-row: 2 ; -ms-grid-column: 1 ; } #panel-vc textarea { width: 100% ; height: 100% ; resize: none ; } -#panel-vc input[type="button"] { height: 1.5em ; float: right ; } +#panel-vc .footer { text-align: right ; font-size: 75% ; } +#panel-vc input[data-id="victory_conditions"] { height: 2em ; } /* -------------------------------------------------------------------- */ @@ -75,9 +77,9 @@ #panel-ssr #ssr-sortable li.highlighted { background: #48c8ff ; } #panel-ssr #ssr-sortable li:hover { cursor: pointer ; } -#panel-ssr input#add-ssr { float: left ; } -#panel-ssr #ssr-trash { margin-left: 5px ; float: left ; height: 1.5em ; } -#panel-ssr input[data-id="ssr"] { float: right ; } +#panel-ssr .footer { text-align: right ; font-size: 75% ; } +#panel-ssr .footer .l { float: left ; } +#panel-ssr #ssr-trash { margin-left: 5px ; height: 2em ; } #ssr-hint { width:100% ; height: calc(100% - 1.5em) ; font-size: 80% ; font-style: italic ; } #ssr-hint p { margin-bottom: 1em ; } diff --git a/vasl_templates/webapp/static/generate.js b/vasl_templates/webapp/static/generate.js index 3496f4d..61515ab 100644 --- a/vasl_templates/webapp/static/generate.js +++ b/vasl_templates/webapp/static/generate.js @@ -32,12 +32,14 @@ function generate_snippet( $btn ) params.OB_SETUP = params.OB_SETUP_1 ; params.OB_SETUP_COLOR = gNationalities[params.PLAYER_1].ob_colors[0] ; params.OB_SETUP_COLOR_2 = gNationalities[params.PLAYER_1].ob_colors[1] ; + params.OB_SETUP_WIDTH = params.OB_SETUP_WIDTH_1 ; } else if ( template_id === "ob_setup_2" ) { template_id = "ob_setup" ; params.OB_SETUP = params.OB_SETUP_2 ; params.OB_SETUP_COLOR = gNationalities[params.PLAYER_2].ob_colors[0] ; params.OB_SETUP_COLOR_2 = gNationalities[params.PLAYER_2].ob_colors[1] ; + params.OB_SETUP_WIDTH = params.OB_SETUP_WIDTH_2 ; } else if ( template_id === "ssr" ) { params.SSR = [] ; diff --git a/vasl_templates/webapp/templates/main.html b/vasl_templates/webapp/templates/main.html index c8c8f63..e99d2cf 100644 --- a/vasl_templates/webapp/templates/main.html +++ b/vasl_templates/webapp/templates/main.html @@ -28,9 +28,13 @@