diff --git a/source/_data/common.json b/source/_data/common.json index c7366ff..7ec0b9d 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -44,12 +44,6 @@ "smallImg": "/img/misskey.png", "descr": "Sophisticated microblogging with personality" }, - { - "title": "Osada", - "url" : "https://zotlabs.com/osada", - "smallImg": "/img/osada.png", - "descr": "Conversational style network powered by hyper-drive social engine" - }, { "title": "PeerTube", "url" : "https://joinpeertube.org/en", diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index eae7a5b..8b652ad 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -402,7 +402,20 @@ "zotClass": true, "diasporaClass": false, "OStatusClass": false, - "categories": ["Plugins"] + "categories": ["SN-ma"] + }, + { + "title": "Osada", + "source": "framagit.org/macgirvin/osada", + "protocols": "Zot", + "site": "zotlabs.com/osada", + "logo": "/img/misc/osada.svg", + "servers": "", + "apClass": false, + "zotClass": true, + "diasporaClass": false, + "OStatusClass": false, + "categories": ["SN-ma"] } ] } diff --git a/source/_data/numbers.json b/source/_data/numbers.json index ab0b82a..d46e464 100644 --- a/source/_data/numbers.json +++ b/source/_data/numbers.json @@ -2,78 +2,72 @@ { "list": { - "lastUpdate": "08/02/19", + "lastUpdate": "20/02/19", "diaspora": { - "population": "672.293", - "activeUsers": "67.812", - "podsNum": "305" + "population": "678.314", + "activeUsers": "70.724", + "podsNum": "298" }, "friendica": { - "population": "14.255", - "activeUsers": "2.349", + "population": "14.250", + "activeUsers": "2.382", "podsNum": "375" }, "hubzilla": { - "population": "6.495", - "activeUsers": "3.846", - "podsNum": "255" + "population": "6.508", + "activeUsers": "3.980", + "podsNum": "250" }, "ganggo": { - "population": "229", - "activeUsers": "129", + "population": "225", + "activeUsers": "121", "podsNum": "3" }, "socialhome": { - "population": "893", - "activeUsers": "342", - "podsNum": "2" + "population": "962", + "activeUsers": "366", + "podsNum": "5" }, "mastodon": { - "population": "1.941.086", - "activeUsers": "1.298.548", - "podsNum": "2.704" + "population": "1.973.994", + "activeUsers": "1.309.463", + "podsNum": "2.689" }, "gnusocial": { - "population": "13.119", + "population": "12.981", "activeUsers": "", - "podsNum": "142" + "podsNum": "140" }, "pleroma": { - "population": "9.255", + "population": "11.248", "activeUsers": "", - "podsNum": "454" + "podsNum": "446" }, "misskey": { - "population": "1.185", + "population": "1.070", "activeUsers": "", - "podsNum": "23" + "podsNum": "43" }, "peertube": { - "population": "12.553", + "population": "12.271", "activeUsers": "", - "podsNum": "307" - }, - "osada": - { - "population": "224", - "activeUsers": "219", - "podsNum": "12" + "podsNum": "308" }, "pixelfed": { - "population": "6.883", + "population": "7.200", "activeUsers": "3.948", - "podsNum": "40" + "podsNum": "37" } } } diff --git a/source/_data/osada.json b/source/_data/osada.json deleted file mode 100644 index e1f50ea..0000000 --- a/source/_data/osada.json +++ /dev/null @@ -1,44 +0,0 @@ - -{ - "data": - { - "title": "osada", - "category": "social network", - "type": "macroblogging", - "logoClr": "008000", - "created": "2018", - "official": "https://zotlabs.com/osada", - "license": "MIT", - "repo": "https://framagit.org/macgirvin/osada", - "language": "PHP", - "protocols": - [ - {"title": "Zot", "url": "https://project.hubzilla.org/help/developer/zot_protocol"}, - {"title": "ActivityPub", "url": "https://activitypub.rocks"} - ], - "wiki": "", - "servers": - [ - {"num": "1", "url": "https://the-federation.info/osada"}, - {"num": "2", "url": "https://fediverse.network/osada"}, - {"num": "3", "url": "https://osada.macgirvin.com/pubsites"} - ], - "mobile": "", - "forTechies": - [ - {"id": "0", "url": "https://framagit.org/zot/zap/blob/dev/spec/Zot6/Home.md"} - ], - "devTutorials": "https://framagit.org/macgirvin/osada/blob/master/install/INSTALL.txt", - "mascot": [{"item": "?"}], - "dwellers": "?", - "communities": "", - "descr": "Osada is a general-purpose social network that provides essential features as photo albums, file storage and groups / forums. Its unique hyper-drive engine helps users grow their social network. Osada supports Zot6 protocol which uses industry standards where possible, the latest version is incompatible with previous version of Zot.", - "connections": ["Friendica", "Hubzilla", "Mastodon", "Pleroma", "PeerTube", "Misskey"], - "donate": "", - "tracker": "https://framagit.org/macgirvin/osada/issues", - "bounty": "", - "translating": "", - "reading": "", - "notable": "" - } -} diff --git a/source/en/osada/index.md b/source/en/osada/index.md deleted file mode 100644 index 56a918c..0000000 --- a/source/en/osada/index.md +++ /dev/null @@ -1,9 +0,0 @@ - ---- -layout: "osada" -title: "Osada" -network: "osada" -subtitle: "powered by hyper-drive social engine" -banner: "/img/osada-bg.jpg" -percent: "45% 50%" ---- diff --git a/source/img/misc/osada.svg b/source/img/misc/osada.svg new file mode 100644 index 0000000..1796da4 --- /dev/null +++ b/source/img/misc/osada.svg @@ -0,0 +1,2 @@ + + diff --git a/themes/starter/languages/en.yml b/themes/starter/languages/en.yml index 1ddfefc..2daee5e 100644 --- a/themes/starter/languages/en.yml +++ b/themes/starter/languages/en.yml @@ -133,9 +133,6 @@ permissions: Channel permissions and roles cheatsheet ownInstance: Setting up your instance dualQuitter: Dual boot with qvitter -#Osada page -zot6: Zot6 specification - # Contributing partial foreword: Please, keep in mind that you are a participant, not a customer. promptStart: If you'd like to help the diff --git a/themes/starter/layout/_partial/svgfont.ejs b/themes/starter/layout/_partial/svgfont.ejs index 684b741..c9358c7 100644 --- a/themes/starter/layout/_partial/svgfont.ejs +++ b/themes/starter/layout/_partial/svgfont.ejs @@ -71,10 +71,6 @@ - - - - diff --git a/themes/starter/layout/osada.ejs b/themes/starter/layout/osada.ejs deleted file mode 100644 index 1175b17..0000000 --- a/themes/starter/layout/osada.ejs +++ /dev/null @@ -1,40 +0,0 @@ - ---- -layout: layout ---- - -<% - const data = site.data.osada.data; - const tx = data.forTechies; - const txList = [ __('zot6')]; -%> - -<%- partial('_partial/heroheader') %> - -
- - <%- partial('_partial/header') %> - -
- <%- partial('_partial/generalinfo') %> -
-
-

<%- __('techies') %>

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