diff --git a/vasl_templates/webapp/static/help/images/asa-search.png b/vasl_templates/webapp/static/help/images/asa-search.png new file mode 100644 index 0000000..ff5d4db Binary files /dev/null and b/vasl_templates/webapp/static/help/images/asa-search.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-search.small.png b/vasl_templates/webapp/static/help/images/asa-search.small.png new file mode 100644 index 0000000..81db7e2 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/asa-search.small.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-upload.png b/vasl_templates/webapp/static/help/images/asa-upload.png new file mode 100644 index 0000000..86a036c Binary files /dev/null and b/vasl_templates/webapp/static/help/images/asa-upload.png differ diff --git a/vasl_templates/webapp/static/help/images/asa-upload.small.png b/vasl_templates/webapp/static/help/images/asa-upload.small.png new file mode 100644 index 0000000..7ec6304 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/asa-upload.small.png differ diff --git a/vasl_templates/webapp/static/help/images/bullet.png b/vasl_templates/webapp/static/help/images/bullet.png new file mode 100644 index 0000000..bf794e2 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/bullet.png differ diff --git a/vasl_templates/webapp/static/help/images/bullet2.png b/vasl_templates/webapp/static/help/images/bullet2.png new file mode 100644 index 0000000..4590f3e Binary files /dev/null and b/vasl_templates/webapp/static/help/images/bullet2.png differ diff --git a/vasl_templates/webapp/static/help/images/bullet3.png b/vasl_templates/webapp/static/help/images/bullet3.png new file mode 100644 index 0000000..34d8c91 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/bullet3.png differ diff --git a/vasl_templates/webapp/static/help/images/edit-template.png b/vasl_templates/webapp/static/help/images/edit-template.png index a976cef..095403d 100644 Binary files a/vasl_templates/webapp/static/help/images/edit-template.png and b/vasl_templates/webapp/static/help/images/edit-template.png differ diff --git a/vasl_templates/webapp/static/help/images/edit-template.small.png b/vasl_templates/webapp/static/help/images/edit-template.small.png index d300a77..6c2661f 100644 Binary files a/vasl_templates/webapp/static/help/images/edit-template.small.png and b/vasl_templates/webapp/static/help/images/edit-template.small.png differ diff --git a/vasl_templates/webapp/static/help/images/hill-621.png b/vasl_templates/webapp/static/help/images/hill-621.png index 904ea77..82dd09c 100644 Binary files a/vasl_templates/webapp/static/help/images/hill-621.png and b/vasl_templates/webapp/static/help/images/hill-621.png differ diff --git a/vasl_templates/webapp/static/help/images/hill-621.small.png b/vasl_templates/webapp/static/help/images/hill-621.small.png index d70fc45..18c0afa 100644 Binary files a/vasl_templates/webapp/static/help/images/hill-621.small.png and b/vasl_templates/webapp/static/help/images/hill-621.small.png differ diff --git a/vasl_templates/webapp/static/help/images/lfa-files.png b/vasl_templates/webapp/static/help/images/lfa-files.png new file mode 100644 index 0000000..d8396ba Binary files /dev/null and b/vasl_templates/webapp/static/help/images/lfa-files.png differ diff --git a/vasl_templates/webapp/static/help/images/lfa-files.small.png b/vasl_templates/webapp/static/help/images/lfa-files.small.png new file mode 100644 index 0000000..5b004a6 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/lfa-files.small.png differ diff --git a/vasl_templates/webapp/static/help/images/lfa-hotness.png b/vasl_templates/webapp/static/help/images/lfa-hotness.png new file mode 100644 index 0000000..acedc42 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/lfa-hotness.png differ diff --git a/vasl_templates/webapp/static/help/images/lfa-hotness.small.png b/vasl_templates/webapp/static/help/images/lfa-hotness.small.png new file mode 100644 index 0000000..ebf682c Binary files /dev/null and b/vasl_templates/webapp/static/help/images/lfa-hotness.small.png differ diff --git a/vasl_templates/webapp/static/help/images/lfa.png b/vasl_templates/webapp/static/help/images/lfa.png new file mode 100644 index 0000000..c1f9e0d Binary files /dev/null and b/vasl_templates/webapp/static/help/images/lfa.png differ diff --git a/vasl_templates/webapp/static/help/images/lfa.small.png b/vasl_templates/webapp/static/help/images/lfa.small.png new file mode 100644 index 0000000..afd5b58 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/lfa.small.png differ diff --git a/vasl_templates/webapp/static/help/images/load-template-pack.png b/vasl_templates/webapp/static/help/images/load-template-pack.png index 10100f6..578fc0f 100644 Binary files a/vasl_templates/webapp/static/help/images/load-template-pack.png and b/vasl_templates/webapp/static/help/images/load-template-pack.png differ diff --git a/vasl_templates/webapp/static/help/images/load-template-pack.small.png b/vasl_templates/webapp/static/help/images/load-template-pack.small.png index a72e7ab..42d8d00 100644 Binary files a/vasl_templates/webapp/static/help/images/load-template-pack.small.png and b/vasl_templates/webapp/static/help/images/load-template-pack.small.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_setup.png b/vasl_templates/webapp/static/help/images/ob_setup.png index 8f46925..c315b23 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_setup.png and b/vasl_templates/webapp/static/help/images/ob_setup.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_setup.small.png b/vasl_templates/webapp/static/help/images/ob_setup.small.png index 6331b2b..6f151bc 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_setup.small.png and b/vasl_templates/webapp/static/help/images/ob_setup.small.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_vehicles.png b/vasl_templates/webapp/static/help/images/ob_vehicles.png index 441c437..e0e5b60 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_vehicles.png and b/vasl_templates/webapp/static/help/images/ob_vehicles.png differ diff --git a/vasl_templates/webapp/static/help/images/ob_vehicles.small.png b/vasl_templates/webapp/static/help/images/ob_vehicles.small.png index dc4925a..ae4deae 100644 Binary files a/vasl_templates/webapp/static/help/images/ob_vehicles.small.png and b/vasl_templates/webapp/static/help/images/ob_vehicles.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png index 37712f0..2c59e39 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png and b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png index 327323c..84358b2 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png and b/vasl_templates/webapp/static/help/images/quick-start/load-scenario.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png index 2ab48ca..9f2abf5 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png and b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png index c66b4ea..77940db 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png and b/vasl_templates/webapp/static/help/images/quick-start/update-scenario.small.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/user-settings.png b/vasl_templates/webapp/static/help/images/quick-start/user-settings.png index f718f77..19ec8ce 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/user-settings.png and b/vasl_templates/webapp/static/help/images/quick-start/user-settings.png differ diff --git a/vasl_templates/webapp/static/help/images/quick-start/user-settings.small.png b/vasl_templates/webapp/static/help/images/quick-start/user-settings.small.png index ff2eaa9..b82510d 100644 Binary files a/vasl_templates/webapp/static/help/images/quick-start/user-settings.small.png and b/vasl_templates/webapp/static/help/images/quick-start/user-settings.small.png differ diff --git a/vasl_templates/webapp/static/help/images/scenario-vasl.png b/vasl_templates/webapp/static/help/images/scenario-vasl.png index ac8555a..bff5e8a 100644 Binary files a/vasl_templates/webapp/static/help/images/scenario-vasl.png and b/vasl_templates/webapp/static/help/images/scenario-vasl.png differ diff --git a/vasl_templates/webapp/static/help/images/scenario-vasl.small.png b/vasl_templates/webapp/static/help/images/scenario-vasl.small.png index ef891ef..4b8b0be 100644 Binary files a/vasl_templates/webapp/static/help/images/scenario-vasl.small.png and b/vasl_templates/webapp/static/help/images/scenario-vasl.small.png differ diff --git a/vasl_templates/webapp/static/help/images/scenario.png b/vasl_templates/webapp/static/help/images/scenario.png deleted file mode 100644 index 5f8f693..0000000 Binary files a/vasl_templates/webapp/static/help/images/scenario.png and /dev/null differ diff --git a/vasl_templates/webapp/static/help/images/scenario.small.png b/vasl_templates/webapp/static/help/images/scenario.small.png deleted file mode 100644 index 154c34d..0000000 Binary files a/vasl_templates/webapp/static/help/images/scenario.small.png and /dev/null differ diff --git a/vasl_templates/webapp/static/help/images/smilies/cool.gif b/vasl_templates/webapp/static/help/images/smilies/cool.gif new file mode 100644 index 0000000..6dd1503 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/smilies/cool.gif differ diff --git a/vasl_templates/webapp/static/help/images/ssr.png b/vasl_templates/webapp/static/help/images/ssr.png index a5c59a6..484036b 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr.png and b/vasl_templates/webapp/static/help/images/ssr.png differ diff --git a/vasl_templates/webapp/static/help/images/ssr.small.png b/vasl_templates/webapp/static/help/images/ssr.small.png index aaeb1e5..da8efe7 100644 Binary files a/vasl_templates/webapp/static/help/images/ssr.small.png and b/vasl_templates/webapp/static/help/images/ssr.small.png differ diff --git a/vasl_templates/webapp/static/help/images/user-settings.png b/vasl_templates/webapp/static/help/images/user-settings.png new file mode 100644 index 0000000..ca1e7d7 Binary files /dev/null and b/vasl_templates/webapp/static/help/images/user-settings.png differ diff --git a/vasl_templates/webapp/static/help/images/user-settings.small.png b/vasl_templates/webapp/static/help/images/user-settings.small.png new file mode 100644 index 0000000..82be76a Binary files /dev/null and b/vasl_templates/webapp/static/help/images/user-settings.small.png differ diff --git a/vasl_templates/webapp/static/help/images/vc.png b/vasl_templates/webapp/static/help/images/vc.png index 85b8202..23a1465 100644 Binary files a/vasl_templates/webapp/static/help/images/vc.png and b/vasl_templates/webapp/static/help/images/vc.png differ diff --git a/vasl_templates/webapp/static/help/images/vc.small.png b/vasl_templates/webapp/static/help/images/vc.small.png index 7e8ca1e..d30cba0 100644 Binary files a/vasl_templates/webapp/static/help/images/vc.small.png and b/vasl_templates/webapp/static/help/images/vc.small.png differ diff --git a/vasl_templates/webapp/static/help/index.html b/vasl_templates/webapp/static/help/index.html index 4bd91cc..b54bf02 100644 --- a/vasl_templates/webapp/static/help/index.html +++ b/vasl_templates/webapp/static/help/index.html @@ -144,7 +144,9 @@ Configuring the program For the webdriver, download and unpack one of the following:

Setting up a scenario

@@ -152,11 +154,15 @@ For the webdriver, download and unpack one of the following:

We'll set up The Streets Of Stalingrad, and the scenario card tells us that this is played on Board 1, so fire up VASL, add this board, then save the scenario somewhere (e.g. streets-of-stalingrad.vsav).
+

-In vasl-templates, open the save file for this scenario (The Streets Of Stalingrad (Scenario C).json; you'll find it in the examples/ directory). -

Browse through the tabs, and you'll see all the scenario details e.g. Victory Conditions, SSR's, setup instructions. The program also shows the latest results from ROAR. +In VASL Templates, open the save file for this scenario (The Streets Of Stalingrad (Scenario C).json; you'll find it in the examples/ directory). +

Browse through the tabs, and you'll see all the scenario details e.g. Victory Conditions, SSR's, setup instructions. +

Click on the info icon in the top-right corner of the Scenario panel to get more detailed information about the scenario. +

This information is provided by the ASL Scenario Archive.

+

We now want to create labels in the VASL scenario for all this information. Choose Update VASL scenario from the menu, and select the VASL scenario file you created earlier (e.g. streets-of-stalingrad.vsav). The program will now launch VASSAL to do the work, so be patient since it may take a minute or two, and you may see VASSAL momentarily appear on-screen. @@ -167,12 +173,12 @@ In particular, note the data tables for the vehicles, which contain useful infor

Including pictures in the labels

-We can pretty-up the labels by including pictures in them. Open the User Settings dialog and turn on Images in scenarios. +We can pretty-up the labels by including pictures in them. Open the User Settings dialog and turn on the Images in scenarios settings.

Update the VASL scenario again (as above), open it again in VASSAL, and you will see that the labels now include nationality flags, and the vehicle data tables show the counter images:
-

Because images can't be stored inside a VASL scenario file, if you turn this option on, you must choose where VASSAL will get the images from: +
Because images can't be stored inside a VASL scenario file, if you turn these options on, you must choose where VASSAL will get the images from:
@@ -191,14 +197,16 @@ We can pretty-up the labels by including pictures in them. Open the User Set

Adding the scenario details

-

-First, we enter the basic details about the scenario. -

Click on one of the Snippet buttons, and the program will generate an HTML snippet and put it into your clipboard, which you can then copy into a VASL label. -

You can also click on the Search ROAR button, to look for a scenario in ROAR. The basic details for the scenario will be loaded, along with the latest results. +

+We start by entering the basic scenario details, such as its name, location and date. The easiest way to do this is to search the ASL Scenario Archive. +

Click on the search button, enter the name of the scenario, and once you've found the correct one, click on Import to transfer the details into VASL Templates. +

If the Downloads button is enabled, this means that somebody has contributed the entire scenario setup and/or VASL save file, and these are available for download. +

The scenario card may list special rules and errata, and have screenshots of the map setup, all of which will help you set up your scenario correctly.

-To create a label in VASL, open the Draggable Overlays window, and drag a label onto the main window. +Once the scenario details are in, click on one of the Snippet buttons, and the program will generate an HTML snippet and put it into your clipboard, which you can then copy into a VASL label. +

To create a label in VASL, open the Draggable Overlays window, and drag a label onto the main window.

Labels come in two parts, which are accessible via the right-click menu, or press Ctrl-L and Ctrl-2 to access each one. I always just use the first line, so I delete everything in line 2.

The thick black box indicates that the label is selected. If you click elsewhere on the main window, it goes away, and the label will remain in place even if you click on it, or try to drag it. To select it again, Shift-click somewhere in the box, and you will be able to move it around, or edit it. This can sometimes be difficult to find, since it's not visible on-screen, but it will be in the middle (vertically and horizontally) of the label.
@@ -207,6 +215,8 @@ To create a label in VASL, open the Draggable Overlays window, and drag Once you have a label in VASL, copy the HTML snippet generated above into it.

Repeat the process to add the ELR and SAN for both players, and you will now have two labels that you can position in the VASL scenario. +

+

Automatically adding labels to the VASL scenario

Once you've got the hang of adding labels to your VASL scenario, you can get VASL Templates to do it automatically for you. After entering all the scenario details, choose Update VASL scenario from the menu, select the .vsav file you want to update, and all the labels will be inserted into the scenario (or updated, if they're already there).

VASSAL will be run to update the scenario, so you may see it temporarily appear on-screen. The process can be a little slow, and may take several minutes to complete.
@@ -253,7 +263,7 @@ Finally, if special support weapons such as PF and BAZ are in play, snippets are

Analyzing a VASL scenario

-

If you have already set up the VASL scenario, you can choose "Analyze VASL scenario" from the menu, and the program will scan the .vsav file for vehicles and ordnance, and automatically create entries for each one. Only counters from the two configured nationalities will be imported, so make sure you set these first. +

If you have already set up the VASL scenario, you can choose Analyze VASL scenario from the menu, and the program will scan the .vsav file for vehicles and ordnance, and automatically create entries for each one. Only counters from the two configured nationalities will be imported, so make sure you set these first.

Extra templates

@@ -279,31 +289,64 @@ or a width and/or height parameter to explicitly set the image
VASSAL caches images (which can't be turned off), so if you're making changes that don't seem to be having any effect, try restarting VASSAL.
-
-

Suggested workflow

-

-

@@ -481,8 +524,6 @@ pytest --webdriver chrome --headless

Note that since pylint is run as part of these tests, this should be done from the root directory of the repo. -

Internet Explorer is also supported as a WebDriver, but due to differences in the way it works, some tests are currently failing for this.
-

Compiling the VASSAL shim

The program uses VASSAL to update VASL scenarios (.vsav files), and since this is written in Java, a helper program has been written in Java to do this. diff --git a/vasl_templates/webapp/static/help/main.css b/vasl_templates/webapp/static/help/main.css index 94d5713..37cf122 100644 --- a/vasl_templates/webapp/static/help/main.css +++ b/vasl_templates/webapp/static/help/main.css @@ -54,3 +54,8 @@ div.warning { background: url(images/warning.gif) 2px 2px no-repeat ; font-size: 80% ; font-style: italic ; } + +ul { list-style-image: url("images/bullet.png") ; } +ul ul { list-style-image: url("images/bullet2.png") ; } +ul ul ul { list-style-image: url("images/bullet3.png") ; } +li .note { font-size: 80% ; font-style: italic ; } diff --git a/vasl_templates/webapp/templates/user-settings-dialog.html b/vasl_templates/webapp/templates/user-settings-dialog.html index 7d8c775..c046f05 100644 --- a/vasl_templates/webapp/templates/user-settings-dialog.html +++ b/vasl_templates/webapp/templates/user-settings-dialog.html @@ -1,7 +1,7 @@