diff --git a/vasl_templates/webapp/templates/tabs.html b/vasl_templates/webapp/templates/tabs.html
index b84115e..9b2723e 100644
--- a/vasl_templates/webapp/templates/tabs.html
+++ b/vasl_templates/webapp/templates/tabs.html
@@ -1,18 +1,22 @@
+
}})
}})
}})
+
}})
{%include "tabs-scenario.html"%}
{%include "tabs-ob1.html"%}
{%include "tabs-ob2.html"%}
+{%include "tabs-extras.html"%}
{%include "tabs-help.html"%}
diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/extras/full.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/extras/full.j2
new file mode 100644
index 0000000..8bb3bad
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/extras/full.j2
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+{{FOO}}
+
+
+param = {{PARAM:default-val/10|The parameter|This is the parameter description.}}
+
+
+
diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/extras/minimal.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/extras/minimal.j2
new file mode 100644
index 0000000..324526a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/extras/minimal.j2
@@ -0,0 +1,7 @@
+
+
+
+param = {{PARAM:}}
+
+
+
diff --git a/vasl_templates/webapp/tests/fixtures/template-packs/extras/extras/full.j2 b/vasl_templates/webapp/tests/fixtures/template-packs/extras/extras/full.j2
new file mode 100644
index 0000000..bf90c5b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/template-packs/extras/extras/full.j2
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+{{FOO}}
+
+
+modified-param = {{MODIFIED-PARAM:modified-default-val/10|The modified parameter|This is the modified parameter description.}}
+new-param = {{NEW-PARAM:}}
+
+
+
diff --git a/vasl_templates/webapp/tests/fixtures/template-packs/extras/extras/subdir/new.j2 b/vasl_templates/webapp/tests/fixtures/template-packs/extras/extras/subdir/new.j2
new file mode 100644
index 0000000..0e2726a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/template-packs/extras/extras/subdir/new.j2
@@ -0,0 +1,9 @@
+
+
+
+
+
+new-param = {{NEW-PARAM:}}
+
+
+
diff --git a/vasl_templates/webapp/tests/test_extras_templates.py b/vasl_templates/webapp/tests/test_extras_templates.py
new file mode 100644
index 0000000..2af8eab
--- /dev/null
+++ b/vasl_templates/webapp/tests/test_extras_templates.py
@@ -0,0 +1,182 @@
+""" Test the extras templates. """
+
+from selenium.webdriver.common.keys import Keys
+
+from vasl_templates.webapp.tests.utils import \
+ init_webapp, find_child, find_children, wait_for, wait_for_clipboard, select_tab
+from vasl_templates.webapp.tests.test_template_packs import make_zip_from_files, upload_template_pack_zip
+
+# ---------------------------------------------------------------------
+
+def test_extras_templates( webapp, webdriver ):
+ """Test the extras templates."""
+
+ # initialize
+ init_webapp( webapp, webdriver )
+ select_tab( "extras" )
+
+ # check that the extras templates were loaded correctly
+ assert _get_extras_template_index() == [
+ ( "extras/minimal", None ),
+ ( "Full template", "This is the caption." )
+ ]
+
+ # check that the "full" template was loaded correctly
+ _select_extras_template( webdriver, "extras/full" )
+ content = find_child( "#tabs-extras .right-panel" )
+ assert find_child( "div.name", content ).text == "Full template"
+ assert find_child( "div.caption", content ).text == "This is the caption."
+ assert find_child( "div.description", content ).text == "This is the description."
+ params = find_children( "tr", content )
+ assert len(params) == 1
+ assert find_child( "td.caption", params[0] ).text == "The parameter:"
+ textbox = find_child( "td.value input", params[0] )
+ assert textbox.get_attribute( "value" ) == "default-val"
+ assert textbox.get_attribute( "size" ) == "10"
+ assert textbox.get_attribute( "title" ) == "This is the parameter description."
+
+ # generate the snippet
+ snippet_btn = find_child( "button.generate", content )
+ snippet_btn.click()
+ clipboard = wait_for_clipboard( 2, "param = default-val", contains=True )
+ assert "vasl-templates:comment" not in clipboard # nb: check that the comment was removed
+
+ # check that the "minimal" template was loaded correctly
+ _select_extras_template( webdriver, "extras/minimal" )
+ assert find_child( "div.name", content ).text == "extras/minimal"
+ assert find_child( "div.caption", content ) is None
+ assert find_child( "div.description", content ) is None
+ params = find_children( "tr", content )
+ assert len(params) == 1
+ assert find_child( "td.caption", params[0] ).text == "PARAM:"
+ textbox = find_child( "td.value input", params[0] )
+ assert textbox.get_attribute( "value" ) == ""
+
+ # generate the snippet
+ textbox.send_keys( "boo!" )
+ snippet_btn = find_child( "button.generate", content )
+ snippet_btn.click()
+ clipboard = wait_for_clipboard( 2, "param = boo!", contains=True )
+
+# ---------------------------------------------------------------------
+
+def test_template_pack( webapp, webdriver ):
+ """Test uploading a template pack that contains extras templates."""
+
+ # initialize
+ init_webapp( webapp, webdriver, template_pack_persistence=1 )
+ select_tab( "extras" )
+
+ # check that the extras templates were loaded correctly
+ assert _get_extras_template_index() == [
+ ( "extras/minimal", None ),
+ ( "Full template", "This is the caption." )
+ ]
+
+ # upload the template pack
+ zip_data = make_zip_from_files( "extras" )
+ upload_template_pack_zip( zip_data, False )
+
+ # check that the templates were updated correctly
+ assert _get_extras_template_index() == [
+ ( "extras/minimal", None ),
+ ( "Full template (modified)", "This is the caption (modified)." ),
+ ( "New template", None ),
+ ]
+
+ # check that the modified "full" template is being used
+ _select_extras_template( webdriver, "extras/full" )
+ content = find_child( "#tabs-extras .right-panel" )
+ assert find_child( "div.name", content ).text == "Full template (modified)"
+ assert find_child( "div.caption", content ).text == "This is the caption (modified)."
+ params = find_children( "tr", content )
+ assert len(params) == 2
+ assert find_child( "td.caption", params[0] ).text == "The modified parameter:"
+ textbox = find_child( "td.value input", params[0] )
+ assert textbox.get_attribute( "value" ) == "modified-default-val"
+ assert textbox.get_attribute( "size" ) == "10"
+ assert textbox.get_attribute( "title" ) == "This is the modified parameter description."
+ assert find_child( "td.caption", params[1] ).text == "NEW-PARAM:"
+ textbox = find_child( "td.value input", params[1] )
+
+# ---------------------------------------------------------------------
+
+def test_edit_extras_template( webapp, webdriver ):
+ """Test editing an extras templates."""
+
+ # initialize
+ init_webapp( webapp, webdriver )
+ select_tab( "extras" )
+
+ # edit the "minimal" template
+ _select_extras_template( webdriver, "extras/minimal" )
+ content = find_child( "#tabs-extras .right-panel" )
+ assert find_child( "div.caption", content ) is None
+ webdriver.execute_script( "edit_template('extras/minimal')", content )
+ textarea = find_child( "#edit-template textarea" )
+ template = textarea.get_attribute( "value" ) \
+ .replace( "", "\n" ) \
+ .replace( "
", "
\nadded = {{ADDED:added-val}}" )
+ textarea.clear()
+ textarea.send_keys( template )
+ textarea.send_keys( Keys.ESCAPE )
+
+ # generate the template (we should still be using the old template)
+ snippet_btn = find_child( "button.generate", content )
+ snippet_btn.click()
+ wait_for_clipboard( 2, "param = ", contains=True )
+
+ # switch to another template, then back again
+ _select_extras_template( webdriver, "extras/full" )
+ _select_extras_template( webdriver, "extras/minimal" )
+
+ # make sure the new template was loaded
+ assert find_child( "div.caption", content ).text == "Modified minimal."
+ params = find_children( "tr", content )
+ assert len(params) == 2
+ assert find_child( "td.caption", params[0] ).text == "ADDED:"
+ textbox = find_child( "td.value input", params[0] )
+ assert textbox.get_attribute( "value" ) == "added-val"
+
+ # generate the template (we should be using the new template)
+ snippet_btn = find_child( "button.generate", content )
+ snippet_btn.click()
+ wait_for_clipboard( 2, "added = added-val\nparam = ", contains=True )
+
+# ---------------------------------------------------------------------
+
+def _get_extras_template_index():
+ """Get the list of extras templates from the sidebar."""
+ def get_child_text( child_class, elem ): #pylint: disable=missing-docstring
+ elem = find_child( child_class, elem )
+ return elem.text if elem else None
+ return [
+ ( get_child_text(".name",elem), get_child_text(".caption",elem) )
+ for elem in _get_extras_templates()
+ ]
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+def _get_extras_templates():
+ """Get the available extras templates."""
+ return find_children( "#tabs-extras .left-panel li" )
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+def _select_extras_template( webdriver, template_id ):
+ """Select the specified extras template."""
+
+ # find the specified template in the index
+ elems = [
+ e for e in _get_extras_templates()
+ if webdriver.execute_script( "return $(arguments[0]).data('template_id')", e ) == template_id
+ ]
+ assert len(elems) == 1
+ template_name = find_child( ".name", elems[0] ).text
+
+ # select the template and wait for it to load
+ elems[0].click()
+ def is_template_loaded(): #pylint: disable=missing-docstring
+ elem = find_child( "#tabs-extras .right-panel .name" )
+ return elem and elem.text == template_name
+ wait_for( 2, is_template_loaded )
diff --git a/vasl_templates/webapp/tests/test_template_packs.py b/vasl_templates/webapp/tests/test_template_packs.py
index 2780bef..f69e05e 100644
--- a/vasl_templates/webapp/tests/test_template_packs.py
+++ b/vasl_templates/webapp/tests/test_template_packs.py
@@ -48,22 +48,22 @@ def test_zip_files( webapp, webdriver ):
init_webapp( webapp, webdriver, template_pack_persistence=1 )
# upload a template pack that contains a full set of templates
- zip_data = _make_zip_from_files( "full" )
- _, marker = _upload_template_pack_zip( zip_data, False )
+ zip_data = make_zip_from_files( "full" )
+ _, marker = upload_template_pack_zip( zip_data, False )
assert get_stored_msg( "_last-error_" ) == marker
# check that the uploaded templates are being used
_check_snippets( lambda tid: "Customized {}.".format( tid.upper() ) )
# upload only part of template pack
- _ = _upload_template_pack_zip(
+ _ = upload_template_pack_zip(
zip_data[ : int(len(zip_data)/2) ],
True
)
assert get_stored_msg( "_last-error_" ).startswith( "Can't unpack the ZIP:" )
# try uploading an empty template pack
- _ = _upload_template_pack_zip( b"", True )
+ _ = upload_template_pack_zip( b"", True )
assert get_stored_msg( "_last-error_" ).startswith( "Can't unpack the ZIP:" )
# NOTE: We can't test the limit on template pack size, since it happens after the browser's
@@ -107,8 +107,8 @@ def test_nationality_data( webapp, webdriver ):
assert droplist_vals["british"] == "British"
# upload a template pack that contains nationality data
- zip_data = _make_zip_from_files( "with-nationality-data" )
- _, marker = _upload_template_pack_zip( zip_data, False )
+ zip_data = make_zip_from_files( "with-nationality-data" )
+ _, marker = upload_template_pack_zip( zip_data, False )
assert get_stored_msg( "_last-error_" ) == marker
# check that the UI was updated correctly
@@ -136,10 +136,11 @@ def _make_zip( files ):
zip_file.writestr( fname, fdata )
return open( temp_file.name, "rb" ).read()
-def _make_zip_from_files( dname ):
+def make_zip_from_files( dname ):
"""Generate a ZIP file from files in a directory."""
files = {}
dname = os.path.join( os.path.split(__file__)[0], "fixtures/template-packs/"+dname )
+ assert os.path.isdir( dname )
for root,_,fnames in os.walk(dname):
for fname in fnames:
fname = os.path.join( root, fname )
@@ -186,7 +187,7 @@ def _generate_snippet( template_id, orig_template_id ):
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-def _upload_template_pack_zip( zip_data, error_expected ):
+def upload_template_pack_zip( zip_data, error_expected ):
"""Upload a template pack ZIP."""
return _do_upload_template_pack(
"{} | {}".format(
![](" + gImagesBaseUrl + "/snippet.png)
" )
- ) ;
- $newElem.controlgroup() ;
- $newElem.children("select").each( function() {
- $(this).selectmenu( {
- classes: {
- "ui-selectmenu-button": "ui-button-icon-only",
- "ui-selectmenu-menu": "snippet-control-menu-item",
- },
- } ) ;
- } ) ;
- $newElem.children(".ui-button-icon-only").css( "width", "1em" ) ;
- $newElem.children(".ui-selectmenu-button").click( function() { $(this).blur() ; } ) ;
- $(this).replaceWith( $newElem ) ;
- } ) ;
-
- // handle requests to generate/edit HTML snippets
- $("button.generate").click( function() {
- generate_snippet( $(this), null ) ;
- } ).attr( "title", "Generate a snippet." ) ;
- $("div.snippet-control select").on( "selectmenuselect", function() {
- edit_template( $(this).attr("data-id") ) ;
- } ) ;
+ $("button.generate").each( function() { init_snippet_button( $(this) ) ; } ) ;
// handle requests to edit the templates
$("button.edit-template").click( function() {
@@ -399,6 +357,59 @@ $(document).ready( function () {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+function init_snippet_button( $btn )
+{
+ // figure out what template we're dealing with
+ var template_id = $btn.attr( "data-id" ) ;
+ var template_id2 ;
+ if ( template_id.substring(0,9) === "ob_setup_" )
+ template_id2 = "ob_setup" ;
+ else if ( template_id.substring(0,12) == "ob_vehicles_" )
+ template_id2 = "ob_vehicles" ;
+ else if ( template_id.substring(0,12) == "ob_ordnance_" )
+ template_id2 = "ob_ordnance" ;
+ else
+ template_id2 = template_id ;
+
+ // create the new button
+ var buf = [ "![](" + gImagesBaseUrl + "/extras.png)
Extras"
+ ) ;
$("#tabs").tabs({ disabled: [] }) ;
$("#loader").fadeOut( 500 ) ;
adjust_footer_vspacers() ;
@@ -447,7 +461,8 @@ function init_hotkeys()
var curr_tab = $("#tabs .ui-tabs-active a").attr( "href" ) ;
if ( curr_tab !== tab )
$("#tabs .ui-tabs-nav a[href='"+tab+"']").trigger( "click" ) ;
- $ctrl.focus() ;
+ if ( $ctrl )
+ $ctrl.focus() ;
}
$(document).bind( "keydown", "alt+c", function() {
set_focus_to( "#tabs-scenario", $("input[name='SCENARIO_NAME']") ) ;
@@ -467,6 +482,9 @@ function init_hotkeys()
$(document).bind( "keydown", "alt+2", function() {
set_focus_to( "#tabs-ob2", $("textarea[name='OB_SETUP_2']") ) ;
} ) ;
+ $(document).bind( "keydown", "alt+x", function() {
+ set_focus_to( "#tabs-extras" ) ;
+ } ) ;
}
// --------------------------------------------------------------------
@@ -475,6 +493,7 @@ function install_template_pack( data )
{
// install the template pack
gTemplatePack = data ;
+ init_extras() ;
// update the player droplists
var curSel = {
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index 27cbe38..c01526a 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -27,10 +27,6 @@ function generate_snippet( $btn, extra_params )
var params = unload_snippet_params( true, template_id ) ;
// set player-specific parameters
- function make_player_flag_url( player_no ) {
- var player_nat = get_player_nat( player_no ) ;
- return APP_URL_BASE + "/flags/" + player_nat ;
- }
var curr_tab = $("#tabs .ui-tabs-active a").attr( "href" ) ;
var colors ;
if ( curr_tab === "#tabs-ob1" ) {
@@ -39,14 +35,14 @@ function generate_snippet( $btn, extra_params )
params.OB_COLOR = colors[0] ;
params.OB_COLOR_2 = colors[2] ;
if ( gUserSettings["include-flags-in-snippets"] )
- params.PLAYER_FLAG = make_player_flag_url( 1 ) ;
+ params.PLAYER_FLAG = make_player_flag_url( get_player_nat( 1 ) ) ;
} else if ( curr_tab === "#tabs-ob2" ) {
params.PLAYER_NAME = get_nationality_display_name( params.PLAYER_2 ) ;
colors = get_player_colors( 2 ) ;
params.OB_COLOR = colors[0] ;
params.OB_COLOR_2 = colors[2] ;
if ( gUserSettings["include-flags-in-snippets"] )
- params.PLAYER_FLAG = make_player_flag_url( 2 ) ;
+ params.PLAYER_FLAG = make_player_flag_url( get_player_nat( 2 ) ) ;
}
// set player-specific parameters
@@ -73,6 +69,17 @@ function generate_snippet( $btn, extra_params )
params.PLAYER_1_NAME = get_nationality_display_name( params.PLAYER_1 ) ;
params.PLAYER_2_NAME = get_nationality_display_name( params.PLAYER_2 ) ;
+ // pass through all the player colors and names
+ params.PLAYER_NAMES = {} ;
+ params.PLAYER_COLORS = {} ;
+ params.PLAYER_FLAGS = {} ;
+ $.each( gTemplatePack.nationalities, function( nat ) {
+ params.PLAYER_NAMES[nat] = gTemplatePack.nationalities[nat].display_name ;
+ params.PLAYER_COLORS[nat] = gTemplatePack.nationalities[nat].ob_colors ;
+ if ( gUserSettings["include-flags-in-snippets"] )
+ params.PLAYER_FLAGS[nat] = make_player_flag_url( nat ) ;
+ } ) ;
+
// generate PF parameters
if ( params.SCENARIO_YEAR < 1944 || (params.SCENARIO_YEAR == 1944 && params.SCENARIO_MONTH < 6) )
params.PF_RANGE = 1 ;
@@ -140,7 +147,7 @@ function generate_snippet( $btn, extra_params )
showWarningMsg( "Both players have the same nationality!" ) ;
// get the template to generate the snippet from
- var templ = get_template( template_id ) ;
+ var templ = get_template( template_id, true ) ;
if ( templ === null )
return ;
var func ;
@@ -184,7 +191,7 @@ function generate_snippet( $btn, extra_params )
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-function unload_snippet_params( unpack_scenario_date, show_warnings_for )
+function unload_snippet_params( unpack_scenario_date, template_id )
{
var params = {} ;
@@ -208,7 +215,14 @@ function unload_snippet_params( unpack_scenario_date, show_warnings_for )
// collect all the template parameters
add_param = function($elem) { params[ $elem.attr("name") ] = $elem.val() ; } ;
- $("input[type='text'].param").each( function() { add_param($(this)) ; } ) ;
+ $("input[type='text'].param").each( function() {
+ // NOTE: We only unload parameters on the EXTRAS tab if we're processing an extras template.
+ if ( $.contains( $("#tabs-extras")[0], $(this)[0] ) ) {
+ if ( template_id === null || template_id.substr(0,7) !== "extras/" )
+ return ;
+ }
+ add_param( $(this) ) ;
+ } ) ;
$("textarea.param").each( function() { add_param($(this)) ; } ) ;
$("select.param").each( function() { add_param($(this)) ; } ) ;
@@ -274,10 +288,10 @@ function unload_snippet_params( unpack_scenario_date, show_warnings_for )
if ( objs.length > 0 )
params[key] = objs ;
}
- get_vo( "vehicles", 1, "OB_VEHICLES_1", show_warnings_for === "ob_vehicles_1" ) ;
- get_vo( "vehicles", 2, "OB_VEHICLES_2", show_warnings_for === "ob_vehicles_2" ) ;
- get_vo( "ordnance", 1, "OB_ORDNANCE_1", show_warnings_for === "ob_ordnance_1" ) ;
- get_vo( "ordnance", 2, "OB_ORDNANCE_2", show_warnings_for === "ob_ordnance_2" ) ;
+ get_vo( "vehicles", 1, "OB_VEHICLES_1", template_id === "ob_vehicles_1" ) ;
+ get_vo( "vehicles", 2, "OB_VEHICLES_2", template_id === "ob_vehicles_2" ) ;
+ get_vo( "ordnance", 1, "OB_ORDNANCE_1", template_id === "ob_ordnance_1" ) ;
+ get_vo( "ordnance", 2, "OB_ORDNANCE_2", template_id === "ob_ordnance_2" ) ;
return params ;
}
@@ -570,11 +584,17 @@ function make_crew_survival( vo_entry )
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-function get_template( template_id )
+function get_template( template_id, fixup )
{
// get the specified template
- if ( template_id in gTemplatePack.templates )
- return gTemplatePack.templates[template_id] ;
+ if ( template_id in gTemplatePack.templates ) {
+ var template = gTemplatePack.templates[ template_id ] ;
+ if ( fixup ) {
+ if ( template_id.substr(0,7) === "extras/" )
+ template = fixup_template_parameters( template ) ;
+ }
+ return template ;
+ }
showErrorMsg( "Unknown template: " + escapeHTML(template_id) + "" ) ;
return null ;
}
@@ -588,7 +608,7 @@ function edit_template( template_id )
template_id = "ob_ordnance" ;
else if ( template_id.substring(0,12) == "ob_vehicles_" )
template_id = "ob_vehicles" ;
- var template = get_template( template_id ) ;
+ var template = get_template( template_id, false ) ;
if ( template === null )
return ;
@@ -967,7 +987,10 @@ function do_on_new_scenario( verbose ) {
function reset_scenario()
{
// reset all the template parameters
- $("input[type='text'].param").each( function() { $(this).val("") ; } ) ;
+ $("input[type='text'].param").each( function() {
+ if ( ! $.contains( $("#tabs-extras")[0], $(this)[0] ) )
+ $(this).val( "" ) ;
+ } ) ;
$("textarea.param").each( function() { $(this).val("") ; } ) ;
// reset all the template parameters
@@ -1047,10 +1070,17 @@ function do_load_template_pack( fname, data )
var invalid_filename_extns = [] ;
var unknown_template_ids = [] ;
var template_pack = {
- nationalities: $.extend( true, {}, gDefaultNationalities ),
+ nationalities: $.extend( true, {}, gDefaultTemplatePack.nationalities ),
templates: {},
} ;
+ // NOTE: We always start with the default extras templates; user-defined template packs
+ // can add to them, or modify existing ones, but not remove them.
+ for ( var template_id in gDefaultTemplatePack.templates ) {
+ if ( template_id.substr( 0, 7 ) === "extras/" )
+ template_pack.templates[template_id] = gDefaultTemplatePack.templates[template_id].slice() ;
+ }
+
// initialize
function on_template_pack_file( fname, data ) {
// make sure the filename is valid
@@ -1070,7 +1100,7 @@ function do_load_template_pack( fname, data )
return ;
}
var template_id = fname.substring( 0, fname.length-3 ).toLowerCase() ;
- if ( gValidTemplateIds.indexOf( template_id ) === -1 ) {
+ if ( gValidTemplateIds.indexOf( template_id ) === -1 && template_id.substr(0,7) !== "extras/" ) {
unknown_template_ids.push( fname ) ;
return ;
}
@@ -1136,7 +1166,7 @@ function do_load_template_pack( fname, data )
var pos = Math.max( fname.lastIndexOf("/"), fname.lastIndexOf("\\") ) ;
if ( pos === fname.length-1 )
return ; // nb: ignore directory entries
- if ( pos !== -1 )
+ if ( pos !== -1 && fname.substr(0,7) !== "extras/" )
fname = fname.substring( pos+1 ) ;
on_template_pack_file( fname, data ) ;
} ).then( function() {
diff --git a/vasl_templates/webapp/static/utils.js b/vasl_templates/webapp/static/utils.js
index 68e395a..8f98f34 100644
--- a/vasl_templates/webapp/static/utils.js
+++ b/vasl_templates/webapp/static/utils.js
@@ -31,6 +31,10 @@ function get_player_colors_for_element( $elem )
return get_player_colors( player_no ) ;
}
+function make_player_flag_url( player_nat ) {
+ return APP_URL_BASE + "/flags/" + player_nat ;
+}
+
function get_player_no_for_element( $elem )
{
// get the player colors (if any) for the specified element
diff --git a/vasl_templates/webapp/templates/index.html b/vasl_templates/webapp/templates/index.html
index 7519bba..409d1d2 100644
--- a/vasl_templates/webapp/templates/index.html
+++ b/vasl_templates/webapp/templates/index.html
@@ -15,6 +15,7 @@
+
@@ -93,6 +94,7 @@ gHelpUrl = "{{url_for('show_help')}}" ;
+
diff --git a/vasl_templates/webapp/templates/tabs-extras.html b/vasl_templates/webapp/templates/tabs-extras.html
new file mode 100644
index 0000000..a665170
--- /dev/null
+++ b/vasl_templates/webapp/templates/tabs-extras.html
@@ -0,0 +1,9 @@
+}})
Scenario
}})
Help