Update Fediverse page: add new links, regroup

source/_data/fediverse.json

@@ -5,7 +5,7 @@
       "definition": "is a new word made of two words: “federation” + “universe”",
       "preamble": "It is a federated social network running on free open software on a myriad of computers across the globe. Many independent servers are interconnected and allow people to interact with one another. There's no one central site: you choose a server to register. This ensures some decentralization and sovereignty of data. Fediverse (also called Fedi) has no built-in advertisements, no tricky algorithms, no one big corporation dictating the rules. Instead we have small cozy communities of like-minded people. Welcome!",
       "info": "Fediverse social network differs from mainstream platforms (Facebook, Twitter, Instagram, Pinterest, etc). Mainstream platforms concentrate millions of users on one website, where they control all the decision-making, enforce censorship, and hoard users' data for commercial profit and spying. Fediverse platforms, on the other hand, are developed by a community of people from all over the world, independent from any company or official institution. You are free to register on any Fediverse website you like. You can choose the person who will be in charge of your data - the administrator of your server. If you have technical knowledge, you can administrate your own server for your friends and family, connecting with thousands of other independent servers across the web. Fediverse is an autonomous universe where power and data are decentralized and scattered across multiple lands.",
-      "history":
+      "reading":
         [
           {
             "title": "Privacy and Tracking on the Fediverse",
@@ -26,15 +26,10 @@
       "projects":
         ["nodes.fediverse.party", "fedidb.org", "fediverse.observer", "the-federation.info", "fediverse.to", "fedi.directory"],
       "knowledge":
-        ["fedi.tips", "joinfediverse.wiki", "fediverse.space", "fediverse.info"],
+        ["fedi.tips", "joinfediverse.wiki", "fediverse.info"],
+      "latest":
+        ["fediversereport.com", "wedistribute.org", "mitra.social/@weekinfediverse"],
       "forDevs":
-        ["fedidevs.org", "funfedi.dev"],
+        ["fedidevs.org", "funfedi.dev", "socialhub.activitypub.rocks"]
-      "reading":
-        [
-          {
-            "title": "Wikipedia article",
-            "url": "https://en.wikipedia.org/wiki/Fediverse"
-          }
-        ]
     }
 }

themes/starter/languages/en.yml

@@ -24,8 +24,8 @@ joinF: JOIN FEDIVERSE
 platforms: platforms
 protocols: protocols
 langs: programming languages
-history: history
 projects: related projects
+latest: latest news
 forDevs: developer resources
 reading: additional reading
 

themes/starter/layout/fediverse.ejs

@@ -62,14 +62,15 @@ layout: layout
         <a href="<%= platforms[item].url %>"><%= platforms[item].title %></a><span>,&nbsp;&nbsp;</span>
       </li>
       <% } %>
+      <li class="u-inline">and <a href="/en/miscellaneous">many more</a></li>
     </ul>
   </div>
 
   <div class="section">
-    <h4><%- __('langs') %></h4>
+    <h4><%- __('projects') %></h4>
     <ul class="article-list">
-      <% for (item in langs) { %>
+      <% for (item in fv.projects) { %>
-      <li><strong><%= langs[item].name %></strong>: <%= langs[item].networks %></li>
+      <li><a href="https://<%= fv.projects[item] %>"><%= fv.projects[item] %></a></li>
       <% } %>
     </ul>
   </div>
@@ -92,28 +93,10 @@ layout: layout
   </p>
 
   <div class="section">
-    <h4><%- __('history') %></h4>
+    <h4><%- __('latest') %></h4>
     <ul class="article-list">
-      <% for (item in fv.history) { %>
+      <% for (item in fv.latest) { %>
-      <li><a href="<%= fv.history[item].url %>"><%= fv.history[item].title %></a></li>
+      <li class="u-inline"><a href="https://<%= fv.latest[item] %>"><%= fv.latest[item] %></a></li>
-      <% } %>
-    </ul>
-  </div>
-
-  <div class="section">
-    <h4><%- __('projects') %></h4>
-    <ul class="article-list">
-      <% for (item in fv.projects) { %>
-      <li class="u-inline"><a href="https://<%= fv.projects[item] %>"><%= fv.projects[item] %></a></li>
-      <% } %>
-    </ul>
-  </div>
-
-  <div class="section">
-    <h4><%- __('forDevs') %></h4>
-    <ul class="article-list">
-      <% for (item in fv.forDevs) { %>
-      <li class="u-inline"><a href="https://<%= fv.forDevs[item] %>"><%= fv.forDevs[item] %></a></li>
       <% } %>
     </ul>
   </div>
@@ -127,5 +110,14 @@ layout: layout
     </ul>
   </div>
 
+  <div class="section">
+    <h4><%- __('forDevs') %></h4>
+    <ul class="article-list">
+      <% for (item in fv.forDevs) { %>
+      <li class="u-inline"><a href="https://<%= fv.forDevs[item] %>"><%= fv.forDevs[item] %></a></li>
+      <% } %>
+    </ul>
+  </div>
+
   <%- partial('_partial/buttons') %>
 </main>

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

@@ -202,7 +202,7 @@ sup {
 }
 
 .contents p:not(.u-nomargin) {
-  margin: 1em 0;
+  margin: 2em 0;
 }
 
 .contents .section {