Minor data and style updates

README.md

@@ -21,7 +21,7 @@ Read [Contributing](./CONTRIBUTING.md)
 
 #### Fediverse page
 
-*Data located in*: `/source/_data/fediversei18n.json` file
+*Data located in*: `/source/_data/fediverse.json` file
 
 #### Chronicles page
 
@@ -33,7 +33,7 @@ Read [Contributing](./CONTRIBUTING.md)
 
 #### Each network page
 
-*Data located in*: `/source/_data/..network.json` and `/source/_data/world18n.json` files
+*Data located in*: `/source/_data/..network.json` and `/source/_data/world.json` files
 
 #### Portal page
 
@@ -59,6 +59,6 @@ Adding another language requires additions to `_config` file and `/themes/starte
 Mandatory for translating:
 - create lang folder (`/source/*lang*`)
 - common strings (`/themes/starter/languages/en`)
-- `/source/_data` folder: fediversei18n.json, worldi18n.json
+- `/source/_data` folder: fediverse.json, world.json
 
 Translating Chronicles and Knowledge page content doesn't make sense (?). They will be mostly a collection of external English articles. If you're willing to become a permanent news contributor in another language and to search for Fediverse news in that language, let's discuss it in the issue.

source/_data/common.json

@@ -102,7 +102,7 @@
     [
       {
         "name": "PHP",
-        "networks": "Friendica, GNU Social, Social, Hubzilla, Osada, PixelFed, postActiv"
+        "networks": "FediBlog, Friendica, GNU Social, Hubzilla, Osada, PixelFed, postActiv, Social (Nextcloud)"
       },
       {
         "name": "Ruby",
@@ -110,7 +110,7 @@
       },
       {
         "name": "Python",
-        "networks": "Funkwhale, microblog.pub, Socialhome"
+        "networks": "Anfora, Funkwhale, microblog.pub, Reel2Bits, Socialhome"
       },
       {
         "name": "Elixir",
@@ -126,7 +126,7 @@
       },
       {
         "name": "Go",
-        "networks": "GangGo, WriteFreely"
+        "networks": "GangGo, Littr.go, read.as, WriteFreely"
       }
     ]
 }

source/_data/fediverse.json

@@ -3,7 +3,7 @@
   "article":
     {
       "definition": "is a portmanteau of two words “federation” and “universe”",
-      "preamble": "It is a common, widely acknowledged name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. This didn't do justice to a large set of macroblogging social networks that share same values and are reasonably popular. With the appearance of a new standard protocol called ActivityPub that will soon be supported by most federated networks it makes no sense to further divide the federated world into “OStatus” and “non-OStatus” projects. This WIKI unites all interoperable federated social networks under one term “Fediverse”.",
+      "preamble": "It is a common name for federated social networks running on free open software on a myriad of servers across the world. Historically, this term has included only microblogging platforms supporting a set of protocols called OStatus. This didn't do justice to a large number of projects that federate, share same values and are reasonably popular. With the appearance and wide adoption of a new standard protocol called ActivityPub it makes no sense to further divide the federated world into “OStatus” and “non-OStatus” projects. This guide unites all interoperable federated networks under one term “Fediverse”.",
       "info": "Fediverse social networks have many differences from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). For one, all of the federated networks are developed by the community of people all around the globe, independent from any corporation or official institution. This means that you can take part in the development and growth of the Fediverse. All skills are valuable: spreading the word, inviting friends are most welcome activities. Another difference of these social networks from corporate silos is the principle of federation. Mainstream networks concentrate millions of users on their servers. That gives them dangerous powers of controlling information and hoarding users' private data, using it for commercial profit (and who knows what other causes). Fediverse networks are designed to be run by anybody: you are free to choose and register on any server you like, you can choose the person who will be in charge of your data - the administrator of your server. If you have some technical knowledge, you can administrate your own server for your friends and family, at your will connecting with thousands of other independent servers across the web. In a sense, Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands, while mainstream corporate websites each made themselves a king (or a tyrant?) of their own huge land, surrounded with high fences, and reserve all the decision-making, data control and censorship to themselves. Fediverse has much more to it than it looks at first sight. You will meet many good friends here. But don't trust our word - check for yourself.",
       "history":
         [
@@ -36,8 +36,14 @@
           {
             "title": "Fediverse visualization",
             "url": "https://kumu.io/wakest/fediverse"
+          },
+          {
+            "title": "Fediverse hashtags visualization",
+            "url": "https://lucahammer.at/vis/fediverse/2018-08-30-mastoverse_hashtags"
           }
         ],
+      "servers":
+        ["fediverse.network", "podupti.me", "the-federation.info", "distsn.org", "fediverse.space"],
       "reading":
         [
           {

source/_data/miscellaneous.json

@@ -122,7 +122,7 @@
         "title": "Mobilizon",
         "source": "framagit.org/framasoft/mobilizon",
         "protocols": "ActivityPub",
-        "site": "joinmobilizon.org",
+        "site": "joinmobilizon.org/en",
         "logo": "",
         "servers": "the-federation.info/mobilizon",
         "apClass": true,
@@ -132,7 +132,7 @@
         "categories": ["Ev-Meet"]
       },
       {
-        "title": "reel2bits",
+        "title": "Reel2Bits",
         "source": "github.com/rhaamo/reel2bits",
         "protocols": "ActivityPub",
         "site": "",
@@ -148,7 +148,7 @@
         "title": "CommonsPub",
         "source": "gitlab.com/OpenCoop/CommonsPub",
         "protocols": "ActivityPub",
-        "site": "",
+        "site": "commonspub.org",
         "logo": "",
         "servers": "",
         "apClass": true,

themes/starter/languages/en.yml

@@ -23,6 +23,7 @@ joinF: JOIN FEDIVERSE
 networks: networks
 protocols: protocols
 langs: programming languages
+serverLists: server lists
 history: history
 projects: related projects
 reading: additional reading

themes/starter/layout/_partial/snowflake.ejs

@@ -1,4 +1,4 @@
 
-<svg class="f-highlight" role="img" aria-labelledby="f-snow" style="fill: #daba76;">
+<svg class="f-highlight" role="img" aria-labelledby="f-snow" style="fill: #fecb52;">
   <use xlink:href="#icon-snowflake"></use>
 </svg>

themes/starter/layout/fediverse.ejs

@@ -4,7 +4,8 @@ layout: layout
 ---
 
 <%
-  const fv = site.data.fediversei18n.article;
+  const fv = site.data.fediverse.article;
+  const servers = fv.servers;
   const networks = site.data.common.list;
   const protocols = site.data.common.protocols;
   const langs = site.data.common.langs;
@@ -50,11 +51,20 @@ layout: layout
     </ul>
   </div>
 
+  <div class="section">
+    <h4><%- __('serverLists') %></h4>
+    <ul class="article-list">
+      <% for (item in servers) { %>
+      <li class="u-inline"><a href="https://<%= servers[item] %>"><%= servers[item] %></a></li>
+      <% } %>
+    </ul>
+  </div>
+
   <p><%= fv.info %></p>
 
   <p class="u-center">
     <a href="https://the-federation.info" class="u-block u-emphasize btn-action centered"><%- __('joinF') %></a>
-    <small>* alternative lists of servers may be found on some network pages under “join the network” title</small>
+    <small>* alternative lists of servers can be found on network pages under “join the network” title</small>
   </p>
 
   <div class="section">

themes/starter/source/assets/scss/partials/_layout.scss

@@ -344,6 +344,7 @@ dfn {
   width: 7px;
   margin-right: .4em;
   margin-bottom: 3px;
+  margin: 0 .4em 3px;
   height: 7px;
   display: inline-block;
   border-radius: 50%;