diff --git a/VERSION b/VERSION index be05bba9829581391ff682daa1fe46b14fa20d14..bc80560fad66ca670bdfbd1e5c973a024d4d0325 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.7 +1.5.0 diff --git a/generator/authentication/__init__.py b/generator/authentication/__init__.py index ee8197ac71c76d55487a8af64ee1f6dc64eb7574..115c26dcfe3c6b1fc049443ef10a406d462efc35 100644 --- a/generator/authentication/__init__.py +++ b/generator/authentication/__init__.py @@ -17,32 +17,32 @@ def authenticate_via_jwt( @functools.wraps(func) def decorator(*args, **kwargs) -> typing.Any: - #if "token" not in flask.request.cookies: - #return flask.redirect( - #flask.url_for("oidc.login") - #) - - #try: - #claims = authlib.jose.jwt.decode( - #flask.request.cookies["token"], - #flask.current_app.config["JWT_SECRET_KEY"] - #) - #except authlib.jose.JoseError as exception: - #raise werkzeug.exceptions.BadRequest from exception - - #try: - #claims.validate() - #except authlib.jose.JoseError as exception: - #flask.current_app.logger.debug( - #"Claim validation failed: %s", - #exception - #) - - #return flask.redirect( - #flask.url_for("oidc.login") - #) - - flask.g.user_id = "6" + if "token" not in flask.request.cookies: + return flask.redirect( + flask.url_for("oidc.login") + ) + + try: + claims = authlib.jose.jwt.decode( + flask.request.cookies["token"], + flask.current_app.config["JWT_SECRET_KEY"] + ) + except authlib.jose.JoseError as exception: + raise werkzeug.exceptions.BadRequest from exception + + try: + claims.validate() + except authlib.jose.JoseError as exception: + flask.current_app.logger.debug( + "Claim validation failed: %s", + exception + ) + + return flask.redirect( + flask.url_for("oidc.login") + ) + + flask.g.user_id = claims["sub"] return func(*args, **kwargs) return decorator diff --git a/generator/static/images/examples/zeleni_melnik_base.png b/generator/static/images/examples/zeleni_melnik_base.png new file mode 100644 index 0000000000000000000000000000000000000000..e94defaa38ddc61f852f66bee88d9ffffd52851c Binary files /dev/null and b/generator/static/images/examples/zeleni_melnik_base.png differ diff --git a/generator/static/images/examples/zeleni_melnik_yellow_name_rect.png b/generator/static/images/examples/zeleni_melnik_yellow_name_rect.png new file mode 100644 index 0000000000000000000000000000000000000000..2953bc78cd5c0a4af751ac0cd333669c34cd964c Binary files /dev/null and b/generator/static/images/examples/zeleni_melnik_yellow_name_rect.png differ diff --git a/generator/static/images/logos/melnik-dark.png b/generator/static/images/logos/melnik-dark.png index 31003f91b1b4aa1134ac586cdb66877cf42fe6e1..bb8abd493aefa0ab15a22200ebe878bf3b300114 100644 Binary files a/generator/static/images/logos/melnik-dark.png and b/generator/static/images/logos/melnik-dark.png differ diff --git a/generator/static/js/templates/banner-name-left.js b/generator/static/js/templates/banner-name-left.js index f552d7946698718e029c0ee45a82d7dd32501d5b..11968bd782c67f9c1523979b60d80e3c5a41f06a 100644 --- a/generator/static/js/templates/banner-name-left.js +++ b/generator/static/js/templates/banner-name-left.js @@ -1027,6 +1027,13 @@ class BannerNameLeft extends Template { this.terciaryTextColor = "#000000"; this.terciaryTextBackgroundColor = "#ffffff"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/banner-name-right.js b/generator/static/js/templates/banner-name-right.js index 6e9b2bdd8cc224229f49be36a3dedd33a49a1673..a600ca6fb658a22102798dd24b2a553e9f341f66 100644 --- a/generator/static/js/templates/banner-name-right.js +++ b/generator/static/js/templates/banner-name-right.js @@ -868,6 +868,13 @@ class BannerNameRight extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.terciaryTextBackgroundColor = "#fde119"; + this.terciaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/billboard.js b/generator/static/js/templates/billboard.js index 130048ee2b8a99addf110be242f121baa73e704a..05b87f1e4ba3a66b56ea4a0318daae148445a1da 100644 --- a/generator/static/js/templates/billboard.js +++ b/generator/static/js/templates/billboard.js @@ -718,6 +718,10 @@ class Billboard extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/bottom-slogan-full-width.js b/generator/static/js/templates/bottom-slogan-full-width.js index 340e384b765873a3f2f81a411f003877c94c60f2..ecab06296fce45880e3705f5a57bcc913e808e59 100644 --- a/generator/static/js/templates/bottom-slogan-full-width.js +++ b/generator/static/js/templates/bottom-slogan-full-width.js @@ -677,6 +677,10 @@ class BottomSloganFullWidth extends Template { this.foregroundColor = "#a9ce2d"; this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/bottom-slogan-gradient-vertical-logo.js b/generator/static/js/templates/bottom-slogan-gradient-vertical-logo.js index 7bc7f6a0c4a80385c21c4a1ec8d509eb940902df..c0bf06cf41910438a124cd8adafc85ca14bfa24f 100644 --- a/generator/static/js/templates/bottom-slogan-gradient-vertical-logo.js +++ b/generator/static/js/templates/bottom-slogan-gradient-vertical-logo.js @@ -673,6 +673,13 @@ class BottomSloganGradientVerticalLogo extends Template { this.nameBackgroundColor = "#ffffff"; this.nameTextColor = "#000000"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/bottom-slogan-gradient.js b/generator/static/js/templates/bottom-slogan-gradient.js index 112a9535acadb937485297184eea08a6a99db676..b73614341c33ce0720d2795b8b55294bfec900c7 100644 --- a/generator/static/js/templates/bottom-slogan-gradient.js +++ b/generator/static/js/templates/bottom-slogan-gradient.js @@ -707,6 +707,13 @@ class BottomSloganGradient extends Template { this.nameBackgroundColor = "#ffffff"; this.nameTextColor = "#000000"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/bottom-slogan-person.js b/generator/static/js/templates/bottom-slogan-person.js index 643eb6228500f7c68353ea62710a0fb026d96027..891d31869caacbee5472a185a9a108c579ba05b4 100644 --- a/generator/static/js/templates/bottom-slogan-person.js +++ b/generator/static/js/templates/bottom-slogan-person.js @@ -748,6 +748,10 @@ class BottomSloganPerson extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/bottom-slogan-vertical-logo.js b/generator/static/js/templates/bottom-slogan-vertical-logo.js index 3d94f47ffcd6fcd4aa44f3d38ada52cadec3fd37..8a18095e56bdc977f5b79d31477991f1576357f0 100644 --- a/generator/static/js/templates/bottom-slogan-vertical-logo.js +++ b/generator/static/js/templates/bottom-slogan-vertical-logo.js @@ -699,6 +699,13 @@ class BottomSloganVerticalLogo extends Template { this.secondaryTextColor = "#a9ce2d"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/bottom-slogan.js b/generator/static/js/templates/bottom-slogan.js index 437a46ac79d7ca96fd69e7c69f4902165ae35758..0f206e6010a9476296dafa93c1a41ff6bbb84de0 100644 --- a/generator/static/js/templates/bottom-slogan.js +++ b/generator/static/js/templates/bottom-slogan.js @@ -786,8 +786,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#ffffff"; this.backgroundColor = "#000000"; - this.setNameColorScheme("white-on-black", true); - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setNameColorScheme("white-on-black", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "white-on-black": @@ -796,8 +796,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor ="#000000"; this.backgroundColor ="#ffffff"; - this.setNameColorScheme("black-on-white", true); - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setNameColorScheme("black-on-white", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "forum-black-on-white": @@ -806,7 +806,7 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#ffffff"; this.backgroundColor = "#962a51"; - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "forum-white-on-purple": @@ -815,7 +815,7 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#962a51"; this.backgroundColor = "#ffffff"; - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "zeleni-volary-bystrc-most-black-on-white": @@ -824,8 +824,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#ffffff"; this.backgroundColor = "#00ad43"; - this.setNameColorScheme("black-on-most", true); - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setNameColorScheme("black-on-most", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "zeleni-volary-bystrc-most-white-on-green": @@ -834,8 +834,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#00ad43"; this.backgroundColor = "#ffffff"; - this.setNameColorScheme("black-on-most", true); - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setNameColorScheme("black-on-most", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "spolecne-s-piraty-black-on-white": @@ -844,8 +844,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#ffffff"; this.backgroundColor = "#21274e"; - this.setNameColorScheme("pirati-spolecne", true); - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setNameColorScheme("pirati-spolecne", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "spolecne-s-piraty-white-on-blue": @@ -854,8 +854,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#21274e"; this.backgroundColor = "#ffffff"; - this.setNameColorScheme("pirati-spolecne", true); - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setNameColorScheme("pirati-spolecne", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "louny-spolecne-black-on-white": @@ -866,7 +866,7 @@ class BottomSloganTemplate extends Template { this.nameBackgroundColor = "#e2d7a9"; this.nameTextColor = "#000000"; - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "louny-spolecne-white-on-purple": @@ -877,7 +877,7 @@ class BottomSloganTemplate extends Template { this.nameBackgroundColor = "#e2d7a9"; this.nameTextColor = "#000000"; - this.setPrimaryTextHighlightColorScheme("gold", true); + await this.setPrimaryTextHighlightColorScheme("gold", true); break; case "litomerice-blue-on-white": @@ -886,8 +886,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#ffffff"; this.backgroundColor = "#123172"; - this.setNameColorScheme("blue-on-litomerice", true); - this.setPrimaryTextHighlightColorScheme("litomerice", true); + await this.setNameColorScheme("blue-on-litomerice", true); + await this.setPrimaryTextHighlightColorScheme("litomerice", true); break; case "litomerice-white-on-blue": @@ -896,8 +896,8 @@ class BottomSloganTemplate extends Template { this.foregroundColor = "#123172"; this.backgroundColor = "#ffffff"; - this.setNameColorScheme("blue-on-litomerice", true); - this.setPrimaryTextHighlightColorScheme("litomerice", true); + await this.setNameColorScheme("blue-on-litomerice", true); + await this.setPrimaryTextHighlightColorScheme("litomerice", true); break; case "stranane-gray-on-yellow": @@ -1056,6 +1056,13 @@ class BottomSloganTemplate extends Template { this.nameBackgroundColor = "#ffffff"; this.nameTextColor = "#000000"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; } diff --git a/generator/static/js/templates/cover-static-name-and-logo-left.js b/generator/static/js/templates/cover-static-name-and-logo-left.js index dc90dbca8a74beaa87978cf45cbeaf10d4cce013..f803580659da9d2b559af1556aad0e105ab363ac 100644 --- a/generator/static/js/templates/cover-static-name-and-logo-left.js +++ b/generator/static/js/templates/cover-static-name-and-logo-left.js @@ -898,6 +898,13 @@ class CoverStaticNameAndLogoLeft extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.terciaryTextBackgroundColor = "#fde119"; + this.terciaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/cover-static-name-and-logo.js b/generator/static/js/templates/cover-static-name-and-logo.js index daf9a81dccccfb04d8740948b9863621d108b237..28b7395638f694d1e61248ccfa13f26cba5f1c30 100644 --- a/generator/static/js/templates/cover-static-name-and-logo.js +++ b/generator/static/js/templates/cover-static-name-and-logo.js @@ -935,6 +935,13 @@ class CoverStaticNameAndLogo extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.terciaryTextBackgroundColor = "#fde119"; + this.terciaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/cover.js b/generator/static/js/templates/cover.js index 60cb033814704c6eb1aa3a5cd5ee7b11c397290b..6b425e9cf2a645bc6e51e58e03a30ba38cc2d924 100644 --- a/generator/static/js/templates/cover.js +++ b/generator/static/js/templates/cover.js @@ -983,6 +983,13 @@ class Cover extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.terciaryTextBackgroundColor = "#fde119"; + this.terciaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/eu-big-text-image.js b/generator/static/js/templates/eu-big-text-image.js index 1059019b923603b821b06d46bc6e9fb2cd147a37..92f48389c0eac6cb850cb3f8b4e09f521771a3aa 100644 --- a/generator/static/js/templates/eu-big-text-image.js +++ b/generator/static/js/templates/eu-big-text-image.js @@ -776,6 +776,10 @@ class EuBigTextImage extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/eu-icons-image.js b/generator/static/js/templates/eu-icons-image.js index a34ef97221f64dfbb3584d7147491c1a4715b495..c25516a80c937197b65ce54f89528880edb2f560 100644 --- a/generator/static/js/templates/eu-icons-image.js +++ b/generator/static/js/templates/eu-icons-image.js @@ -911,6 +911,10 @@ class EuIconsImage extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/eu-image-slogan.js b/generator/static/js/templates/eu-image-slogan.js index cdc830d99b14a49f6a6f6bf6db12c7df816d411c..302956b7b7581e57ed50e2eba2cb1ae6e1b30456 100644 --- a/generator/static/js/templates/eu-image-slogan.js +++ b/generator/static/js/templates/eu-image-slogan.js @@ -820,6 +820,10 @@ class EuImageSlogan extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/event-text-bottom.js b/generator/static/js/templates/event-text-bottom.js index a068dcf7241fdc8ad4ec89065f344db58894a5ab..b1ddf951a0083019f0c2c233dbae75089ed036c4 100644 --- a/generator/static/js/templates/event-text-bottom.js +++ b/generator/static/js/templates/event-text-bottom.js @@ -1184,6 +1184,13 @@ class EventTextBottom extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/event-text-right.js b/generator/static/js/templates/event-text-right.js index 4f01c94d54f2c1c1c5e3640f4e79fa99fb273c69..769f92efac77476e29ff6013fa08be452472e91c 100644 --- a/generator/static/js/templates/event-text-right.js +++ b/generator/static/js/templates/event-text-right.js @@ -1051,6 +1051,10 @@ class EventTextRight extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/koneckorupci-poll.js b/generator/static/js/templates/koneckorupci-poll.js index ab24f3cc5f7686ac36f49fb1d8cc83b98b79a235..82c84371fe85846266f091b6283dff65f479d6a2 100644 --- a/generator/static/js/templates/koneckorupci-poll.js +++ b/generator/static/js/templates/koneckorupci-poll.js @@ -744,6 +744,13 @@ class KonecKorupciPoll extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/left-corner-slogan.js b/generator/static/js/templates/left-corner-slogan.js index 2a39abe45a034fa3b0ae7426c8905aa9613f2497..8865f980f5ff1d16d581fd2b1a125c1cf859246d 100644 --- a/generator/static/js/templates/left-corner-slogan.js +++ b/generator/static/js/templates/left-corner-slogan.js @@ -1266,6 +1266,13 @@ class LeftCornerSloganTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/left-long-text.js b/generator/static/js/templates/left-long-text.js index 66ac64a63d0039e19b12c31ffe106f3942efd0fd..a8bc1f86f645419ae7dfcac02f5296f996a5a856 100644 --- a/generator/static/js/templates/left-long-text.js +++ b/generator/static/js/templates/left-long-text.js @@ -653,6 +653,10 @@ class LeftLongTextTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/nalodeni-story.js b/generator/static/js/templates/nalodeni-story.js index 0444868837ac700e1bd37e44f66867d0f685c617..149c56dcec8739df136adea2c9384ca69567549a 100644 --- a/generator/static/js/templates/nalodeni-story.js +++ b/generator/static/js/templates/nalodeni-story.js @@ -811,6 +811,10 @@ class NalodeniStory extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/nalodeni.js b/generator/static/js/templates/nalodeni.js index db124667fecfd44de5e72e54bd824890f6ada437..75775d824b1d6818b1daba62982a96c53db88d74 100644 --- a/generator/static/js/templates/nalodeni.js +++ b/generator/static/js/templates/nalodeni.js @@ -860,6 +860,10 @@ class Nalodeni extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/no-image-big-text-icon-with-terciary.js b/generator/static/js/templates/no-image-big-text-icon-with-terciary.js index 843432143ec22bf29ebe43970c69cc2cb5662824..911f55f2dcafcb753da5ea1e7702aca2347e7f39 100644 --- a/generator/static/js/templates/no-image-big-text-icon-with-terciary.js +++ b/generator/static/js/templates/no-image-big-text-icon-with-terciary.js @@ -795,6 +795,13 @@ class NoImageBigTextIconWithTerciary extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.secondaryTextBackgroundColor = "#fde119"; + this.secondaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/no-image-big-text-icon.js b/generator/static/js/templates/no-image-big-text-icon.js index 2a9eaed07c5cd2c5e6176e0d1e83ac13e11d13ad..168ed59ac8225bd14296a9afd38761f2a9a47389 100644 --- a/generator/static/js/templates/no-image-big-text-icon.js +++ b/generator/static/js/templates/no-image-big-text-icon.js @@ -763,6 +763,13 @@ class NoImageBigTextIcon extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.terciaryTextBackgroundColor = "#fde119"; + this.terciaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/no-image-icon-text.js b/generator/static/js/templates/no-image-icon-text.js index 2054b2a87032e46f8aeee29db8ed2b36a37546a8..2d9f017d1c85b9146351f44637cadd47aa14a3ac 100644 --- a/generator/static/js/templates/no-image-icon-text.js +++ b/generator/static/js/templates/no-image-icon-text.js @@ -567,6 +567,10 @@ class NoImageIconText extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/no-image-quote.js b/generator/static/js/templates/no-image-quote.js index 8e35016c18f05ba007bf9997fd3c226137cd9fba..4527b2ec614c4886cdfa902bed8d4b00d946a47c 100644 --- a/generator/static/js/templates/no-image-quote.js +++ b/generator/static/js/templates/no-image-quote.js @@ -808,6 +808,13 @@ class NoImageQuote extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/no-image-text-icon-vertical-logo.js b/generator/static/js/templates/no-image-text-icon-vertical-logo.js index 0e14498e9bf87b54b261e0ed284080b78144838d..31273ba65ad0db49243610dd7e06206f8a2634b0 100644 --- a/generator/static/js/templates/no-image-text-icon-vertical-logo.js +++ b/generator/static/js/templates/no-image-text-icon-vertical-logo.js @@ -725,6 +725,10 @@ class NoImageTextIconVerticalLogo extends Template { this.iconColor = "#a9ce2d"; this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/no-image-text-more-info.js b/generator/static/js/templates/no-image-text-more-info.js index 629e72643ffd1606cd25e304b8522917ec25da9d..2d413fe5ef8102118bde25030253a9599dc15125 100644 --- a/generator/static/js/templates/no-image-text-more-info.js +++ b/generator/static/js/templates/no-image-text-more-info.js @@ -877,6 +877,13 @@ class NoImageTextMoreInfo extends Template { this.quoteColor = "#a9ce2d"; this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/poll.js b/generator/static/js/templates/poll.js index 1715e674be6459ce88e6299a9ed9ba7ed07aa011..9553d35e37025a8f64b83304261f282f9fd6d3dc 100644 --- a/generator/static/js/templates/poll.js +++ b/generator/static/js/templates/poll.js @@ -985,6 +985,10 @@ class Poll extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/poster-bottom-slogan-no-icon.js b/generator/static/js/templates/poster-bottom-slogan-no-icon.js index 8f8c98a9df7294e32252ff1be0d5d8a5864c3baf..a3d3ca629505cb474c7906d9cdb5d0da7aaaf865 100644 --- a/generator/static/js/templates/poster-bottom-slogan-no-icon.js +++ b/generator/static/js/templates/poster-bottom-slogan-no-icon.js @@ -1061,6 +1061,13 @@ class PosterBottomSloganTemplateNoIcon extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.terciaryTextBackgroundColor = "#fde119"; + this.terciaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/poster-bottom-slogan.js b/generator/static/js/templates/poster-bottom-slogan.js index 5c50a0eb74fad55c4991fc47848574e51c8236c7..9c6e2ae98b6635bd006549f667185cc04c2c3a4e 100644 --- a/generator/static/js/templates/poster-bottom-slogan.js +++ b/generator/static/js/templates/poster-bottom-slogan.js @@ -1384,6 +1384,13 @@ class PosterBottomSloganTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.secondaryTextBackgroundColor = "#fde119"; + this.underNameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/poster-center-slogan-icons-no-image.js b/generator/static/js/templates/poster-center-slogan-icons-no-image.js index 04219674072bf8daa985dc1244dfb050a34b52d0..f8cfb72c6d64081f269daff827638fc0ef7a8ff7 100644 --- a/generator/static/js/templates/poster-center-slogan-icons-no-image.js +++ b/generator/static/js/templates/poster-center-slogan-icons-no-image.js @@ -877,6 +877,13 @@ class PosterCenterSloganIconsNoImage extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.secondaryTextBackgroundColor = "#fde119"; + this.secondaryTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/poster-center-slogan-no-image.js b/generator/static/js/templates/poster-center-slogan-no-image.js index abc6ab37e430e59d76ebd088703f4675f17abd35..c76a56aa57a195096f85d889765ffe9b082cfae4 100644 --- a/generator/static/js/templates/poster-center-slogan-no-image.js +++ b/generator/static/js/templates/poster-center-slogan-no-image.js @@ -574,6 +574,10 @@ class PosterCenterSloganNoImage extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/poster-event.js b/generator/static/js/templates/poster-event.js index 8eccff822a95fea5b92fe87746422b2dd1b10e06..a67552f5df0bd3b282881bac0f5f4c4839b27925 100644 --- a/generator/static/js/templates/poster-event.js +++ b/generator/static/js/templates/poster-event.js @@ -1116,6 +1116,13 @@ class PosterEvent extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.informationTextBackgroundColor = "#fde119"; + this.informationTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/right-big-text.js b/generator/static/js/templates/right-big-text.js index bef678e4c55cdde5301f68e4ffa530a1ed26737a..e9d8cbcc3f5ac32c1a87f18e767ef4cac448c011 100644 --- a/generator/static/js/templates/right-big-text.js +++ b/generator/static/js/templates/right-big-text.js @@ -946,6 +946,10 @@ class RightBigTextTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/right-long-text.js b/generator/static/js/templates/right-long-text.js index 35a5a9f84ca48d1f0620bb9bf0f56dec5cb42c97..d54aeb188c225ef64ae5f6bd9d619aa7132f4906 100644 --- a/generator/static/js/templates/right-long-text.js +++ b/generator/static/js/templates/right-long-text.js @@ -702,6 +702,10 @@ class RightLongTextTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/sticker-number.js b/generator/static/js/templates/sticker-number.js index effdd5196b6901ad18b1a395830a9d94af49dba1..37eaf4b09fc7d17045364438e0d54150aca7b431 100644 --- a/generator/static/js/templates/sticker-number.js +++ b/generator/static/js/templates/sticker-number.js @@ -614,6 +614,10 @@ class StickerNumber extends Template { this.backgroundColor = "#ffffff"; this.secondaryTextColor = "#000000"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/story-full-width-rectangle.js b/generator/static/js/templates/story-full-width-rectangle.js index 1c24dfd8665a49dd615ce38379fa62dcc2e90af7..4e531f44b86bc107084382ff507aec7875ccbda9 100644 --- a/generator/static/js/templates/story-full-width-rectangle.js +++ b/generator/static/js/templates/story-full-width-rectangle.js @@ -690,6 +690,13 @@ class StoryWithFullWidthRectangleTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + await this.setPrimaryColorScheme("white-on-black", true); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/templates/story-with-rectangle.js b/generator/static/js/templates/story-with-rectangle.js index ba8bcb0fb45761841dd986cb99b1f325670bccab..7f3c2ea81bb60c2b2db64ec823985de0e0853ad3 100644 --- a/generator/static/js/templates/story-with-rectangle.js +++ b/generator/static/js/templates/story-with-rectangle.js @@ -839,6 +839,13 @@ class StoryWithRectangleTemplate extends Template { this.primaryTextHighlightColor = "#ffeda5"; + break; + case "zeleni-melnik-yellow-name-rect": + this.setPrimaryColorScheme("white-on-black"); + + this.nameBackgroundColor = "#fde119"; + this.nameTextColor = "#000000"; + break; default: throw new Error("This scheme does not exist."); diff --git a/generator/static/js/ui.js b/generator/static/js/ui.js index df8e92c45bf1105480bdd4cdc645af6f061c64e1..7b898a5d3b086d5accd4f6703d5a555ddbacacf8 100644 --- a/generator/static/js/ui.js +++ b/generator/static/js/ui.js @@ -2421,6 +2421,16 @@ async function setCoalition(coalition, template) { $("#location-image-selection").trigger("change"); } + break; + case "zeleni-melnik": + template.setDarkLogoSource("/static/images/logos/melnik-dark.png", true); + template.setLightLogoSource("/static/images/logos/melnik.png", true); + + if (template.changeableAttributes.includes("locationImage")) { + $("#location-image-selection").val("Mělník"); + $("#location-image-selection").trigger("change"); + } + break; case "zeleni-praha13": template.setDarkLogoSource("/static/images/logos/zeleni_praha13-dark.png", true); @@ -2631,7 +2641,7 @@ async function setCoalition(coalition, template) { switch(coalition) { case "forum-jihlava-purple-dark": - template.setPrimaryColorScheme("forum-black-on-white", true); + await template.setPrimaryColorScheme("forum-black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2643,7 +2653,7 @@ async function setCoalition(coalition, template) { break; case "forum-jihlava-purple-light": - template.setPrimaryColorScheme("forum-white-on-purple", true); + await template.setPrimaryColorScheme("forum-white-on-purple", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2655,7 +2665,7 @@ async function setCoalition(coalition, template) { break; case "forum-jihlava-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2667,7 +2677,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-most-green-dark": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); setGlobalSpecifics("zeleni-most"); @@ -2675,7 +2685,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-most-green-light": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); setGlobalSpecifics("zeleni-most"); @@ -2683,7 +2693,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-most-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2694,16 +2704,16 @@ async function setCoalition(coalition, template) { reloadColorPalette(); break; - case "zeleni-melnik-green-dark": - template.setPrimaryColorScheme("zeleni-melnik-black-on-white", true); + case "zeleni-melnik-base": + await template.setPrimaryColorScheme("white-on-black", true); setGlobalSpecifics("zeleni-melnik"); reloadColorPalette(); break; - case "zeleni-melnik-green-light": - template.setPrimaryColorScheme("zeleni-melnik-white-on-green", true); + case "zeleni-melnik-yellow-rect": + await template.setPrimaryColorScheme("zeleni-melnik-yellow-name-rect", true); setGlobalSpecifics("zeleni-melnik"); @@ -2711,7 +2721,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-melnik-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2723,7 +2733,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-bystrc-green-dark": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); setGlobalSpecifics("zeleni-bystrc"); @@ -2731,7 +2741,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-bystrc-green-light": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); setGlobalSpecifics("zeleni-bystrc"); @@ -2739,7 +2749,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-bystrc-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2751,7 +2761,7 @@ async function setCoalition(coalition, template) { break; case "volary-green-dark": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); setGlobalSpecifics("volary"); @@ -2759,7 +2769,7 @@ async function setCoalition(coalition, template) { break; case "volary-green-light": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); setGlobalSpecifics("volary"); @@ -2767,7 +2777,7 @@ async function setCoalition(coalition, template) { break; case "volary-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2779,7 +2789,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-praha13-green-dark": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); setGlobalSpecifics("zeleni-praha13"); @@ -2787,7 +2797,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-praha13-green-light": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); setGlobalSpecifics("zeleni-praha13"); @@ -2795,7 +2805,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-praha13-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2807,7 +2817,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-praha14-green-dark": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-black-on-white", true); setGlobalSpecifics("zeleni-praha14"); @@ -2815,7 +2825,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-praha14-green-light": - template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); + await template.setPrimaryColorScheme("zeleni-volary-bystrc-most-white-on-green", true); setGlobalSpecifics("zeleni-praha14"); @@ -2823,7 +2833,7 @@ async function setCoalition(coalition, template) { break; case "zeleni-praha14-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); if (template.nameColorSchemes !== undefined) { template.setNameColorScheme("white-on-black", true); @@ -2835,7 +2845,7 @@ async function setCoalition(coalition, template) { break; case "louny-spolecne-purple-dark": - template.setPrimaryColorScheme("louny-spolecne-white-on-purple", true); + await template.setPrimaryColorScheme("louny-spolecne-white-on-purple", true); setGlobalSpecifics("louny-spolecne"); @@ -2843,7 +2853,7 @@ async function setCoalition(coalition, template) { break; case "louny-spolecne-purple-light": - template.setPrimaryColorScheme("louny-spolecne-black-on-white", true); + await template.setPrimaryColorScheme("louny-spolecne-black-on-white", true); setGlobalSpecifics("louny-spolecne"); @@ -2851,7 +2861,7 @@ async function setCoalition(coalition, template) { break; case "louny-spolecne-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("louny-spolecne"); @@ -2859,7 +2869,7 @@ async function setCoalition(coalition, template) { break; case "spolecne-s-piraty-blue-dark": - template.setPrimaryColorScheme("spolecne-s-piraty-black-on-white", true); + await template.setPrimaryColorScheme("spolecne-s-piraty-black-on-white", true); setGlobalSpecifics("spolecne-s-piraty"); @@ -2867,7 +2877,7 @@ async function setCoalition(coalition, template) { break; case "spolecne-s-piraty-blue-light": - template.setPrimaryColorScheme("spolecne-s-piraty-white-on-blue", true); + await template.setPrimaryColorScheme("spolecne-s-piraty-white-on-blue", true); setGlobalSpecifics("spolecne-s-piraty"); @@ -2875,7 +2885,7 @@ async function setCoalition(coalition, template) { break; case "spolecne-s-piraty-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("spolecne-s-piraty"); @@ -2883,7 +2893,7 @@ async function setCoalition(coalition, template) { break; case "vice-litomerice-blue-dark": - template.setPrimaryColorScheme("litomerice-blue-on-white", true); + await template.setPrimaryColorScheme("litomerice-blue-on-white", true); setGlobalSpecifics("vice-litomerice"); @@ -2891,7 +2901,7 @@ async function setCoalition(coalition, template) { break; case "vice-litomerice-blue-light": - template.setPrimaryColorScheme("litomerice-white-on-blue", true); + await template.setPrimaryColorScheme("litomerice-white-on-blue", true); setGlobalSpecifics("vice-litomerice"); @@ -2899,7 +2909,7 @@ async function setCoalition(coalition, template) { break; case "vice-litomerice-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("vice-litomerice"); @@ -2907,7 +2917,7 @@ async function setCoalition(coalition, template) { break; case "stranane-yellow-white": - template.setPrimaryColorScheme("stranane-yellow-on-white", true); + await template.setPrimaryColorScheme("stranane-yellow-on-white", true); setGlobalSpecifics("stranane"); @@ -2915,7 +2925,7 @@ async function setCoalition(coalition, template) { break; case "stranane-white-yellow": - template.setPrimaryColorScheme("stranane-white-on-yellow", true); + await template.setPrimaryColorScheme("stranane-white-on-yellow", true); setGlobalSpecifics("stranane"); @@ -2923,7 +2933,7 @@ async function setCoalition(coalition, template) { break; case "stranane-gray-yellow": - template.setPrimaryColorScheme("stranane-gray-on-yellow", true); + await template.setPrimaryColorScheme("stranane-gray-on-yellow", true); setGlobalSpecifics("stranane"); @@ -2931,7 +2941,7 @@ async function setCoalition(coalition, template) { break; case "stranane-base": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("stranane-base"); @@ -2939,7 +2949,7 @@ async function setCoalition(coalition, template) { break; case "prusanky-yellow-white": - template.setPrimaryColorScheme("prusanky-yellow-on-white", true); + await template.setPrimaryColorScheme("prusanky-yellow-on-white", true); setGlobalSpecifics("prusanky"); @@ -2947,7 +2957,7 @@ async function setCoalition(coalition, template) { break; case "prusanky-white-yellow": - template.setPrimaryColorScheme("prusanky-white-on-yellow", true); + await template.setPrimaryColorScheme("prusanky-white-on-yellow", true); setGlobalSpecifics("prusanky"); @@ -2955,7 +2965,7 @@ async function setCoalition(coalition, template) { break; case "prusanky-black-yellow": - template.setPrimaryColorScheme("prusanky-black-on-yellow", true); + await template.setPrimaryColorScheme("prusanky-black-on-yellow", true); setGlobalSpecifics("prusanky"); @@ -2963,7 +2973,7 @@ async function setCoalition(coalition, template) { break; case "prusanky-base": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("prusanky-base"); @@ -2971,7 +2981,7 @@ async function setCoalition(coalition, template) { break; case "ujezd-green-white": - template.setPrimaryColorScheme("ujezd-green-on-white", true); + await template.setPrimaryColorScheme("ujezd-green-on-white", true); setGlobalSpecifics("ujezd"); @@ -2979,7 +2989,7 @@ async function setCoalition(coalition, template) { break; case "ujezd-white-green": - template.setPrimaryColorScheme("ujezd-white-on-green", true); + await template.setPrimaryColorScheme("ujezd-white-on-green", true); setGlobalSpecifics("ujezd"); @@ -2987,7 +2997,7 @@ async function setCoalition(coalition, template) { break; case "ujezd-base": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("ujezd-base"); @@ -2995,7 +3005,7 @@ async function setCoalition(coalition, template) { break; case "cssd-rychnov-red-black": - template.setPrimaryColorScheme("cssd-red-on-black", true); + await template.setPrimaryColorScheme("cssd-red-on-black", true); setGlobalSpecifics("cssd"); @@ -3003,7 +3013,7 @@ async function setCoalition(coalition, template) { break; case "cssd-rychnov-black-red": - template.setPrimaryColorScheme("cssd-black-on-red", true); + await template.setPrimaryColorScheme("cssd-black-on-red", true); setGlobalSpecifics("cssd"); @@ -3011,7 +3021,7 @@ async function setCoalition(coalition, template) { break; case "cssd-rychnov-base": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("cssd"); @@ -3019,7 +3029,7 @@ async function setCoalition(coalition, template) { break; case "jilemnice-purple-black": - template.setPrimaryColorScheme("jilemnice-purple-on-black", true); + await template.setPrimaryColorScheme("jilemnice-purple-on-black", true); setGlobalSpecifics("jilemnice"); @@ -3027,7 +3037,7 @@ async function setCoalition(coalition, template) { break; case "jilemnice-black-purple": - template.setPrimaryColorScheme("jilemnice-black-on-purple", true); + await template.setPrimaryColorScheme("jilemnice-black-on-purple", true); setGlobalSpecifics("jilemnice"); @@ -3035,7 +3045,7 @@ async function setCoalition(coalition, template) { break; case "jilemnice-base": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("jilemnice"); @@ -3043,7 +3053,7 @@ async function setCoalition(coalition, template) { break; case "novarole-white-green": - template.setPrimaryColorScheme("novarole-white-on-green", true); + await template.setPrimaryColorScheme("novarole-white-on-green", true); setGlobalSpecifics("novarole-green"); @@ -3051,7 +3061,7 @@ async function setCoalition(coalition, template) { break; case "novarole-green-white": - template.setPrimaryColorScheme("novarole-green-on-white", true); + await template.setPrimaryColorScheme("novarole-green-on-white", true); setGlobalSpecifics("novarole-green"); @@ -3059,7 +3069,7 @@ async function setCoalition(coalition, template) { break; case "novarole-green-black": - template.setPrimaryColorScheme("novarole-green-on-black", true); + await template.setPrimaryColorScheme("novarole-green-on-black", true); setGlobalSpecifics("novarole-dark"); @@ -3067,7 +3077,7 @@ async function setCoalition(coalition, template) { break; case "novarole-base": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("novarole-dark"); @@ -3075,25 +3085,25 @@ async function setCoalition(coalition, template) { break; case "nezavisli-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("nezavisli"); break; case "nezavisli-light": - template.setPrimaryColorScheme("white-on-black", true); + await template.setPrimaryColorScheme("white-on-black", true); setGlobalSpecifics("nezavisli"); break; case "balcarova-dark": - template.setPrimaryColorScheme("black-on-white", true); + await template.setPrimaryColorScheme("black-on-white", true); setGlobalSpecifics("balcarova"); break; case "balcarova-light": - template.setPrimaryColorScheme("white-on-black", true); + await template.setPrimaryColorScheme("white-on-black", true); setGlobalSpecifics("balcarova"); diff --git a/generator/templates/generator.html b/generator/templates/generator.html index 5b8ac539d348ab65c2d5161d512f9a0b4021c2d9..e48ccbf5e57466864f8dc811d51aefcb16b60ad3 100644 --- a/generator/templates/generator.html +++ b/generator/templates/generator.html @@ -1984,17 +1984,13 @@ >Piráti a Zelení pro Most - původní barvy</option> <option - data-image-source="{{ url_for('static', filename='images/examples/zeleni_melnik_green_dark.png') }}" - value="zeleni-melnik-green-dark" - >Piráti a Zelení Mělník - zelené barvy, tmavé pozadí</option> + data-image-source="{{ url_for('static', filename='images/examples/zeleni_melnik_base.png') }}" + value="zeleni-melnik-base" + >Piráti a Zelení Mělník - běžné barvy</option> <option - data-image-source="{{ url_for('static', filename='images/examples/zeleni_melnik_green_light.png') }}" - value="zeleni-melnik-green-light" - >Piráti a Zelení Mělník - zelené barvy, světlé pozadí</option> - <option - data-image-source="{{ url_for('static', filename='images/examples/zeleni_melnik.png') }}" - value="zeleni-melnik-dark" - >Piráti a Zelení Mělník - původní barvy</option> + data-image-source="{{ url_for('static', filename='images/examples/zeleni_melnik_yellow_name_rect.png') }}" + value="zeleni-melnik-yellow-rect" + >Piráti a Zelení Mělník - žlutý obdélník pro jména</option> <option data-image-source="{{ url_for('static', filename='images/examples/zeleni_bystrc_green_dark.png') }}"