From fe6c3fb0539b55a463a44de04d42e106bb422837 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Sat, 22 Feb 2020 19:33:51 +0300 Subject: [PATCH] Update network pages, clean up lang strings --- source/_data/diaspora.json | 12 ++++++++---- source/_data/funkwhale.json | 4 ++++ source/_data/gnusocial.json | 2 +- source/_data/hubzilla.json | 1 + source/_data/mastodon.json | 16 +++++++++------- source/_data/miscellaneous.json | 15 ++++++++++++++- source/_data/pleroma.json | 3 ++- source/_data/socialhome.json | 2 +- themes/starter/languages/en.yml | 20 +++++++++++--------- themes/starter/layout/_partial/join.ejs | 2 +- themes/starter/layout/diaspora.ejs | 20 ++++++++++++++++---- themes/starter/layout/fediverse.ejs | 2 +- themes/starter/layout/funkwhale.ejs | 12 ++++++++++++ themes/starter/layout/mastodon.ejs | 4 ++-- themes/starter/layout/pleroma.ejs | 2 +- 15 files changed, 84 insertions(+), 33 deletions(-) diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json index 7ca77ee..b4ffa4f 100644 --- a/source/_data/diaspora.json +++ b/source/_data/diaspora.json @@ -22,19 +22,23 @@ "mobile": "https://f-droid.org/en/packages/com.github.dfa.diaspora_android", "proxy": "https://wiki.diasporafoundation.org/Installation/Camo", "relay": "https://relay.iliketoast.net", - "tutorials": "https://diasporafoundation.org/tutorials", + "tutorials": + [ + {"id": "0", "url": "https://diasporafoundation.org/tutorials"} + ], "devTutorial": "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers", "mascot": [{"item": "dandelion"}], "dwellers": "diasporians", "descr": "The diaspora* project appeared in 2010, when a group of friends decided to create a social network that would return control to users. The project's mascot is dandelion, and diaspora* servers are called \"pods\". Information about the new network spread far and wide like dandelion's seeds in the wind, attracting newcomers, increasing the number of available pods. Today it's a community project with a stable userbase. Many people joined diaspora* in search of a macroblogging platform independent from corporations.", "communities": "", - "connections": ["Friendica", "Hubzilla", "Socialhome", "GangGo"], + "connections": ["Friendica", "Hubzilla", "Socialhome"], "screenshots": [ {"descr": "diaspora stream", "img": "diaspora-1.png"} ], "features": [ + "polls", "markdown support", "following hashtags", "limited posts", @@ -54,7 +58,7 @@ "reading": [ { - "title": "Planting a Seed: diaspora story part 1", + "title": "Planting a Seed: diaspora story part one", "url": "https://medium.com/we-distribute/planting-a-seed-what-working-at-diaspora-was-like-cde26fa29364" }, { @@ -66,7 +70,7 @@ "url": "https://en.wikipedia.org/wiki/Diaspora_(social_network)" }, { - "title": "FOSDEM 2017 video about diaspora", + "title": "FOSDEM 2017: video about diaspora", "url": "https://archive.fosdem.org/2017/schedule/event/diaspora" } ], diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json index 8169ec3..7cc234d 100644 --- a/source/_data/funkwhale.json +++ b/source/_data/funkwhale.json @@ -27,6 +27,10 @@ {"id": "0", "url": "https://docs.funkwhale.audio/users/index.html"} ], "devTutorial": "https://docs.funkwhale.audio/installation/index.html", + "services": + [ + {"id": "0", "url": "https://app.spacebear.ee"} + ], "mascot": [{"item": "whale", "imgNum": "1"}], "dwellers": "?", "communities": "", diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json index f4913ea..70581da 100644 --- a/source/_data/gnusocial.json +++ b/source/_data/gnusocial.json @@ -7,7 +7,7 @@ "type": "microblogging", "logoClr": "a22430", "created": "2010", - "official": "https://gnu.io/social", + "official": "https://gnusocial.network", "license": "AGPL-3.0", "repo": "https://notabug.org/diogo/gnu-social", "language": "PHP", diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index 9adc4ea..1ff4d3b 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -50,6 +50,7 @@ "features": [ "granular privacy settings", + "polls", "forums", "file sharing", "expiring posts", diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index 1f74bf0..c7062af 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -26,9 +26,11 @@ "mobile": "https://web.archive.org/web/20191114114235/https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md", "forUsers": [ - {"id": "0", "url": "https://vinayaka.distsn.org"}, - {"id": "1", "url": "https://elenq.gitlab.io/artodon"}, - {"id": "2", "url": "https://communitywiki.org/trunk"} + {"id": "0", "url": "https://pinafore.social"}, + {"id": "1", "url": "https://www.halcyon.social"}, + {"id": "2", "url": "https://vinayaka.distsn.org"}, + {"id": "3", "url": "https://elenq.gitlab.io/artodon"}, + {"id": "4", "url": "https://communitywiki.org/trunk"} ], "tutorials": [ @@ -44,21 +46,20 @@ "backup": "https://github.com/kensanata/mastodon-backup", "services": [ - {"id": "0", "url": "https://masto.host"} + {"id": "0", "url": "https://masto.host"}, + {"id": "1", "url": "https://jortage.com"} ], "forks": [ {"id": "0", "url": "https://github.com/glitch-soc/mastodon", "descr": "Glitch-soc - fork with experimental features"}, {"id": "1", "url": "https://github.com/hometown-fork/hometown", "descr": "Hometown - up-to-date fork with extra features"}, - {"id": "3", "url": "https://github.com/beatrix-bitrot/ephemeral.glitch.social", "descr": "Ephemeral Mastodon - with disappearing toots"}, - {"id": "4", "url": "https://github.com/florence-social/mastodon-fork", "descr": "Florence - community fork"} + {"id": "2", "url": "https://github.com/florence-social/mastodon-fork", "descr": "Florence - community fork"} ], "utilities": [ {"id": "0", "url": "https://www.mastofeed.com"}, {"id": "1", "url": "https://crossposter.masto.donte.com.br"}, {"id": "2", "url": "http://www.unmung.com/mastoview"}, - {"id": "3", "url": "https://fed.brid.gy"}, {"id": "4", "url": "https://gitlab.com/chaica/feed2toot"} ], @@ -75,6 +76,7 @@ ], "features": [ + "polls", "custom emojis", "pinned posts", "hiding followers", diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index db98dc8..6bd64c6 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -267,7 +267,7 @@ "protocols": "ActivityPub", "site": "", "logo": "", - "servers": "", + "servers": "https://the-federation.info/littr", "apClass": true, "zotClass": false, "diasporaClass": false, @@ -378,6 +378,19 @@ "OStatusClass": false, "categories": ["DevTools"] }, + { + "title": "ActivityPub Express", + "source": "https://github.com/wmurphyrd/activitypub-express", + "protocols": "ActivityPub", + "site": "", + "logo": "", + "servers": "", + "apClass": true, + "zotClass": false, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["DevTools"] + }, { "title": "pubgate", "source": "https://github.com/autogestion/pubgate", diff --git a/source/_data/pleroma.json b/source/_data/pleroma.json index d83b039..00c94c0 100644 --- a/source/_data/pleroma.json +++ b/source/_data/pleroma.json @@ -25,7 +25,8 @@ "mobile": "https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md#mobile-clients", "forUsers": [ - {"id": "0", "url": "https://vinayaka.distsn.org"} + {"id": "0", "url": "https://www.halcyon.social"}, + {"id": "1", "url": "https://vinayaka.distsn.org"} ], "tutorials": [ diff --git a/source/_data/socialhome.json b/source/_data/socialhome.json index 51c7343..ffac214 100644 --- a/source/_data/socialhome.json +++ b/source/_data/socialhome.json @@ -28,7 +28,7 @@ "dwellers": "?", "communities": "", "descr": "Socialhome's column grid layout makes it a perfect network for sharing image content or creating personal portfolio and delivering new posts to friends from other Fediverse platforms.", - "connections": ["Mastodon", "diaspora*", "Friendica", "Hubzilla", "Misskey", "Pixelfed", "Pleroma", "WriteFreely"], + "connections": ["diaspora*", "Friendica", "Hubzilla", "Mastodon", "Misskey", "Pixelfed", "Pleroma", "WriteFreely"], "screenshots": [ {"descr": "Socialhome grid layout", "img": "socialhome-1.png"} diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 854e37e..7bfce1b 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -23,7 +23,6 @@ joinF: JOIN FEDIVERSE networks: networks protocols: protocols langs: programming languages -serverLists: server lists history: history projects: related projects reading: additional reading @@ -58,8 +57,7 @@ wiki: wiki docs: docs resources: resources join: join the network -nodeList: Servers list -admins: for administrators +serverList: Server list users: for users techies: for techies mobapps: Mobile apps @@ -68,7 +66,7 @@ utilities: utilities forks: forks / modifications cheatsheets: cheat sheets total: population -servers: servers +server: servers accounts: accounts instances: instances active: active users @@ -91,10 +89,11 @@ userGuide: User guide adminGuide: Administrator guide devGuide: Developer guide preinstalled: Preinstalled hosting +mediaHosting: Communal media storage # diaspora page -proxy: proxy -relay: relay +proxy: Proxy +relay: Relay # mastodon page howto: How to Mastodon @@ -104,14 +103,13 @@ backup: Mastodon backup metrics: metrics stats: stats graphs: graphs -mastoHosting: Your Mastodon server webmentions: Webmentions - site + Fediverse bridge mastofeed: Mastofeed crossposting: Mastodon-Twitter crossposting mastoGallery: Artodon gallery feedPreview: Instance timeline preview feed2toot: RSS to Mastodon bot -trunk: Mass follow users based on common interests +trunk: Follow users based on common interests #GNU Social page timeline: Timeline for website @@ -124,7 +122,7 @@ selfhost: Self-hosting Friendica # Hubzilla page channel: Personal channels -permissions: Channel permissions and roles cheatsheet +permissions: 🌟 Channel permissions and roles cheatsheet #Pleroma page ownInstance: Setting up your instance @@ -154,3 +152,7 @@ translating: translating optionFive: Design promo materials. Print and distribute stickers: stickers thanks: Thank you. See you in # ...network name (context for translation) + +# Clients +pinafore: 🌟 Pinafore - alternative web interface +halcyon: 🌟 Halcyon - alternative web interface diff --git a/themes/starter/layout/_partial/join.ejs b/themes/starter/layout/_partial/join.ejs index df3190e..a4802f4 100644 --- a/themes/starter/layout/_partial/join.ejs +++ b/themes/starter/layout/_partial/join.ejs @@ -18,7 +18,7 @@ diff --git a/themes/starter/layout/diaspora.ejs b/themes/starter/layout/diaspora.ejs index b5be309..81f6a4d 100644 --- a/themes/starter/layout/diaspora.ejs +++ b/themes/starter/layout/diaspora.ejs @@ -7,6 +7,8 @@ network: true <% const data = site.data.diaspora.data; const servers = data.servers; + const tutorials = data.tutorials; + const tuts = [__('started')]; %> <%- partial('_partial/heroheader') %> @@ -21,10 +23,20 @@ network: true
-

<%- __('admins') %>

- Camo <%- __('proxy') %> -

<%- __('relay') %>

-

<%- __('tuts') %>

+

<%- __('tuts') %>

+
    + <% for (item in tutorials) { %> + <% let n = tutorials[item].id %> +
  • + <%= tuts[n] %> /  +
    • + <% } %> +
+
+
+

<%- __('techies') %>

+

🌟 Camo <%- __('proxy') %>

+

<%- __('relay') %>

diff --git a/themes/starter/layout/fediverse.ejs b/themes/starter/layout/fediverse.ejs index ef295e1..f6e1ed4 100644 --- a/themes/starter/layout/fediverse.ejs +++ b/themes/starter/layout/fediverse.ejs @@ -72,7 +72,7 @@ layout: layout
-

<%- __('serverLists') %>

+

<%- __('resources') %>

+
+

<%- __('techies') %>

+ +
diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index b388306..f2b6d65 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -7,9 +7,9 @@ network: true <% const data = site.data.mastodon.data; const tuts = [__('howto'), __('guide')]; - const uxList = [__('uMatch'), __('mastoGallery'), __('trunk')]; + const uxList = [__('pinafore'), __('halcyon'), __('uMatch'), __('mastoGallery'), __('trunk')]; const stats = [__('stats')]; - const tools = [__('preinstalled')]; + const tools = [__('preinstalled'), __('mediaHosting')]; const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot')]; %> diff --git a/themes/starter/layout/pleroma.ejs b/themes/starter/layout/pleroma.ejs index c9e600e..530d29c 100644 --- a/themes/starter/layout/pleroma.ejs +++ b/themes/starter/layout/pleroma.ejs @@ -9,7 +9,7 @@ network: true const tutorials = data.tutorials; const tuts = [__('ownInstance'), __('dualQuitter'), __('plRP3')]; const ux = data.forUsers; - const uxList = [ __('uMatch')]; + const uxList = [__('halcyon'), __('uMatch')]; %> <%- partial('_partial/heroheader') %>