Skip to content

Commit 2a8ee2a

Browse files
hrefhrefhrefhref
committedMay 28, 2017
moar work
1 parent 96814b7 commit 2a8ee2a

25 files changed

+329
-9
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
_site/
22
.sass-cache/
33
.jekyll-metadata
4+
_data/instances_mastodon.json

‎_data/apps.yml

+10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
name: Amaroq
77
link: https://appsto.re/us/OfFxib.i
88
source: https://github.com/ReticentJohn/Amaroq
9+
910
- id: android
1011
apps:
1112
- id: tusky
@@ -21,3 +22,12 @@
2122
name: Twidere
2223
link: https://play.google.com/store/apps/details?id=org.mariotaku.twidere
2324
source: https://github.com/TwidereProject/Twidere-Android
25+
26+
- id: terminal
27+
apps:
28+
- id: toot
29+
name: Toot
30+
link: https://github.com/ihabunek/toot
31+
source: https://github.com/ihabunek/toot
32+
33+

‎_data/resources.yml

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
-
2+
name: "Mastodon User Guide"
3+
lang: en
4+
link: http://mastoguide.info
5+
categories:
6+
- guides
7+
8+
- name: "Mastodon Wiki (english)"
9+
lang: en
10+
link: http://en.mstdn.wiki/Main_Page
11+
categories:
12+
- guides
13+
14+
- name: "Mastodon Wiki (french)"
15+
lang: fr
16+
link: http://fr.mstdn.wiki/Main_Page
17+
categories:
18+
- guides
19+
20+
- name: "Mastodon Wiki (japanese)"
21+
lang: ja
22+
link: http://ja.mstdn.wiki/Main_Page
23+
categories:
24+
- guides
25+
26+
27+
- name: "Mastodon Instances list"
28+
lang: en
29+
link: https://instances.mastodon.xyz/list
30+
categories:
31+
- fediverse
32+
33+
- name: "Fediverse Radar"
34+
lang: en
35+
link: https://radar.amberstone.digital/
36+
categories:
37+
- fediverse
38+
39+
40+
- name: "Tuskr"
41+
lang: en
42+
link: http://tuskr.xyz
43+
categories:
44+
- search
45+
46+
- name: "Mastory - Mastodon user directory"
47+
lang: en
48+
link: http://mastory.social/
49+
categories:
50+
- search
51+
52+
- name: "dlvrit - toot to tweets"
53+
lang: en
54+
link: https://dlvrit.com/
55+
categories:
56+
- tools
57+
58+
- name: "mastofeed - embedded mastodon"
59+
lang: en
60+
link: https://www.mastofeed.com/
61+
categories:
62+
- tools
63+

‎_data/resources_categories.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- guides
2+
- tools
3+
- search

‎_i18n/en.yml

+20-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ categories:
1313
tools: Tools
1414
apps: Apps
1515
news: News
16+
servers: Servers
17+
resources: Resources
1618

1719
pages:
1820
index: Home
@@ -30,15 +32,32 @@ titles:
3032
admin: Administrator's Guides
3133
servers: Servers software
3234
mastodon_tools: Tools for Mastodon
33-
protocols: Standards protocols
35+
mastodon_apps: Applications for Mastodon
36+
protocols: OStatus - Standards protocols
37+
resources: Resources
38+
39+
descriptions:
40+
protocols: The standardized technology behind the federation
3441

3542
index:
3643
title: Welcome to the Fediverse
3744
subtitle: an open, free, decentralized and federated social network
3845

46+
servers:
47+
maturities:
48+
stable: Stable
49+
unstable: In Development
50+
dead: Abandonned
51+
3952
apps:
4053
get: Get
4154
platforms:
4255
ios: For iOS (iPhone, iPad)
4356
android: For Android
57+
terminal: Command Line
4458

59+
resources:
60+
categories:
61+
tools: Tools
62+
search: Search
63+
guides: Guides

‎_i18n/en/apps/toot.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Written in Python

‎_i18n/en/resources/content.md

Whitespace-only changes.

‎_i18n/en/servers/gnusocial.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The first OStatus server

‎_i18n/en/servers/gnusocial/content.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
GNU Social is the first server implemanting the federation. Created by Evan Prodoromou, then named Laconica, for the identi.ca website, which
3+
was later renamed to **status.net** before being abandoned and merged into the GNU Social project and Free Social.
4+
5+
Most of the [standards protocols]({% tl protocols %}) originated from GNU Social.

‎_i18n/en/servers/mastodon.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Created in 2016 by @Gargon

‎_i18n/en/servers/mastodon/content.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Mastodon was created by [Eugen Rochko][eugen] ("Gargon") in 2016 and was the first alternative to [GNU Social]({% tl gnusocial %}).
2+
3+
[eugen]: https://mastodon.social/@Gargon

‎_includes/footer.html

+11-4
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,21 @@
2626
<strong>fed.ialis.me</strong> by <a href="https://soc.ialis.me/about/collective">the soc.ialis.me collective</a>
2727
and <a href="https://github.com/ialisme/fed.ialis.me/graphs/contributors">contributors</a>.
2828
<br />
29+
Contribute to the website content or translations at GitHub: <a
30+
href="https://github.com/ialisme/fed.ialis.me">ialisme/fed.ialis.me</a>.
31+
<br /><br />
2932
<small>
30-
Site source and content is <a href="http://unlicense.org">unlicensed</a> in the public domain.<br/>
31-
Kopimi, happy.
33+
<a href="https://github.com/ialisme/fed.ialis.me/">Site source and content</a> is
34+
<a href="http://unlicense.org">unlicensed</a> in the <strong>public domain</strong>.
35+
<i>Kopimi.</i>
36+
Illustrations by <a href="https://famine.space">Famine</a>.
3237
</small>
3338
</p>
3439
<p>
35-
<a class="icon" href="https://github.com/ialisme/fed.ialis.me">
36-
<i class="fa fa-github"></i>
40+
<br />
41+
<a href="http://www.kopimi.com/kopimi">
42+
<img src="/assets/images/k.png" title="kopimi (copy me), symbol showing that you want to be copied."
43+
alt="Kopimi (copy me), symbol showing that you want to be copied."/>
3744
</a>
3845
</p>
3946
</div>

‎_includes/header.html

+12
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,22 @@
66
<!-- Hero content: will be in the middle -->
77
<div class="hero-body">
88
<div class="container">
9+
<p class="breadcrumbs">
10+
{% if page.breadcrumbs %}
11+
{% for parent in page.breadcrumbs %}
12+
<a href="{% tl parent %}">{% t titles.{{ parent }} %}</a> /
13+
{% endfor %}{% else %}
14+
{% if page.category == page.namesapce %}
15+
{% else %}
16+
<a href="{% tl page.category %}">{% t categories.{{ page.category }} %}</a> /
17+
{% endif %}{% endif %}
18+
</p>
919
<h1 class="title">
1020
{% t page.title %}
1121
</h1>
22+
<br/>
1223
<h2 class="subtitle">
24+
{% t page.description %}
1325
</h2>
1426
</div>
1527
</div>

‎_includes/header_menu.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<a href="{% tl apps %}" class="nav-item is-tab {% if page.category == 'apps' %}is-active{% endif %}">
2121
{% t categories.apps %}
2222
</a>
23-
<a href="{% tl tools %}" class="nav-item is-tab {% if page.category == 'tools' %}is-active{% endif %}">
24-
{% t categories.tools %}
23+
<a href="{% tl resources %}" class="nav-item is-tab {% if page.category == 'resources' %}is-active{% endif %}">
24+
{% t categories.resources %}
2525
</a>
2626
<a href="{% tl news %}" class="nav-item is-tab {% if page.category == 'news' %}is-active{% endif %}">
2727
{% t categories.news %}

‎_layouts/page.html

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
{% include lang_pickers.html %}
77
<div class="content">
88
{{ content }}
9+
<hr />
10+
<ul>
11+
{% for link in page.see_also %}
12+
<li><a href="{% tl link %}">{% t titles.{{ link }} %}</a></li>
13+
{% endfor %}
14+
</ul>
915
</div>
1016
</div>
1117
</section>

‎assets/css/style.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
background-color: rgba(48,68,76,0.9);
1111
}
1212
#smallhead .hero-body {
13-
height: inherit;
13+
height: 160px;
1414
padding: 1.5rem 1.5rem;
1515
}
16-
#smallhead .hero-body .title {
16+
#smallhead .hero-body .title, #smallhead .hero-body .subtitle {
1717
background-color: rgba(48,68,76,0.7);
1818
padding: 5px;
1919
display: inline-block

‎assets/images/apps/toot.png

3.08 KB
Loading

‎assets/images/header_outline.png

38.3 KB
Loading

‎assets/images/k.png

2.03 KB
Loading

‎mastodon/tools.md

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ category: tools
55
namespace: mastodon_tools
66
permalink: /mastodon/tools/
77
permalink_fr: /mastodon/outils/
8+
breadcrumbs:
9+
- tools
10+
- mastodon
811
---
912

1013
## Basic Guides

‎protocols.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
layout: page
33
title: titles.protocols
4+
description: descriptions.protocols
45
namespace: protocols
56
permalink: /protocols/
67
permalink_fr: /protocoles/

‎refresh_data.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env sh
2+
3+
echo "Downloading _data/instances_mastodon.json from instances.mastodon.xyz..."
4+
5+
curl -s -S https://instances.mastodon.xyz/instances.json > _data/instances_mastodon.json
6+
7+

‎resources.html

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
---
2+
layout: page
3+
title: titles.resources
4+
namespace: resources
5+
permalink: /resources/
6+
permalink_fr: /ressources/
7+
category: resources
8+
---
9+
10+
{% tf resources/content.md %}
11+
12+
<nav class="tabs is-centered">
13+
<ul>
14+
{% for category in site.data.resources_categories %}
15+
<li><a href="#{{ category }}">{% t resources.categories.{{ category }} %}</a></li>
16+
{% endfor %}
17+
</ul>
18+
</nav>
19+
20+
<div class="columns is-multiline">
21+
{% for app in site.data.resources %}
22+
<div class="column is-one-third">
23+
<div class="card">
24+
<div class="card-content">
25+
<div class="media">
26+
<div class="media-left">
27+
<figure class="image is-48x48">
28+
<img src="/assets/images/resources/{{ app.id }}.png">
29+
</figure>
30+
</div>
31+
<div class="media-content">
32+
<p class="title is-4"><a href="{{ app.link }}" class="is-large">{{ app.name }}</a></p>
33+
<div class="subtitle is-6">
34+
{% for server in app.server %}
35+
<a href="{% tl {{ server }} %}" >
36+
<span class="tag is-grey">{% t titles.{{ server }} %}</span>
37+
</a>
38+
{% endfor %}
39+
</div>
40+
</div>
41+
</div>
42+
43+
<div class="content">
44+
description?
45+
</div>
46+
</div>
47+
48+
<div class="card-footer">
49+
<a href="{{ app.link }}" class="card-footer-item">
50+
{% t resources.get %}
51+
</a>
52+
{% if app.pricing %}
53+
<span class="card-footer-item">
54+
<strong>{{ app.pricing }}</strong>
55+
</span>
56+
{% else %}
57+
<span class="card-footer-item">
58+
{% t global.free %}
59+
</span>
60+
{% endif %}
61+
{% if app.source %}
62+
<a href="{{ app.source }}" class="card-footer-item">
63+
{% t global.opensource %}
64+
</a>
65+
{% endif %}
66+
</div>
67+
68+
</div>
69+
</div>
70+
{% endfor %}
71+
</div>
72+

‎servers/mastodon.md

+26
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,32 @@ namespace: mastodon
55
permalink: /mastodon/
66
permalink_fr: /mastodon/
77
category: servers
8+
see_also:
9+
- mastodon_tools
10+
- mastodon_apps
811
---
912

13+
<div class="level is-small">
14+
<p class="level-item">
15+
<figure class="image is-48x48">
16+
<img src="/assets/images/servers/{{ page.namespace }}.png">
17+
</figure>
18+
</p>
19+
20+
<p class="level-item">
21+
<a href="{{ server.link }}" class="card-footer-item">www</a>
22+
</p>
23+
24+
<p class="level-item">
25+
{% if server.source %}
26+
<a href="{{ server.source }}" class="card-footer-item">
27+
{% t global.opensource %}
28+
</a>
29+
{% else %}
30+
Closed source
31+
{% endif %}
32+
</p>
33+
34+
</div>
35+
1036
{% tf servers/mastodon/content.md %}

0 commit comments

Comments
 (0)
Please sign in to comment.