From a87b3b4a6e59f6e1ca8bdf83c8fed8bce7413d74 Mon Sep 17 00:00:00 2001 From: lostinlight Date: Sat, 2 Mar 2019 23:55:00 +0300 Subject: [PATCH] Correct json data dupe, update PeerTube --- source/_data/diaspora.json | 2 +- source/_data/friendica.json | 2 +- source/_data/ganggo.json | 2 +- source/_data/gnusocial.json | 2 +- source/_data/hubzilla.json | 4 +- source/_data/mastodon.json | 6 +-- source/_data/misskey.json | 2 +- source/_data/peertube.json | 35 ++++++------ source/_data/pixelfed.json | 2 +- source/_data/pleroma.json | 2 +- source/_data/socialhome.json | 2 +- source/en/peertube/index.md | 2 +- themes/starter/languages/en.yml | 4 +- .../starter/layout/_partial/contributing.ejs | 4 +- themes/starter/layout/hubzilla.ejs | 2 +- themes/starter/layout/peertube.ejs | 53 +++++++++++++++++++ 16 files changed, 86 insertions(+), 40 deletions(-) create mode 100644 themes/starter/layout/peertube.ejs diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json index 78bb12f..672656d 100644 --- a/source/_data/diaspora.json +++ b/source/_data/diaspora.json @@ -23,7 +23,7 @@ "proxy": "https://wiki.diaspora.software/Installation/Camo", "relay": "https://relay.iliketoast.net", "tutorials": "https://diaspora.software/tutorials", - "devTutorials": "https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers", + "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.", diff --git a/source/_data/friendica.json b/source/_data/friendica.json index f3db032..84a0c46 100644 --- a/source/_data/friendica.json +++ b/source/_data/friendica.json @@ -33,7 +33,7 @@ {"id": "1", "url": "https://github.com/friendica/friendica/wiki/DreamHost-Friendica-Install-Guide"}, {"id": "2", "url": "https://github.com/friendica/friendica/wiki/How-to%3A-Hosting-a-Friendica-site-at-home"} ], - "devTutorials": "https://github.com/friendica/friendica/tree/master/doc", + "devTutorial": "https://github.com/friendica/friendica/tree/master/doc", "utilities": [ {"id": "0", "url": "https://github.com/pafcu/RSStoFriendika"} diff --git a/source/_data/ganggo.json b/source/_data/ganggo.json index fe9de04..c2980f6 100644 --- a/source/_data/ganggo.json +++ b/source/_data/ganggo.json @@ -22,7 +22,7 @@ {"num": "2", "url": "https://fediverse.network/ganggo"} ], "mobile": "https://play.google.com/apps/testing/io.github.ganggo", - "devTutorials": "https://ganggo.git.feneas.org/documentation", + "devTutorial": "https://ganggo.git.feneas.org/documentation", "mascot": [{"item": "GangGo (good-natured creature)"}], "dwellers": "ganggorians", "communities": "", diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json index 1d5c96e..5d4ea15 100644 --- a/source/_data/gnusocial.json +++ b/source/_data/gnusocial.json @@ -26,7 +26,7 @@ {"id": "0", "url": "http://thomask.sdf.org/social/en/user/getting_started.html"}, {"id": "1", "url": "https://gnusocial.net/doc/faq"} ], - "devTutorials": "http://thomask.sdf.org/social/en/admin/installing_gnu_social.html", + "devTutorial": "http://thomask.sdf.org/social/en/admin/installing_gnu_social.html", "utilities": [ {"id": "0", "url": "https://github.com/blankoworld/eli"}, diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index e4f830d..c30b9a8 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -33,7 +33,7 @@ {"id": "2", "url": "https://project.hubzilla.org/help/tutorials/personal_channel"} ], - "devTutorials": "https://github.com/redmatrix/hubzilla/wiki/Deploying-Hubzilla#install-and-set-up-the-basics", + "devTutorial": "https://github.com/redmatrix/hubzilla/wiki/Deploying-Hubzilla#install-and-set-up-the-basics", "cheatsheets": [ {"id": "0", "url": "/img/hubzilla-permissions.png"} @@ -58,7 +58,7 @@ "information": [ "By default Hubzilla account federates only within Hubzilla network. You need to turn on ActivityPub and diaspora plugins in profile settings in order to connect with your friends from other networks", - "When you recall a Hubzilla direct message in \"mail\", your message is removed from conversation on both sides (is deleted from the database of the server you're using and from your correspondent's server). This works only between Hubzilla contacts. If you exchange direct messages with friends from diaspora, Friendica, etc, recalling a message will not delete if from their conversations and servers - because those networks do not allow direct message deletion", + "When you recall a Hubzilla direct message in \"mail\", your message is removed from conversation on both sides (is deleted from the database of the server you're using and from your correspondent's server). This works only between Hubzilla contacts. If you exchange direct messages with friends from diaspora, Friendica, etc, recalling a message on your side will not delete it from their servers - because those networks do not allow direct message deletion", "Sharing files is possible only between Hubzilla users, friends from other networks will not have access to shared files" ], "donate": "https://salt.bountysource.com/teams/hubzilla", diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index ba777a6..9a0abbc 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -39,11 +39,7 @@ {"id": "1", "url": "https://alexschroeder.ch/wiki/2017-11-16_How_to_Mastodon"}, {"id": "2", "url": "https://gist.github.com/joyeusenoelle/74f6e6c0f349651349a0df9ae4582969"} ], - "devTutorial": - [ - {"id": "0", "url": "https://anystack.xyz/how-to-install-mastodon-ubuntu"} - ], - "devTutorials": "https://github.com/tootsuite/documentation", + "devTutorial": "https://github.com/tootsuite/documentation", "metrics": [ {"id": "0", "url": "https://mnm.social"}, diff --git a/source/_data/misskey.json b/source/_data/misskey.json index 1fa17ea..1639a7c 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -21,7 +21,7 @@ {"num": "2", "url": "https://fediverse.network/misskey"} ], "mobile": "https://joinmisskey.github.io/en/wiki/apps", - "devTutorials": "https://github.com/syuilo/misskey/blob/master/docs/setup.en.md", + "devTutorial": "https://github.com/syuilo/misskey/blob/master/docs/setup.en.md", "mascot": [{"item": "藍 (Ai)", "imgNum": "1"}], "dwellers": "Miskist", "communities": "", diff --git a/source/_data/peertube.json b/source/_data/peertube.json index 2410065..d47bd79 100644 --- a/source/_data/peertube.json +++ b/source/_data/peertube.json @@ -15,39 +15,36 @@ {"title": "ActivityPub", "url": "https://activitypub.rocks"} ], "wiki": "https://docs.joinpeertube.org", - "servers": [ + "servers": + [ {"num": "1", "url": "https://instances.joinpeertube.org/instances"}, {"num": "2", "url": "https://the-federation.info/peertube"}, {"num": "3", "url": "https://fediverse.network/peertube"} ], "mobile": "https://gitlab.com/agosto182/p2play", - "devTutorials": "https://docs.joinpeertube.org/lang/en/docs/install.html", + "forUsers": + [ + {"id": "0", "url": "https://docs.joinpeertube.org/lang/en/userdocs"} + ], + "tutorials": + [ + {"id": "0", "url": "https://docs.joinpeertube.org/lang/en/docs"} + ], + "devTutorial": "https://docs.joinpeertube.org/lang/en/docs/install.html", + "metrics": + [ + {"id": "0", "url": "https://instances.joinpeertube.org/instances/stats"} + ], "mascot": [{"item": "octopus", "imgNum": "1"}], "dwellers": "peertubers", "communities": "", "descr": "Unlike centralized video platforms, PeerTube considers each user as a person, and not as a product to track and sell advertisements. PeerTube's goal is to create a network of small interconnected video hosting providers. Users are free to choose the hoster of their videos according to terms of service and moderation policy. There are no recommendation algorithms and no need to give away extended copyright to your work. PeerTube video broadcasting is peer-to-peer (through WebRTC): when other people watch a PeerTube video at the same time as you, as long as your tab remains open, your browser shares bits of that video and you participate in a healthier use of the Internet. Videos hosted on PeerTube can be viewed directly from Mastodon and (soon) other Fediverse networks.", - "connections": ["Mastodon", "Pleroma", "Friendica"], + "connections": ["Friendica", "Mastodon", "Pleroma"], "donate": "https://soutenir.framasoft.org/en", "tracker": "https://github.com/Chocobozzz/PeerTube/issues", "bounty": "", "translating": "https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/translation.md", "reading": "", - "metrics": - [ - {"id": "0", "url": "https://instances.joinpeertube.org/instances/stats"} - ], - "forUsers": - [ - {"id": "0", "url": "https://docs.joinpeertube.org/lang/en/userdocs/"} - ], - "tutorials": - [ - {"id": "0", "url": "https://docs.joinpeertube.org/lang/en/docs/"} - ], - "devTutorial": - [ - {"id": "0", "url": "https://docs.joinpeertube.org/lang/en/devdocs/index.html"} - ], "notable": [ { diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json index 91b0fc1..4eb31c2 100644 --- a/source/_data/pixelfed.json +++ b/source/_data/pixelfed.json @@ -22,7 +22,7 @@ {"num": "2", "url": "https://fediverse.network/pixelfed"} ], "mobile": "https://github.com/glitchpizza/morii", - "devTutorials": "https://github.com/pixelfed/pixelfed#installation", + "devTutorial": "https://github.com/pixelfed/pixelfed#installation", "mascot": [{"item": "?"}], "dwellers": "?", "communities": "", diff --git a/source/_data/pleroma.json b/source/_data/pleroma.json index 158a630..32a9175 100644 --- a/source/_data/pleroma.json +++ b/source/_data/pleroma.json @@ -33,7 +33,7 @@ {"id": "1", "url": "https://git.pleroma.social/pleroma/pleroma-fe/wikis/dual-boot-with-qvitter"}, {"id": "2", "url": "https://github.com/wimvanderbauwhede/limited-systems/wiki/Pleroma-and-Mastodon-on-the-Raspberry-Pi-3"} ], - "devTutorials": "https://git.pleroma.social/pleroma/pleroma/wikis/home", + "devTutorial": "https://git.pleroma.social/pleroma/pleroma/wikis/home", "mascot": [{"item": "?"}], "dwellers": "?", "communities": "", diff --git a/source/_data/socialhome.json b/source/_data/socialhome.json index 82c72d9..2548177 100644 --- a/source/_data/socialhome.json +++ b/source/_data/socialhome.json @@ -22,7 +22,7 @@ {"num": "2", "url": "https://fediverse.network/socialhome"} ], "mobile": "", - "devTutorials": "https://socialhome.readthedocs.io/en/latest/running.html", + "devTutorial": "https://socialhome.readthedocs.io/en/latest/running.html", "mascot": [{"item": "pony", "imgNum": "1"}], "dwellers": "?", "communities": "", diff --git a/source/en/peertube/index.md b/source/en/peertube/index.md index 1697845..c7ec4c4 100644 --- a/source/en/peertube/index.md +++ b/source/en/peertube/index.md @@ -1,6 +1,6 @@ --- -layout: "generic" +layout: "peertube" title: "PeerTube" network: "peertube" subtitle: "Take back the control of your videos" diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index ce92081..c5b2f6d 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -86,6 +86,8 @@ note: note soon: coming soon uMatch: Find users similar to you by their vocabulary wizard: SERVER WIZARD +userGuide: User guide +adminGuide: Administrator guide # diaspora page proxy: proxy @@ -124,8 +126,6 @@ installation: Installation selfhost: Self-hosting Friendica # Hubzilla page -memberGuide: Member guide -adminGuide: Administrator guide channel: Personal channels permissions: Channel permissions and roles cheatsheet diff --git a/themes/starter/layout/_partial/contributing.ejs b/themes/starter/layout/_partial/contributing.ejs index acefefc..e133c91 100644 --- a/themes/starter/layout/_partial/contributing.ejs +++ b/themes/starter/layout/_partial/contributing.ejs @@ -23,8 +23,8 @@ <%- __('optionOne2') %>
  • - <% if (data.devTutorials) { %> - <%- __('setUp') %> <%- __('optionTwo') %> + <% if (data.devTutorial) { %> + <%- __('setUp') %> <%- __('optionTwo') %> <% } else { %> <%- __('setUp') %> <%- __('optionTwo') %> <% } %> diff --git a/themes/starter/layout/hubzilla.ejs b/themes/starter/layout/hubzilla.ejs index 07fd85f..130cd32 100644 --- a/themes/starter/layout/hubzilla.ejs +++ b/themes/starter/layout/hubzilla.ejs @@ -7,7 +7,7 @@ layout: layout const data = site.data.hubzilla.data; const tutorials = data.tutorials; const cheatsheets = data.cheatsheets; - const tuts = [__('memberGuide'), __('adminGuide'), __('channel')]; + const tuts = [__('userGuide'), __('adminGuide'), __('channel')]; const sheets = [__('permissions')]; %> diff --git a/themes/starter/layout/peertube.ejs b/themes/starter/layout/peertube.ejs new file mode 100644 index 0000000..27b11b4 --- /dev/null +++ b/themes/starter/layout/peertube.ejs @@ -0,0 +1,53 @@ + +--- +layout: layout +--- + +<% + const data = site.data.peertube.data; + const tutorials = data.tutorials; + const tuts = [__('adminGuide')]; + const ux = data.forUsers; + const uxList = [ __('userGuide')]; +%> + +<%- partial('_partial/heroheader') %> + +
    + + <%- partial('_partial/header') %> + +
    + <%- partial('_partial/generalinfo') %> +
    +
    +

    <%- __('users') %>

    +
      + <% for (item in ux) { %> + <% let n = ux[item].id %> +
    • + <%= uxList[n] %> +
      • + <% } %> +
    +
    +
    +

    <%- __('tuts') %>

    +
      + <% for (item in tutorials) { %> + <% let n = tutorials[item].id %> +
    • + <%= tuts[n] %> +
      • + <% } %> +
    +
    +
    +
    + + <%- partial('_partial/world') %> +
    + <%- partial('_partial/contributing') %> + + <%- partial('_partial/buttons') %> +