diff --git a/src/config/contributors.json b/src/config/contributors.json index 46772a5eb4a..29a31f33964 100644 --- a/src/config/contributors.json +++ b/src/config/contributors.json @@ -584,6 +584,7 @@ }, "tunetheweb": { "avatar_url": "10931297", + "bluesky": "tunetheweb.com", "github": "tunetheweb", "linkedin": "tunetheweb", "mastodon": "https://webperf.social/@tunetheweb", diff --git a/src/static/css/ebook.css b/src/static/css/ebook.css index b43f44600ec..e8130da4780 100644 --- a/src/static/css/ebook.css +++ b/src/static/css/ebook.css @@ -133,14 +133,16 @@ tbody tr:nth-child(even) { display: flex; } +.contributor-avatars { + min-width: 5rem; + margin-bottom: 1rem; + margin-right: 1rem; +} + .contributor-avatar { border-radius: 50px; background-color: #f7f779; - margin-bottom: 1rem; - margin-right: 1rem; width: 5rem; - max-width: 5rem; - height: auto; transition-duration: 0.3s; flex: 1; } diff --git a/src/templates/base.html b/src/templates/base.html index 93577a19121..7e4e175ceb1 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -69,6 +69,10 @@ + + + + diff --git a/src/templates/base/base_chapter.html b/src/templates/base/base_chapter.html index 68088e9b275..4f8ea984e01 100644 --- a/src/templates/base/base_chapter.html +++ b/src/templates/base/base_chapter.html @@ -275,6 +275,15 @@ @{{ authordata.mastodon }} {% endif %} + {% if authordata.bluesky %} + + + {{ onBluesky(authordata.bluesky) }} + + + @{{ authordata.bluesky }} + + {% endif %} {% if authordata.github %} diff --git a/src/templates/base/base_ebook.html b/src/templates/base/base_ebook.html index e5f1502dc61..4b70a5e1b15 100644 --- a/src/templates/base/base_ebook.html +++ b/src/templates/base/base_ebook.html @@ -356,11 +356,13 @@ {% for id, contributor in config.contributors.items() %} - {% if contributor.avatar_url|int != 0 %} - - {% else %} - - {% endif %} + + {% if contributor.avatar_url|int != 0 %} + + {% else %} + + {% endif %} + {{ contributor.name }} {% if contributor.twitter %} @@ -385,6 +387,17 @@ {% endif %} + {% if contributor.bluesky %} + + + + {{ onBluesky(contributor.bluesky) }} + + + {{ contributor.bluesky }} + + + {% endif %} {% if contributor.github %} diff --git a/src/templates/base/contributors.html b/src/templates/base/contributors.html index 9ad24aaa696..9109200120d 100644 --- a/src/templates/base/contributors.html +++ b/src/templates/base/contributors.html @@ -137,7 +137,7 @@ } .contributor-teams { - margin-top: 5px; + margin: 5px 0; text-align: center; color: #757575; font-size: 14px; @@ -334,6 +334,13 @@ {% endif %} + {% if contributor.bluesky %} + + + + + + {% endif %} {% if contributor.github %} @@ -355,11 +362,6 @@ {% endif %} - - - - - @@ -368,6 +370,14 @@ {% if loop.index == loop.length - 1 %}{{ self.and() }}{% endif %} {% endfor %} + + + + + + + + {% endfor %} diff --git a/src/templates/base/ebook.ejs.html b/src/templates/base/ebook.ejs.html index ea24bef2a92..0bc50e44364 100644 --- a/src/templates/base/ebook.ejs.html +++ b/src/templates/base/ebook.ejs.html @@ -86,11 +86,13 @@ {% endif %} {% set authordata = config.contributors[author] if author in config.contributors else None %} - {% if authordata.avatar_url|int != 0 %} - - {% else %} - - {% endif %} + + {% if authordata.avatar_url|int != 0 %} + + {% else %} + + {% endif %} + {{ authordata.name }} {% if authordata.twitter or authordata.github or authordata.linkedin or authordata.website %} @@ -113,6 +115,15 @@ @{{ authordata.mastodon }} {% endif %} + {% if authordata.bluesky %} + + + {{ onBluesky(authordata.bluesky) }} + + + @{{ authordata.bluesky }} + + {% endif %} {% if authordata.github %} diff --git a/src/templates/en/base.html b/src/templates/en/base.html index dcc7dd169d6..aac866493e0 100644 --- a/src/templates/en/base.html +++ b/src/templates/en/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} on Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} on Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} on BlueSky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} on GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} on LinkedIn{% endmacro %} {% macro website(authorName) %}{{authorName}} website{% endmacro %} diff --git a/src/templates/es/base.html b/src/templates/es/base.html index 0ec329fd62c..5a967219ddc 100644 --- a/src/templates/es/base.html +++ b/src/templates/es/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} en Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} en Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} en Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} en GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} en LinkedIn{% endmacro %} {% macro website(authorName) %}{{authorName}} sitio web{% endmacro %} diff --git a/src/templates/fr/base.html b/src/templates/fr/base.html index 5d82798efb8..3f4cce1d8d6 100644 --- a/src/templates/fr/base.html +++ b/src/templates/fr/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} sur Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} sur Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} sur Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} sur GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} sur LinkedIn{% endmacro %} {% macro website(authorName) %}site web de {{authorName}}{% endmacro %} diff --git a/src/templates/hi/base.html b/src/templates/hi/base.html index 384829e774b..746385d15b8 100644 --- a/src/templates/hi/base.html +++ b/src/templates/hi/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} Twitter पर{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}}Mastodonपर{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}}Blueskyपर{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} GitHub पर{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} LinkedIn पर{% endmacro %} {% macro website(authorName) %}{{authorName}} वेबसाइट{% endmacro %} diff --git a/src/templates/it/base.html b/src/templates/it/base.html index a820c2ab2bb..d632e321fe8 100644 --- a/src/templates/it/base.html +++ b/src/templates/it/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} su Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} su Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} su Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} su GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} su LinkedIn{% endmacro %} {% macro website(authorName) %}{{authorName}} sito web{% endmacro %} diff --git a/src/templates/ja/base.html b/src/templates/ja/base.html index e355be474ad..6f83303277a 100644 --- a/src/templates/ja/base.html +++ b/src/templates/ja/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}Twitterの@{{twitterHandle}}{% endmacro %} {% macro onMastodon(mastodonHandle) %}Mastodonの{{mastodonHandle}}{% endmacro %} +{% macro onBluesky(blueskyHandle) %}Blueskyの{{blueskyHandle}}{% endmacro %} {% macro onGitHub(gitHubHandle) %}GitHubの{{gitHubHandle}}{% endmacro %} {% macro onLinkedIn(authorName) %}LinkedInの{{authorName}}{% endmacro %} {% macro website(authorName) %}{{authorName}} ウェブサイト{% endmacro %} diff --git a/src/templates/nl/base.html b/src/templates/nl/base.html index d21e68aa93f..a7026915327 100644 --- a/src/templates/nl/base.html +++ b/src/templates/nl/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} op Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} op Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} op Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} op GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} op LinkedIn{% endmacro %} {% macro website(authorName) %}website van {{authorName}} {% endmacro %} diff --git a/src/templates/pt/base.html b/src/templates/pt/base.html index 7b81b9e0524..c409af17f02 100644 --- a/src/templates/pt/base.html +++ b/src/templates/pt/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} no Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} on Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} on Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} no GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} no LinkedIn{% endmacro %} {% macro website(authorName) %}{{authorName}} website{% endmacro %} diff --git a/src/templates/ru/base.html b/src/templates/ru/base.html index 11a728e6648..b4d4ce7dd43 100644 --- a/src/templates/ru/base.html +++ b/src/templates/ru/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} на Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} on Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} on Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} на GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} на LinkedIn{% endmacro %} {% macro website(authorName) %}Сайт {{authorName}}{% endmacro %} diff --git a/src/templates/tr/base.html b/src/templates/tr/base.html index 7ecb41e3648..99ba05d23e3 100644 --- a/src/templates/tr/base.html +++ b/src/templates/tr/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}}Twitter üzerinde{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}}Mastodon üzerinde{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}}Bluesky üzerinde{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}}GitHub üzerinde {% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} LinkedIn üzerinde {% endmacro %} {% macro website(authorName) %}{{authorName}} website{% endmacro %} diff --git a/src/templates/uk/base.html b/src/templates/uk/base.html index f3c98df4d3c..c4d57689c34 100644 --- a/src/templates/uk/base.html +++ b/src/templates/uk/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} у Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} у Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} у Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} на GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} у LinkedIn{% endmacro %} {% macro website(authorName) %}вебсайт {{authorName}}{% endmacro %} diff --git a/src/templates/zh-CN/base.html b/src/templates/zh-CN/base.html index ddd77f9c474..87e41d3015b 100644 --- a/src/templates/zh-CN/base.html +++ b/src/templates/zh-CN/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} 在 Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} 在 Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} 在 Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} 在 GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} 在 LinkedIn{% endmacro %} {% macro website(authorName) %}{{authorName}} 网站{% endmacro %} diff --git a/src/templates/zh-TW/base.html b/src/templates/zh-TW/base.html index bc4372f5726..78197fa34eb 100644 --- a/src/templates/zh-TW/base.html +++ b/src/templates/zh-TW/base.html @@ -113,6 +113,7 @@ {% macro onTwitter(twitterHandle) %}@{{twitterHandle}} Twitter{% endmacro %} {% macro onMastodon(mastodonHandle) %}{{mastodonHandle}} Mastodon{% endmacro %} +{% macro onBluesky(blueskyHandle) %}{{blueskyHandle}} Bluesky{% endmacro %} {% macro onGitHub(gitHubHandle) %}{{gitHubHandle}} GitHub{% endmacro %} {% macro onLinkedIn(authorName) %}{{authorName}} LinkedIn{% endmacro %} {% macro website(authorName) %}{{authorName}} 網站{% endmacro %}