From f2a97fb1130f5e6cb848e572ae4594c233f82dfa Mon Sep 17 00:00:00 2001 From: lostinlight Date: Mon, 28 May 2018 03:05:57 +0300 Subject: [PATCH] Add network connections, minor updates --- source/_data/aardwolf.json | 1 + source/_data/common.json | 2 +- source/_data/diaspora.json | 1 + source/_data/friendica.json | 1 + source/_data/ganggo.json | 1 + source/_data/gnusocial.json | 1 + source/_data/hubzilla.json | 1 + source/_data/mastodon.json | 1 + source/_data/misskey.json | 1 + source/_data/peertube.json | 1 + source/_data/pleroma.json | 1 + source/_data/postactiv.json | 3 ++- source/_data/socialhome.json | 1 + themes/starter/languages/en.yml | 4 ++-- themes/starter/layout/_partial/world.ejs | 9 +++++++++ themes/starter/layout/diaspora.ejs | 2 +- themes/starter/layout/friendica.ejs | 4 ++-- themes/starter/layout/gnusocial.ejs | 2 +- themes/starter/layout/hubzilla.ejs | 4 ++-- themes/starter/layout/mastodon.ejs | 10 +++++----- themes/starter/layout/peertube.ejs | 2 +- themes/starter/layout/pleroma.ejs | 2 +- themes/starter/layout/postactiv.ejs | 5 +++++ .../starter/source/assets/scss/partials/_layout.scss | 10 +++++++++- 24 files changed, 52 insertions(+), 18 deletions(-) diff --git a/source/_data/aardwolf.json b/source/_data/aardwolf.json index 7a930b2..89d3bdf 100644 --- a/source/_data/aardwolf.json +++ b/source/_data/aardwolf.json @@ -19,6 +19,7 @@ "devTutorials": "https://github.com/BanjoFox/aardwolf/blob/master/INSTALL.md", "notable": "", "communities": "", + "connections": [], "donate": "https://liberapay.com/Aardwolf", "tracker": "https://github.com/BanjoFox/aardwolf/issues", "bounty": "", diff --git a/source/_data/common.json b/source/_data/common.json index 10dc34f..62e9323 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -122,7 +122,7 @@ }, { "name": "(Node)JS", - "networks": "pump.io, PeerTube" + "networks": "Misskey, PeerTube, pump.io" }, { "name": "Go", diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json index 6225ab4..cc2e5d3 100644 --- a/source/_data/diaspora.json +++ b/source/_data/diaspora.json @@ -66,6 +66,7 @@ } ], "communities": "", + "connections": ["Friendica", "Hubzilla", "Socialhome", "GangGo"], "tracker": "https://github.com/diaspora/diaspora/issues", "bounty": "https://www.bountysource.com/teams/diaspora", "translating": "https://wiki.diasporafoundation.org/Contribute_translations" diff --git a/source/_data/friendica.json b/source/_data/friendica.json index 2f0e6d1..416edd1 100644 --- a/source/_data/friendica.json +++ b/source/_data/friendica.json @@ -42,6 +42,7 @@ } ], "communities": "https://dir.friendica.social/directory/forums", + "connections": ["diaspora*", "Hubzilla", "GNU Social", "Mastodon", "Socialhome", "GangGo", "Pleroma", "postActiv"], "tracker": "https://github.com/friendica/friendica/issues", "bounty": "", "translating": "https://www.transifex.com/Friendica/friendica" diff --git a/source/_data/ganggo.json b/source/_data/ganggo.json index a95d7dd..abab482 100644 --- a/source/_data/ganggo.json +++ b/source/_data/ganggo.json @@ -19,6 +19,7 @@ "devTutorials": "https://ganggo.github.io/development.html", "notable": "", "communities": "", + "connections": ["diaspora*", "Friendica", "Hubzilla", "Socialhome"], "tracker": "https://github.com/ganggo/ganggo/issues", "bounty": "", "translating": "" diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json index 3865f39..6563565 100644 --- a/source/_data/gnusocial.json +++ b/source/_data/gnusocial.json @@ -54,6 +54,7 @@ } ], "communities": "http://laemeur.sdf.org/gs/group-index.html", + "connections": ["postActiv", "Mastodon", "Pleroma", "Friendica", "Hubzilla"], "tracker": "https://git.gnu.io/gnu/gnu-social/issues", "bounty": "", "translating": "https://www.transifex.com/gnu-social/gnu-social" diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index 8aff31f..5289449 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -33,6 +33,7 @@ ], "notable": "", "communities": "https://hub.libranet.de/directory?f=&global=1&pubforums=1", + "connections": ["diaspora*", "Friendica", "GNU Social", "Mastodon", "Socialhome", "GangGo", "Pleroma", "postActiv"], "tracker": "https://github.com/redmatrix/hubzilla/issues", "bounty": "https://salt.bountysource.com/teams/hubzilla", "translating": "" diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index 6afed62..cabd21d 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -186,6 +186,7 @@ } ], "communities": "https://github.com/distributopia/masto-world-overview", + "connections": ["GNU Social", "Friendica", "Hubzilla", "postActiv", "Pleroma", "Misskey"], "donate": "https://liberapay.com/Mastodon", "tracker": "https://github.com/tootsuite/mastodon/issues", "bounty": "", diff --git a/source/_data/misskey.json b/source/_data/misskey.json index 9871e50..feff949 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -18,6 +18,7 @@ "devTutorials": "https://github.com/syuilo/misskey/blob/master/docs/setup.en.md", "notable": "", "communities": "", + "connections": ["Mastodon"], "donate": "https://www.patreon.com/syuilo", "tracker": "https://github.com/syuilo/misskey/issues", "bounty": "", diff --git a/source/_data/peertube.json b/source/_data/peertube.json index 5538c43..eab33ca 100644 --- a/source/_data/peertube.json +++ b/source/_data/peertube.json @@ -22,6 +22,7 @@ "devTutorials": "https://peertube.frama.wiki/technics:installation", "notable": "", "communities": "", + "connections": ["videos can be viewed directly from Mastodon, Hubzilla"], "donate": "https://soutenir.framasoft.org/en", "tracker": "https://github.com/Chocobozzz/PeerTube/issues", "bounty": "", diff --git a/source/_data/pleroma.json b/source/_data/pleroma.json index f5c4008..50b5031 100644 --- a/source/_data/pleroma.json +++ b/source/_data/pleroma.json @@ -25,6 +25,7 @@ "devTutorials": "https://git.pleroma.social/pleroma/pleroma/wikis/home", "notable": "", "communities": "", + "connections": ["GNU Social", "Mastodon", "Misskey", "postActiv", "Friendica", "Hubzilla"], "tracker": "https://git.pleroma.social/pleroma/pleroma/issues", "bounty": "", "translating": "" diff --git a/source/_data/postactiv.json b/source/_data/postactiv.json index 1ae038d..ab69164 100644 --- a/source/_data/postactiv.json +++ b/source/_data/postactiv.json @@ -15,11 +15,12 @@ ], "docs": "http://www.postactiv.com/docs", "wiki": "", - "servers": "", + "servers": "https://fediverse.network/postactiv", "mobile": "", "devTutorials": "http://gitea.postactiv.com/postActiv/postActiv/src/master/INSTALL.md", "notable": "", "communities": "", + "connections": ["GNU Social", "Mastodon"], "donate": "https://www.patreon.com/postActiv", "tracker": "http://gitea.postactiv.com/postActiv/postActiv/issues", "bounty": "https://www.postactiv.com/bounties/index.html", diff --git a/source/_data/socialhome.json b/source/_data/socialhome.json index 568a8c1..bdf27ca 100644 --- a/source/_data/socialhome.json +++ b/source/_data/socialhome.json @@ -19,6 +19,7 @@ "devTutorials": "https://socialhome.readthedocs.io/en/latest/running.html", "notable": "", "communities": "", + "connections": ["diaspora*", "Friendica", "Hubzilla", "GangGo"], "tracker": "https://github.com/jaywink/socialhome/issues", "bounty": "", "translating": "" diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index ab1c18a..c261bcc 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -75,9 +75,9 @@ people: people world: world mascot: mascot dwellers: dwellers -creatures: creatures -stars: notable accounts communities: communities +connections: connects +stars: notable accounts contributing: contributing note: note soon: coming soon diff --git a/themes/starter/layout/_partial/world.ejs b/themes/starter/layout/_partial/world.ejs index eb800f8..c08fd6b 100644 --- a/themes/starter/layout/_partial/world.ejs +++ b/themes/starter/layout/_partial/world.ejs @@ -5,6 +5,7 @@ const world = site.data.worldi18n.worlds[w]; const data = site.data[network].data; const numbers = site.data.numbers.list[network]; + const connections = data.connections; const stars = data.notable; const reading = world.reading; %> @@ -47,6 +48,14 @@ <%- __('soon') %> <% } %> +
+

<%- __('connections') %>

+ +
diff --git a/themes/starter/layout/diaspora.ejs b/themes/starter/layout/diaspora.ejs index a97fabb..54e1b6c 100644 --- a/themes/starter/layout/diaspora.ejs +++ b/themes/starter/layout/diaspora.ejs @@ -24,7 +24,7 @@ layout: layout diff --git a/themes/starter/layout/friendica.ejs b/themes/starter/layout/friendica.ejs index 8f91302..05effc4 100644 --- a/themes/starter/layout/friendica.ejs +++ b/themes/starter/layout/friendica.ejs @@ -29,7 +29,7 @@ layout: layout @@ -41,7 +41,7 @@ layout: layout <% for (item in tutorials) { %> <% let n = tutorials[item].id %>
  • - <%= tuts[n] %> /  + <%= tuts[n] %> / 
    • <% } %> diff --git a/themes/starter/layout/gnusocial.ejs b/themes/starter/layout/gnusocial.ejs index 76cb152..ec80beb 100644 --- a/themes/starter/layout/gnusocial.ejs +++ b/themes/starter/layout/gnusocial.ejs @@ -33,7 +33,7 @@ layout: layout <% for (item in tutorials) { %> <% let n = tutorials[item].id %>
  • - <%= tuts[n] %> /  + <%= tuts[n] %> / 
    • <% } %> diff --git a/themes/starter/layout/hubzilla.ejs b/themes/starter/layout/hubzilla.ejs index e055b69..9a9fdd5 100644 --- a/themes/starter/layout/hubzilla.ejs +++ b/themes/starter/layout/hubzilla.ejs @@ -32,7 +32,7 @@ layout: layout <% for (item in tutorials) { %> <% let n = tutorials[item].id %>
  • - <%= tuts[n] %> /  + <%= tuts[n] %> / 
    • <% } %> @@ -43,7 +43,7 @@ layout: layout <% for (item in cheatsheets) { %> <% let n = cheatsheets[item].id %>
  • - <%= sheets[n] %> /  + <%= sheets[n] %> / 
    • <% } %> diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index f330395..9666594 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -34,7 +34,7 @@ layout: layout @@ -50,7 +50,7 @@ layout: layout <% for (item in tutorials) { %> <% let n = tutorials[item].id %>
  • - <%= tuts[n] %> /  + <%= tuts[n] %> / 
    • <% } %> @@ -61,7 +61,7 @@ layout: layout <% for (item in metrics) { %> <% let s = metrics[item].id %>
  • - <%= stats[s] %> /  + <%= stats[s] %> / 
    • <% } %> @@ -92,7 +92,7 @@ layout: layout <% for (item in services) { %> <% let b = services[item].id %>
  • - <%= tools[b] %> /  + <%= tools[b] %> / 
    • <% } %> @@ -101,7 +101,7 @@ layout: layout <% for (item in forks) { %> <% let b = forks[item].id %>
  • - <%= forkTitles[b] %> /  + <%= forkTitles[b] %> / 
    • <% } %> diff --git a/themes/starter/layout/peertube.ejs b/themes/starter/layout/peertube.ejs index 9e6dca4..158bc76 100644 --- a/themes/starter/layout/peertube.ejs +++ b/themes/starter/layout/peertube.ejs @@ -23,7 +23,7 @@ layout: layout diff --git a/themes/starter/layout/pleroma.ejs b/themes/starter/layout/pleroma.ejs index 3728ec2..c3397c2 100644 --- a/themes/starter/layout/pleroma.ejs +++ b/themes/starter/layout/pleroma.ejs @@ -28,7 +28,7 @@ layout: layout <% for (item in tutorials) { %> <% let n = tutorials[item].id %>
  • - <%= tuts[n] %> /  + <%= tuts[n] %> / 
    • <% } %> diff --git a/themes/starter/layout/postactiv.ejs b/themes/starter/layout/postactiv.ejs index 15226cb..e910846 100644 --- a/themes/starter/layout/postactiv.ejs +++ b/themes/starter/layout/postactiv.ejs @@ -15,7 +15,12 @@ layout: layout
    <%- partial('_partial/generalinfo') %> +
    +
    +

    <%- __('join') %>

    + <%- __('nodeList') %> +

    <%- __('techies') %>

    <%- __('docs') %>

    diff --git a/themes/starter/source/assets/scss/partials/_layout.scss b/themes/starter/source/assets/scss/partials/_layout.scss index 4ae7d6b..2ca11a0 100644 --- a/themes/starter/source/assets/scss/partials/_layout.scss +++ b/themes/starter/source/assets/scss/partials/_layout.scss @@ -101,6 +101,13 @@ ol { padding-left: 1em; } +dfn { + font-style: inherit; + cursor: pointer; + border: 1px dashed $golden; + padding: .2em .1em .1em; +} + .f-icon { fill: $white; &:hover { @@ -237,7 +244,8 @@ ol { margin-right: 1em; } -.section-list li:last-of-type > span { +.section-list li:last-of-type > span, +.article-list li:last-of-type > span { display: none; }