diff options
author | EuAndreh <eu@euandre.org> | 2020-10-05 21:27:57 -0300 |
---|---|---|
committer | EuAndreh <eu@euandre.org> | 2020-10-10 14:31:24 -0300 |
commit | a7c4db7e9215694ef6c50debcc0b4e7402265687 (patch) | |
tree | d45b89f1758b34416e5157cb0e7404276c6fa49a /_layouts | |
parent | cargo2nix: Use overlay on example (diff) | |
download | euandre.org-a7c4db7e9215694ef6c50debcc0b4e7402265687.tar.gz euandre.org-a7c4db7e9215694ef6c50debcc0b4e7402265687.tar.xz |
Refactor i18n structure, remove layouts, add slides
Yep, this commit is too big big I didn't want to take the trouble of splitting
it now.
- _config.yml translation keys are now simetrical on the entitiy: articles,
pastebins, tils, slides, etc.;
- _posts were moved to _articles: the _posts collection had special treatment in
Jekyll which I wanted to avoid;
- the filtering of entries for the Atom feed is now done inside the
_includes/feed.atom file instead of every feed file;
- all entities are now dealt with using the pluralized name: articles,
pastebins, tils, slides. No more inconsistencies on the key names, they now
should only make sense as the translation value on the dictionary;
- add base reveal.js infrastruture, with Jekyll generating the listing page and
nothing else.
Diffstat (limited to '_layouts')
-rw-r--r-- | _layouts/default.html | 11 | ||||
-rw-r--r-- | _layouts/index.html | 19 | ||||
-rw-r--r-- | _layouts/pastebins-listing.html | 12 | ||||
l--------- | _layouts/til.html | 1 | ||||
-rw-r--r-- | _layouts/tils-listing.html | 18 |
5 files changed, 6 insertions, 55 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 5eac517..ea12a36 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,8 +4,8 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <link rel="stylesheet" href="/styles.css" /> - <link rel="alternate" type="application/atom+xml" href="{% link {{ site.t.feed.url.blog[page.lang] }} %}" hreflang="{{ page.lang}}" title="{{ site.t.feed.title.blog[page.lang] }}" /> - <link rel="alternate" type="application/atom+xml" href="{% link {{ site.t.feed.url.til[page.lang] }} %}" hreflang="{{ page.lang}}" title="{{ site.t.feed.title.til[page.lang] }}" /> + <link rel="alternate" type="application/atom+xml" href="{% link {{ site.t.articles.feed.url[page.lang] }} %}" hreflang="{{ page.lang}}" title="{{ site.t.articles.feed.title[page.lang] }}" /> + <link rel="alternate" type="application/atom+xml" href="{% link {{ site.t.tils.feed.url[page.lang] }} %}" hreflang="{{ page.lang}}" title="{{ site.t.til.feed.title[page.lang] }}" /> <title>{{ page.title }} - EuAndreh</title> <meta property="og:site_name" content="{{ site.title }}" /> @@ -35,7 +35,7 @@ <header> <nav> <div id="nav-left"> - <a href="{% link {{ site.t.blog_url[page.lang] }} %}"><web>EuAndreh</web></pre></a> + <a href="{% link {{ site.t.articles.url[page.lang] }} %}">{{ site.t.articles.name[page.lang] }}</pre></a> </div> <div id="nav-right"> {% if page.ref != nil %} @@ -66,8 +66,9 @@ {% endfor %} </ul> {% endif %} - <a href="{% link {{ site.t.til_url[page.lang] }} %}">{{ site.t.til[page.lang] }}</a> - <a href="{% link {{ site.t.about_url[page.lang] }} %}">{{ site.t.about[page.lang] }}</a> + <a href="{% link {{ site.t.tils.url[page.lang] }} %}">{{ site.t.tils.name[page.lang] }}</a> + <a href="{% link {{ site.t.slides.url[page.lang] }} %}">{{ site.t.slides.name[page.lang] }}</a> + <a href="{% link {{ site.t.pages.about.url[page.lang] }} %}">{{ site.t.pages.about.name[page.lang] }}</a> </div> </nav> </header> diff --git a/_layouts/index.html b/_layouts/index.html deleted file mode 100644 index 3b0f281..0000000 --- a/_layouts/index.html +++ /dev/null @@ -1,19 +0,0 @@ ---- -layout: default ---- -<h2> - {{ site.t.recent_posts[page.lang] }} - <a href="{% link {{ site.t.feed.url.blog[page.lang] }} %}"> - <img class="simple-icon" src="/images/atom.svg" alt="{{ site.t.alt.atom[page.lang] }}" /> - </a> -</h2> -{% assign lposts=site.posts | where:"lang", page.lang | sort: 'date' | reverse %} -{% if lposts.size > 0 %} - <ul> - {%- for post in lposts -%} - <li> - <a href="{{ post.url }}">{{ post.title | escape }}</a> - {% include i18n-date.html date=post.date %} - </li> - {%- endfor -%} - </ul> -{% endif %} diff --git a/_layouts/pastebins-listing.html b/_layouts/pastebins-listing.html deleted file mode 100644 index 0c4a993..0000000 --- a/_layouts/pastebins-listing.html +++ /dev/null @@ -1,12 +0,0 @@ ---- -layout: default ---- -<h2>Pastebins listing</h2> -<ul> - {% assign pastebins = site.pastebins | sort: "date" | reverse %} - {%- for pastebin in pastebins -%} - <li> - <a href="{{ pastebin.url | relative_url }}">{{ pastebin.title | escape }}</a> - {% include i18n-date.html date=pastebin.date %} - </li> - {%- endfor -%} -</ul> diff --git a/_layouts/til.html b/_layouts/til.html deleted file mode 120000 index d6d72cf..0000000 --- a/_layouts/til.html +++ /dev/null @@ -1 +0,0 @@ -post.html
\ No newline at end of file diff --git a/_layouts/tils-listing.html b/_layouts/tils-listing.html deleted file mode 100644 index 0a59a19..0000000 --- a/_layouts/tils-listing.html +++ /dev/null @@ -1,18 +0,0 @@ ---- -layout: default ---- -<h2> - {{ site.t.til_listing[page.lang] }} - <a href="{% link {{ site.t.feed.url.til[page.lang] }} %}"> - <img class="simple-icon" src="/images/atom.svg" alt="{{ site.t.alt.atom[page.lang] }}" /> - </a> -</h2> -{{ content }} -<ul> - {% assign tils = site.tils | where:"lang", page.lang | sort: "date" | reverse %} - {%- for til in tils -%} - <li> - <a href="{{ til.url | relative_url }}">{{ til.title | escape }}</a> - {% include i18n-date.html date=til.date %} - </li> - {%- endfor -%} -</ul> |