diff --git a/generator/static/images/badges/Vejprnice-dark.png b/generator/static/images/badges/Vejprnice-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..4b071657456af3ef9e4126e5d91a0be4c86d9aef Binary files /dev/null and b/generator/static/images/badges/Vejprnice-dark.png differ diff --git a/generator/static/images/badges/Vejprnice-light.png b/generator/static/images/badges/Vejprnice-light.png new file mode 100644 index 0000000000000000000000000000000000000000..21205a1126e6715ba84f99a460774c472ad27949 Binary files /dev/null and b/generator/static/images/badges/Vejprnice-light.png differ diff --git a/generator/static/images/badges/Vejprtice-dark.png b/generator/static/images/badges/Vejprtice-dark.png deleted file mode 100644 index ea8d64170ce2094016b90379d20aa4c1ecbf3865..0000000000000000000000000000000000000000 Binary files a/generator/static/images/badges/Vejprtice-dark.png and /dev/null differ diff --git a/generator/static/images/badges/Vejprtice-light.png b/generator/static/images/badges/Vejprtice-light.png deleted file mode 100644 index d39381feaf9a5c1ec464cc7ad28057255665443f..0000000000000000000000000000000000000000 Binary files a/generator/static/images/badges/Vejprtice-light.png and /dev/null differ diff --git a/generator/static/images/locations/Vejprnice-dark.png b/generator/static/images/locations/Vejprnice-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..29752afd8cf0eb9ea4f5d9bde1309d7b70b8e2c8 Binary files /dev/null and b/generator/static/images/locations/Vejprnice-dark.png differ diff --git a/generator/static/images/locations/Vejprnice.png b/generator/static/images/locations/Vejprnice.png new file mode 100644 index 0000000000000000000000000000000000000000..f5b383ffdb40c28571daf1f5bdce70e4ad5fbbd8 Binary files /dev/null and b/generator/static/images/locations/Vejprnice.png differ diff --git a/generator/static/images/locations/Vejprtice-dark.png b/generator/static/images/locations/Vejprtice-dark.png deleted file mode 100644 index c535452f5d004d54430aa6cfb601c8cd6ceca093..0000000000000000000000000000000000000000 Binary files a/generator/static/images/locations/Vejprtice-dark.png and /dev/null differ diff --git a/generator/static/images/locations/Vejprtice.png b/generator/static/images/locations/Vejprtice.png deleted file mode 100644 index 2ab686a634d22dfd32d042c1f782152e2a4a10a9..0000000000000000000000000000000000000000 Binary files a/generator/static/images/locations/Vejprtice.png and /dev/null differ diff --git a/generator/static/js/avatar/internal_ui.js b/generator/static/js/avatar/internal_ui.js index 41b0c04f377d7a6def07bd7057b5168e77195309..43bf5bd9bbd512dc4903e93aad26abea16688661 100644 --- a/generator/static/js/avatar/internal_ui.js +++ b/generator/static/js/avatar/internal_ui.js @@ -643,8 +643,6 @@ $("#icon-selection").on( ); if (dataset.url !== undefined && dataset.url !== null) { - $("#icon-permalink-wrapper").css("display", "block"); - let url = dataset.url; if ( @@ -657,7 +655,8 @@ $("#icon-selection").on( $("#icon-permalink").attr("href", url); $("#icon-permalink").html(url); } else { - $("#icon-permalink-wrapper").css("display", "none"); + $("#icon-permalink").attr("href", defaultIconLink) + $("#icon-permalink").html(defaultIconLink);; } template.redrawCanvas(); diff --git a/generator/templates/avatar_internal.html b/generator/templates/avatar_internal.html index 941df7ddc43f935f12ec22e08afb542db5af7b8f..3e5ba3fd0215f5c7acbaaedb3b72dcc8c3790945 100644 --- a/generator/templates/avatar_internal.html +++ b/generator/templates/avatar_internal.html @@ -933,12 +933,12 @@ value="valmez" >Valašské Meziříčí</option> <option - data-image-source="{{ url_for('static', filename='images/badges/Vejprtice-dark.png') }}" - data-icon-dark-source="{{ url_for('static', filename='images/badges/Vejprtice-dark.png') }}" - data-icon-light-source="{{ url_for('static', filename='images/badges/Vejprtice-light.png') }}" - data-url="{{ url_for('generator.view_avatar_generator_with_localization', icon_localization='vejprtice', _external=true) }}" - value="vejprtice" - >Vejprtice</option> + data-image-source="{{ url_for('static', filename='images/badges/Vejprnice-dark.png') }}" + data-icon-dark-source="{{ url_for('static', filename='images/badges/Vejprnice-dark.png') }}" + data-icon-light-source="{{ url_for('static', filename='images/badges/Vejprnice-light.png') }}" + data-url="{{ url_for('generator.view_avatar_generator_with_localization', icon_localization='vejprnice', _external=true) }}" + value="vejprnice" + >Vejprnice</option> <option data-image-source="{{ url_for('static', filename='images/badges/Volary-dark.png') }}" data-icon-dark-source="{{ url_for('static', filename='images/badges/Volary-dark.png') }}" @@ -962,9 +962,21 @@ >Zlín</option> </select> - <section id="icon-permalink-wrapper" style="display:none"> + <section id="icon-permalink-wrapper"> + {% set base_icon_url = url_for( + 'generator.view_avatar_generator_with_localization', + icon_localization=none, + base_localization=none, + _external=True + ) %} + <b>Permanentní odkaz na nastavenou ikonu:</b> - <a id="icon-permalink" href="#"></a> + + <script type="text/javascript"> + const defaultIconLink = "{{ base_icon_url }}"; + </script> + + <a id="icon-permalink" href="{{ base_icon_url }}">{{ base_icon_url }}</a> </section> </section> @@ -1575,10 +1587,10 @@ data-url="{{ url_for('generator.view_avatar_generator_with_localization', base_localization='valmez', _external=true) }}" >Valmez</option> <option - data-image-source="{{ url_for('static', filename='images/locations/Vejprtice-dark.png') }}" - data-image-location-source="{{ url_for('static', filename='images/locations/Vejprtice.png') }}" - data-url="{{ url_for('generator.view_avatar_generator_with_localization', base_localization='vejprtice', _external=true) }}" - >Vejprtice</option> + data-image-source="{{ url_for('static', filename='images/locations/Vejprnice-dark.png') }}" + data-image-location-source="{{ url_for('static', filename='images/locations/Vejprnice.png') }}" + data-url="{{ url_for('generator.view_avatar_generator_with_localization', base_localization='vejprnice', _external=true) }}" + >Vejprnice</option> <option data-image-source="{{ url_for('static', filename='images/locations/Volary-dark.png') }}" data-image-location-source="{{ url_for('static', filename='images/locations/Volary.png') }}" diff --git a/generator/templates/generator.html b/generator/templates/generator.html index b245261819fd334414af9fa5f802e91396bcbdc2..5832f55fa61e1cb20f27d4868f3c96792bc35abd 100644 --- a/generator/templates/generator.html +++ b/generator/templates/generator.html @@ -1672,9 +1672,9 @@ data-image-location-source="{{ url_for('static', filename='images/locations/Valmez.png') }}" >Valmez</option> <option - data-image-source="{{ url_for('static', filename='images/locations/Vejprtice-dark.png') }}" - data-image-location-source="{{ url_for('static', filename='images/locations/Vejprtice.png') }}" - >Vejprtice</option> + data-image-source="{{ url_for('static', filename='images/locations/Vejprnice-dark.png') }}" + data-image-location-source="{{ url_for('static', filename='images/locations/Vejprnice.png') }}" + >Vejprnice</option> <option data-image-source="{{ url_for('static', filename='images/locations/Volary-dark.png') }}" data-image-location-source="{{ url_for('static', filename='images/locations/Volary.png') }}" diff --git a/generator/views/generator.py b/generator/views/generator.py index d7090eadfb379181e22f3d044e84f831a0c2edda..42c041af156a20453a47b32e30e39a27ef0a517f 100644 --- a/generator/views/generator.py +++ b/generator/views/generator.py @@ -67,6 +67,7 @@ def view_avatar_generator() -> typing.Tuple[flask.Response, int]: ), http.client.OK +@generator_blueprint.route("/avatar/centralni") @generator_blueprint.route("/avatar/ikona/<string:icon_localization>") @generator_blueprint.route("/avatar/lokalizace/<string:base_localization>") def view_avatar_generator_with_localization( @@ -189,7 +190,7 @@ def view_avatar_generator_with_localization( "uherske-hradiste", "usti-nad-labem", "valec", - "vejprtice", + "vejprnice", "valmez", "volary", "zatec", @@ -323,7 +324,7 @@ def view_avatar_generator_with_localization( "usti-nad-labem", "valec", "valmez", - "vejprtice", + "vejprnice", "volary", "zatec", "zelezny-brod",