From 85b625d54e8fd76dcaaa23c926e1e5eca523bfd4 Mon Sep 17 00:00:00 2001 From: Pacman Ghost Date: Sun, 23 Oct 2022 00:36:03 +1100 Subject: [PATCH] Updated links to point to pacman-ghost.com. --- README.md | 8 +++----- setup.py | 2 +- vasl_templates/webapp/static/help/index.html | 8 ++++---- vasl_templates/webapp/static/help/main.js | 6 +++--- vasl_templates/webapp/static/main.js | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 24d866a..7d673ac 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,14 @@ # VASL Templates - - - +[](vasl_templates/webapp/static/help/images/hill-621.png) *VASL Templates* makes it easy to set up attractive VASL scenarios, with loads of useful information embedded to assist with game play. Simply enter the scenario information into the UI, and the program will generate HTML snippets that you can transfer into VASL labels in your scenario. - +[](vasl_templates/webapp/static/help/images/ob_setup.png) -You can find more examples of the program in action [here](https://github.com/pacman-ghost/vasl-templates/tree/master/examples/). +You can find more examples of the program in action [here](examples/). ### Documentation diff --git a/setup.py b/setup.py index 7a0f163..a45a50d 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( version = "1.10", # nb: also update constants.py description = "Create HTML snippets for use in VASL.", license = "AGPLv3", - url = "https://github.com/pacman-ghost/vasl-templates", + url = "https://code.pacman-ghost.com/public/vasl-templates", packages = find_packages(), install_requires = parse_requirements( "requirements.txt" ), extras_require = { diff --git a/vasl_templates/webapp/static/help/index.html b/vasl_templates/webapp/static/help/index.html index 7c7a1cb..8e3b4b8 100644 --- a/vasl_templates/webapp/static/help/index.html +++ b/vasl_templates/webapp/static/help/index.html @@ -42,7 +42,7 @@

Running on Windows

-

If you're using Windows, you should get the pre-built version from Github, unpack it somewhere, then run vasl-templates.exe. Note that it can be a bit slow to start, so please give it a few seconds. +

If you're using Windows, you should get the pre-built version from here, unpack it somewhere, then run vasl-templates.exe. Note that it can be a bit slow to start, so please give it a few seconds.

If the program won't start because a DLL is missing from your computer, install the VC2015 runtime (get the 32-bit version, vc_redist.x86.exe, even if you are running 64-bit Windows).

If you don't see anything in the main window, check the notes below about configuring OpenGL. @@ -71,7 +71,7 @@ If you have Docker installed, the webapp can be run in a container e.g.

Running from source

-

You can also run the program directly from the source code. Get a copy from Github in the usual way, by git clone'ing it, or downloading a ZIP and unpacking it somewhere. +

You can also run the program directly from the source code. Get a copy from here in the usual way, by git clone'ing it, or downloading a ZIP and unpacking it somewhere.

The web server was written and tested using Python 3.10.4, but it doesn't do anything particularly funky, so any recent version of Python should work. @@ -202,7 +202,7 @@ In particular, note the data tables for the vehicles, which contain useful infor VASL Templates makes it easy to set up attractive VASL scenarios, with loads of useful information embedded to assist with game play.

We'll show how by walking through a setup of everyone's favorite scenario, Hill 621. Click on the screenshot to the right to see the finished scenario. -

You can find more examples here, with files that you can load into the program, together with the generated VASL scenarios.
+
You can find more examples here, with files that you can load into the program, together with the generated VASL scenarios.

Adding the scenario details

@@ -383,7 +383,7 @@ If you have set up the Chapter H v

Setting up the Chapter H data files

-

Unpack this ZIP file somewhere, and configure the location in the Server Settings dialog (or the CHAPTER_H_NOTES_DIR setting in site.cfg, if you are running from source). +

Unpack this ZIP file somewhere, and configure the location in the Server Settings dialog (or the CHAPTER_H_NOTES_DIR setting in site.cfg, if you are running from source).

The ZIP file contains placeholder files for the Chapter H vehicle/ordnance notes and multi-applicable notes, so all you have to do is update these files with the real content. diff --git a/vasl_templates/webapp/static/help/main.js b/vasl_templates/webapp/static/help/main.js index da0e099..59725db 100644 --- a/vasl_templates/webapp/static/help/main.js +++ b/vasl_templates/webapp/static/help/main.js @@ -20,7 +20,7 @@ $(document).ready( function() { $( "a" ).each( function() { $(this).click( function(evt) { var url = $(this).attr( "href" ) ; - if ( url[0] !== "#" && url.substring(0,16) !== "http://localhost" && url.substring(0,16) !== "http://127.0.0.1" ) { + if ( url[0] !== "#" && url.substring(0,16) !== "http://localhost" && url.substring(0,16) !== "http://127.0.0.1" && url.indexOf( "code.pacman-ghost.com" ) === -1 ) { window.open( url ) ; evt.preventDefault() ; return false ; @@ -44,8 +44,8 @@ $(document).ready( function() { } ) ; // load the license - var is_github = ( window.parent.location.hostname === "github.com" || window.parent.location.hostname === "rawgit.com" ) ; - if ( window.parent.location.protocol !== "file:" && !is_github ) { + var is_online = ( window.parent.location.hostname === "code.pacman-ghost.com" ) ; + if ( window.parent.location.protocol !== "file:" && !is_online ) { var url = window.parent.location.protocol + "//" + window.parent.location.hostname ; if ( window.parent.location.port ) url += ":" + window.parent.location.port ; diff --git a/vasl_templates/webapp/static/main.js b/vasl_templates/webapp/static/main.js index bb9ddd4..91df2b1 100644 --- a/vasl_templates/webapp/static/main.js +++ b/vasl_templates/webapp/static/main.js @@ -1375,7 +1375,7 @@ function show_help() var $iframe = $("#tabs-help iframe") ; if ( ! $iframe.attr( "src" ) ) { // yup - make it so - // NOTE: We show the help in an iframe so that we can use the same files elsewhere e.g. on the web site or Github. + // NOTE: We show the help in an iframe so that we can use the same files elsewhere e.g. on the web site or Github/code.pacman-ghost.com. var url = gHelpUrl + "?version=" + gAppVersion + "&embedded=1&tab=userguide" ; if ( getUrlParam( "pyqt" ) ) url += "&pyqt=1" ;