diff --git a/VERSION b/VERSION index 8af85beb5159909f7df13705826e8c937f2b050b..94fe62c2740fdca94618a4f448e6c2575f123592 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.3 +1.5.4 diff --git a/generator/static/css/avatar_public.css b/generator/static/css/avatar_public.css index 97c17f3aadf0db2d20849d4c0e77996d4dcb5e19..636a9c3be3b97b01bcf686454cd6c897c1e8110b 100644 --- a/generator/static/css/avatar_public.css +++ b/generator/static/css/avatar_public.css @@ -32,6 +32,13 @@ main, footer { margin-right: auto; } +#description { + max-width: 800px; + padding: 15px; + margin-left: auto; + margin-right: auto; +} + #avatar-canvas, .controls { max-width: 500px; margin-left: auto; diff --git a/generator/static/images/badges/Spolecne-s-piraty-fialova-dark.png b/generator/static/images/badges/Spolecne-s-piraty-fialova-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ce1558d2f007a0dd34dd0e2a052d7a02dd0954d2 Binary files /dev/null and b/generator/static/images/badges/Spolecne-s-piraty-fialova-dark.png differ diff --git a/generator/static/images/badges/Spolecne-s-piraty-fialova-light.png b/generator/static/images/badges/Spolecne-s-piraty-fialova-light.png new file mode 100644 index 0000000000000000000000000000000000000000..946be34e2bf9620d690c2966325e3e7d4c544b17 Binary files /dev/null and b/generator/static/images/badges/Spolecne-s-piraty-fialova-light.png differ diff --git a/generator/static/images/badges/Spolecne-s-piraty-oranzova-dark.png b/generator/static/images/badges/Spolecne-s-piraty-oranzova-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ab4e5625f8db0eab0b8530e184e83671536f26c3 Binary files /dev/null and b/generator/static/images/badges/Spolecne-s-piraty-oranzova-dark.png differ diff --git a/generator/static/images/badges/Spolecne-s-piraty-oranzova-light.png b/generator/static/images/badges/Spolecne-s-piraty-oranzova-light.png new file mode 100644 index 0000000000000000000000000000000000000000..df2b6d39ae3190306cb8f30e328e2d1d40e3fea0 Binary files /dev/null and b/generator/static/images/badges/Spolecne-s-piraty-oranzova-light.png differ diff --git a/generator/static/images/badges/Spolecne-s-piraty-zelena-dark.png b/generator/static/images/badges/Spolecne-s-piraty-zelena-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..08c397c0300a7d97019d0a5a76d50dffa4c1142b Binary files /dev/null and b/generator/static/images/badges/Spolecne-s-piraty-zelena-dark.png differ diff --git a/generator/static/images/badges/Spolecne-s-piraty-zelena-light.png b/generator/static/images/badges/Spolecne-s-piraty-zelena-light.png new file mode 100644 index 0000000000000000000000000000000000000000..2660c3dedfceb845fca0810170ac9de9c1cb462b Binary files /dev/null and b/generator/static/images/badges/Spolecne-s-piraty-zelena-light.png differ diff --git a/generator/static/images/badges/Usti-nad-labem-dark.png b/generator/static/images/badges/Usti-nad-labem-dark.png index 0b07410610cb3f02a326dfb88e7bce99a285ccf7..95ab252a196ff1b1583ae6b328ed9aaf5d2c5b7e 100644 Binary files a/generator/static/images/badges/Usti-nad-labem-dark.png and b/generator/static/images/badges/Usti-nad-labem-dark.png differ diff --git a/generator/templates/avatar_internal.html b/generator/templates/avatar_internal.html index b0f9038f5f906c9957ce0a449e550e1e3286d966..85ac569504b6d4fb34d831ec49d2beacd0b9375c 100644 --- a/generator/templates/avatar_internal.html +++ b/generator/templates/avatar_internal.html @@ -827,6 +827,29 @@ data-url="{{ url_for('generator.view_avatar_generator_with_localization', icon_localization='sokolov', _external=true) }}" value="sokolov" >Sokolov</option> + + <option + data-image-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-zelena-dark.png') }}" + data-icon-dark-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-zelena-dark.png') }}" + data-icon-light-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-zelena-light.png') }}" + data-url="{{ url_for('generator.view_avatar_generator_with_localization', icon_localization='spolecne-s-piraty-zelena', _external=true) }}" + value="spolecne-s-piraty-zelena" + >Společně s Piráty - zelená</option> + <option + data-image-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-oranzova-dark.png') }}" + data-icon-dark-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-oranzova-dark.png') }}" + data-icon-light-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-oranzova-light.png') }}" + data-url="{{ url_for('generator.view_avatar_generator_with_localization', icon_localization='spolecne-s-piraty-oranzova', _external=true) }}" + value="spolecne-s-piraty-oranzova" + >Společně s Piráty - oranžová</option> + <option + data-image-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-fialova-dark.png') }}" + data-icon-dark-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-fialova-dark.png') }}" + data-icon-light-source="{{ url_for('static', filename='images/badges/Spolecne-s-piraty-fialova-light.png') }}" + data-url="{{ url_for('generator.view_avatar_generator_with_localization', icon_localization='spolecne-s-piraty-fialova', _external=true) }}" + value="spolecne-s-piraty-fialova" + >Společně s Piráty - fialová</option> + <option data-image-source="{{ url_for('static', filename='images/badges/Strakonice-dark.png') }}" data-icon-dark-source="{{ url_for('static', filename='images/badges/Strakonice-dark.png') }}" diff --git a/generator/templates/avatar_public.html b/generator/templates/avatar_public.html index a21533cb3cb2373d110341be1796edafdd93058f..e576681f7440625c856c955fe67fb449d13cde48 100644 --- a/generator/templates/avatar_public.html +++ b/generator/templates/avatar_public.html @@ -54,6 +54,12 @@ </h1> </header> <main> + <p id="description"> + Jak asi víte, Facebook kvůli řádění antivaxerů a šíření hoaxů skrz profilové rámečky, které šly snadno vytvořit, nandat, sdílet a rozšiřovat, tuto funkci zrušil. Nám ale přišla vyloženě tuna dopisů, že byste chtěli snadno vyjádřit svou touhu dát si naše logo na svou profilovku, aniž byste museli umět s grafickými programy. No, a když jste to chtěli, tak my jsme to udělali!<br> + Tady si nahrajete fotografii (třeba teď vyfocenou nebo tu, kterou už nastavenou máte), automaticky na ní nalepíme naše logo a můžete si ji zase stáhnout. Není to tak lehké jako to původně na Facebooku bylo, ale i tak to chce jen pár kliknutí.<br> + <b>Směle do toho! Volíme Piráty!</b> + </p> + <canvas id="avatar-canvas" width="2000" diff --git a/generator/views/generator.py b/generator/views/generator.py index 1d52ef1fe831826497b590396afc2cbcf1f5022a..a1d3db2bb640b46cbef098308f2697a69e28aad3 100644 --- a/generator/views/generator.py +++ b/generator/views/generator.py @@ -28,6 +28,9 @@ ICON_HEIGHT_SPECIAL_MULTIPLIERS = { "louny-zlata-na-fialove": 2, "louny-fialova-na-bile": 2, "louny-fialova-na-zlate": 2, + "spolecne-s-piraty-zelena": 2, + "spolecne-s-piraty-oranzova": 2, + "spolecne-s-piraty-fialova": 2, "melnik": 4, "olomouc-volim": 4, "olomouc-kandidat": 4, @@ -43,6 +46,9 @@ ICON_OFFSET_BOTTOM_SPECIAL_MULTIPLIERS = { "louny-zlata-na-fialove": 0, "louny-fialova-na-bile": 0, "louny-fialova-na-zlate": 0, + "spolecne-s-piraty-zelena": 0, + "spolecne-s-piraty-oranzova": 0, + "spolecne-s-piraty-fialova": 0, "melnik": 0, "olomouc-volim": 0, "olomouc-kandidat": 0, @@ -181,6 +187,9 @@ def view_avatar_generator_with_localization( "rudoltice", "sobeslav", "sokolov", + "spolecne-s-piraty-zelena", + "spolecne-s-piraty-oranzova", + "spolecne-s-piraty-fialova", "strakonice", "sumperk", "svitavy",