Skip to content

Commit

Permalink
rework jekyll structure for modern jekyll, switch to jekyll-polyglot
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Jauernick committed Jul 31, 2024
1 parent 2165cb1 commit 3cdfda5
Show file tree
Hide file tree
Showing 27 changed files with 496 additions and 68 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ _drafts
.sass-cache
.jekyll-metadata
Gemfile.lock
vendor/
.bundle
*.sw*
12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ruby RUBY_VERSION
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "3.4.0"
gem "jekyll"

# This is the default theme for new Jekyll sites. You may change this to anything you like.
# gem "minima", "~> 2.0"
Expand All @@ -20,11 +20,13 @@ gem "jekyll", "3.4.0"

# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem "jekyll-paginate"
gem "jekyll-feed", "~> 0.17.0"
gem "jekyll-paginate"
gem "jekyll-polyglot"
end

gem 'jekyll-multiple-languages-plugin'

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "webrick", "~> 1.8"
gem "github-pages", "~> 231"
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ highlighter: rouge
gems:
- jekyll-feed
- jekyll-paginate
- jekyll-multiple-languages-plugin
- jekyll-polyglot
File renamed without changes.
4 changes: 2 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ <h5 class="white-text">Links</h5>
</ul>
</div>
<div class="col l6 offset-l2 s12 right-align">
<h5 class="white-text"><b>{% t site.title %}</b> {% t site.site %}</h5>
<h5 class="white-text"><b>{{ site.data[site.active_lang].site.title }}</b> {{ site.data[site.active_lang].site.site }}</h5>
<p class="grey-text text-lighten-4">{{ site.description }}</p>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container center-align">
Built for OpenNIC. All content &nbsp; <a href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="CC BY-SA 3.0" src="/assets/images/CC-BY-SA.png"></a> &nbsp; unless otherwise stated. <b><a href="https://github.com/opennic/opennic-web" class="white-text">{% t text.helpgit %}</a></b>
Built for OpenNIC. All content &nbsp; <a href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="CC BY-SA 3.0" src="/assets/images/CC-BY-SA.png"></a> &nbsp; unless otherwise stated. <b><a href="https://github.com/opennic/opennic-web" class="white-text">{{ site.data[site.active_lang].text.helpgit }}</a></b>
</div>
</div>
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>{% if page.title %}{% t page.title %} &#124; {% t site.title %} {% t site.site %}{% elsif page.ptitle %}{{ page.ptitle }} &#124; {% t site.title %} {% t site.site %}{% else %}{% t site.title %} {% t site.site %}{% endif %}</title>
<title>{% if page.title %}{{ site.data[site.active_lang].page.title }} &#124; {{ site.data[site.active_lang].site.title }} {{ site.data[site.active_lang].site.site }}{% elsif page.ptitle %}{{ page.ptitle }} &#124; {{ site.data[site.active_lang].site.title }} {{ site.data[site.active_lang].site.site }}{% else %}{{ site.data[site.active_lang].site.title }} {{ site.data[site.active_lang].site.site }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
{% feed_meta %}
<link type="text/css" rel="stylesheet" href="{{ "/assets/css/Material-icons.css" | prepend: site.baseurl }}" media="screen,projection">
Expand Down
24 changes: 12 additions & 12 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<div class="navbar-fixed">
<nav class="grey darken-4 {{ site.color.navbar }}-text z-depth-0">
<ul id="slide-out" class="side-nav">
<li><a href="{{ site.baseurl }}/" class="black-text">{% t title.home %}</a></li>
<li><a href="https://wiki.opennic.org/" class="black-text">{% t title.wiki %}</a></li>
<li><a href="{{ site.baseurl }}/" class="black-text">{{ site.data[site.active_lang].title.home }}</a></li>
<li><a href="https://wiki.opennic.org/" class="black-text">{{ site.data[site.active_lang].title.wiki }}</a></li>
<li><a href="{{ "/projects/" | prepend: site.baseurl }}" class="black-text">Projects</a></li>
<li><a href="{{ "/contact/" | prepend: site.baseurl }}" class="black-text">{% t title.contact %}</a></li>
<li><a href="https://servers.opennic.org/" class="black-text">{% t title.servers %}</a></li>
<li><a href="{{ "/announcements/" | prepend: site.baseurl }}" class="black-text">{% t title.announcements %}</a></li>
<li><a href="https://members.opennicproject.org/" class="black-text">{% t title.members %}</a></li>
<li><a href="{{ "/contact/" | prepend: site.baseurl }}" class="black-text">{{ site.data[site.active_lang].title.contact }}</a></li>
<li><a href="https://servers.opennic.org/" class="black-text">{{ site.data[site.active_lang].title.servers }}</a></li>
<li><a href="{{ "/announcements/" | prepend: site.baseurl }}" class="black-text">{{ site.data[site.active_lang].title.announcements }}</a></li>
<li><a href="https://members.opennicproject.org/" class="black-text">{{ site.data[site.active_lang].title.members }}</a></li>
</ul>
<div class="container container-large">
<a class="brand-logo" href="{{ site.baseurl }}/" class="{{ site.color.navbar }}-text"><span class="light {{ site.color.navbar }}-text"><b>{% t site.title %}</b> {% t site.site %}</span></a>
<a class="brand-logo" href="{{ site.baseurl }}/" class="{{ site.color.navbar }}-text"><span class="light {{ site.color.navbar }}-text"><b>{{ site.data[site.active_lang].site.title }}</b> {{ site.data[site.active_lang].site.site }}</span></a>
<ul class="right hide-on-med-and-down">
<li><a href="https://wiki.opennic.org/" class="{{ site.color.navbar }}-text">{% t title.wiki %}</a></li>
<li><a href="https://wiki.opennic.org/" class="{{ site.color.navbar }}-text">{{ site.data[site.active_lang].title.wiki }}</a></li>
<li><a href="{{ "/projects/" | prepend: site.baseurl }}" class="{{ site.color.navbar }}-text">Projects</a></li>
<li><a href="{{ "/contact/" | prepend: site.baseurl }}" class="{{ site.color.navbar }}-text">{% t title.contact %}</a></li>
<li><a href="https://servers.opennic.org/" class="{{ site.color.navbar }}-text">{% t title.servers %}</a></li>
<li><a href="{{ "/announcements/" | prepend: site.baseurl }}" class="{{ site.color.navbar }}-text">{% t title.announcements %}</a></li>
<li><a href="https://members.opennicproject.org/" class="{{ site.color.navbar }}-text">{% t title.members %}</a></li>
<li><a href="{{ "/contact/" | prepend: site.baseurl }}" class="{{ site.color.navbar }}-text">{{ site.data[site.active_lang].title.contact }}</a></li>
<li><a href="https://servers.opennic.org/" class="{{ site.color.navbar }}-text">{{ site.data[site.active_lang].title.servers }}</a></li>
<li><a href="{{ "/announcements/" | prepend: site.baseurl }}" class="{{ site.color.navbar }}-text">{{ site.data[site.active_lang].title.announcements }}</a></li>
<li><a href="https://members.opennicproject.org/" class="{{ site.color.navbar }}-text">{{ site.data[site.active_lang].title.members }}</a></li>
</ul>
<a href="#" data-activates="slide-out" class="button-collapse right {{ site.color.navbar }}-text"><i class="fa fa-bars" aria-hidden="true"></i></h2></a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="row">
<div class="col s12">
<div class="white z-depth-0">
<h2 class="thin {{ site.color.main }}-text">{% t page.title %}</h2>
<h2 class="thin {{ site.color.main }}-text">{{ site.data[site.active_lang].page.title }}</h2>
<br />
<article class="grey-text text-darken-2 post-content">
{{ content }}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
52 changes: 52 additions & 0 deletions announcements.en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
lang: en
layout: page
title: title.announcements

namespace: announcements

permalink: /announcements/
sitemap:
priority: 0.8
changefreq: 'daily'
---

<div class="row">
<div class="col s12 m6">
<h5>OpenNIC Press Releases</h5>
{% for post in site.posts %}
{% capture post_year %}{{ post.date | date: "%Y" }}{% endcapture %}
{% capture post_author %}{{ post.author }}{% endcapture %}
{% capture post_category %}{{ post.category[0] }}{% endcapture %}
{% if post_category != "Server Announcement" %}
{% if post_year != current_year %}
<p><strong>{{ post_year }}</strong></p>
{% capture current_year %}{{ post_year }}{% endcapture %}
{% endif %}
<div>
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>&nbsp;&nbsp;<div class="chip">{{ post.date | date: "%b %-d, %Y" }}</div>
</div>
{% endif %}
{% endfor %}
</div>
<div class="col s12 m6">
<h5>Server Announcements</h5>
{% for post in site.posts %}
{% capture post_year %}{{ post.date | date: "%Y" }}{% endcapture %}
{% capture post_author %}{{ post.author }}{% endcapture %}
{% capture post_category %}{{ post.category[0] }}{% endcapture %}
{% if post_category == "Server Announcement" %}
{% if post_year != current_year %}
<p><strong>{{ post_year }}</strong></p>
{% capture current_year %}{{ post_year }}{% endcapture %}
{% endif %}
<div>
<a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>&nbsp;&nbsp;<div class="chip">{{ post.date | date: "%b %-d, %Y" }}</div>
</div>
{% endif %}
{% endfor %}
<div>
<p><a class="waves-effect waves-light z-depth-0 blue btn" href="{{ "/2018/06/29/Announcements-Page.html#posting" | prepend: site.baseurl }}"><i class="material-icons left">create</i>New Post</a></p>
</div>
</div>
</div>
13 changes: 0 additions & 13 deletions announcements.html

This file was deleted.

48 changes: 48 additions & 0 deletions contact.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
lang: en
layout: page
title: title.contact

namespace: contact

permalink: /contact/
sitemap:
priority: 0.8
changefreq: 'weekly'
---

Currently, our only modes of official communication are IRC and the [mailing list](https://wiki.opennic.org/opennic/mailinglist). With an IRC client installed, you can connect with us using the following information:

- Server: irc.libera.chat:6697 (use SSL)
- Channel: #opennic

---

Need an IRC client? Here's some suggestions for various platforms:

- Windows: [HexChat](https://hexchat.github.io/), [mIRC](http://www.mirc.com/)
- Linux GUI: [XChat](http://www.xchat.org/), [Konversation](https://konversation.kde.org/)
- macOS: [Snak](http://www.snak.com/), [Colloquy](http://colloquy.info/), [Textual](https://www.codeux.com/textual/)
- Command Line: [irssi](https://www.irssi.org/), [WeeChat](https://weechat.org/)

Using a web based system (like ChromeOS)? Check out [KiwiIRC](https://kiwiirc.com/). Want a simple, hosted online solution? Check out [IRCCloud](https://www.irccloud.com/). Want to stay always connected with distributed clients? Check out [Quassel](https://quassel-irc.org/).

We can not support you with your IRC client, contact the developers of the client you're using if you have any issues. The links above are only suggestions and we can't be held responsible for any damage or issues they may cause.

---

Members of our community have also formed unofficial discussion centers where you may be able to find support.

<div class="row">
<div class="col s12 m6">
<div class="card" style="background-color: #7289da;">
<div class="card-content white-text">
<span class="card-title">OpenNIC on Discord</span>
<p>We have an unofficial Discord server operated by Jonah (ns11.opennic.glue) for support and discussion.</p>
</div>
<div class="card-action">
<a class="purple-text text-lighten-5" href="https://discord.gg/6qTNcEE">Join us on Discord</a>
</div>
</div>
</div>
</div>
13 changes: 0 additions & 13 deletions contact.md

This file was deleted.

Loading

0 comments on commit 3cdfda5

Please sign in to comment.