Merge branch 'master' into 'feature-rick-astley'
# Conflicts: # _includes/header.html
This commit is contained in:
commit
c90f94f1e1
14
.gitlab-ci.yml
Normal file
14
.gitlab-ci.yml
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
stages:
|
||||
- deploy
|
||||
|
||||
deploy-master:
|
||||
stage: deploy
|
||||
tags:
|
||||
- website
|
||||
only:
|
||||
- master
|
||||
script:
|
||||
- jekyll build
|
||||
- rsync --recursive _site/ /srv/deploy/
|
||||
|
||||
|
||||
|
|
@ -4,3 +4,6 @@ defaults:
|
|||
path: ""
|
||||
values:
|
||||
layout: "page"
|
||||
langs:
|
||||
de: "DE"
|
||||
en: "EN"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,17 @@
|
|||
<div class="whitebox footer">
|
||||
<a href="#">Zom.bi</a>
|
||||
/
|
||||
Design by <a href="#">bsod</a>, <a href="#">Ranomier</a> and <a href="#">madmaurice</a>
|
||||
Design by <a href="#">bsod</a>,
|
||||
<a href="#">Ranomier</a> and
|
||||
<a href="#">madmaurice</a>
|
||||
/
|
||||
<a rel="license"
|
||||
href="http://creativecommons.org/licenses/by-nc-sa/3.0/de/">
|
||||
Content and Design licensed under
|
||||
<img alt="Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Germany License"
|
||||
style="border-width:0"
|
||||
src="https://i.creativecommons.org/l/by-nc-sa/3.0/de/80x15.png" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
<title>{{ page.title }} - Zom.bi</title>
|
||||
|
||||
<link rel="stylesheet" href="{{ "/assets/css/foundation.css" | relative_url }}">
|
||||
<link rel="stylesheet" href="{{ "/assets/css/index.css" | relative_url }}">
|
||||
<link rel="stylesheet" href="{{ "assets/css/foundation.css" | relative_url }}">
|
||||
<link rel="stylesheet" href="{{ "assets/css/index.css" | relative_url }}">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{% for node in site.pages %}
|
||||
{% if node.url == page.url %}
|
||||
<li><a href="{{ node.url }}" class="is-active">{{ node.menutitle }}</a></li>
|
||||
{% else %}
|
||||
<li><a href="{{ node.url }}">{{ node.menutitle }}</a></li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{%- for node in site.pages -%}
|
||||
{%- if node.lang == page.lang and node.menutitle -%}
|
||||
{%- if node.url == page.url -%}
|
||||
<li><a href="{{ node.url }}" class="is-active">{{ node.menutitle | escape }}</a></li>
|
||||
{%- else -%}
|
||||
<li><a href="{{ node.url }}">{{ node.menutitle | escape }}</a></li>
|
||||
{%- endif -%}
|
||||
{%- endif -%}
|
||||
{%- endfor -%}
|
||||
<li><a href="https://git.zom.bi/explore/projects">Git</a></li>
|
||||
<li><a href="https://wiki.zom.bi/">Wiki</a></li>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,13 @@
|
|||
{% include header.html %}
|
||||
<div class="medium-12 columns content-box">
|
||||
<div class="whitebox">
|
||||
<div class="lang-list">
|
||||
{% assign translations = site.pages | where: "ref", page.ref | sort: 'lang' %}
|
||||
{% for node in translations %}
|
||||
<a href="{{ node.url }}">{{ site.langs[node.lang] | escape }}</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{{ content }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -135,6 +135,12 @@ body {
|
|||
.whitebox h2 { color: #1eb513; font-size: 1.5em; }
|
||||
.whitebox h3 { color: #1eb513; font-size: 1em; }
|
||||
|
||||
.whitebox .lang-list {
|
||||
font-size: 0.8rem;
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.sidebar .boxhead {
|
||||
font-size:1.1rem;
|
||||
text-transform: uppercase;
|
||||
|
|
|
|||
34
index-en.md
Normal file
34
index-en.md
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
---
|
||||
title: The friendly neighborhood undead tech community
|
||||
menutitle: Home
|
||||
lang: en
|
||||
ref: home
|
||||
---
|
||||
|
||||
# Welcome to Zombi
|
||||
|
||||
## Who are we?
|
||||
|
||||
Zombi is a small community with about 25 members, who are mostly from
|
||||
Germany and Austria, but also include people from other parts of
|
||||
Europe and North America. Our community is rather dynamic: People from
|
||||
all over the world occasionaly find their way to our Mumble server or
|
||||
into our [XMPP group chat](xmpp://zombi@conference.zom.bi), and decide
|
||||
to stay. We get to know a lot of interesting people. Of course the
|
||||
topics don't have to be technical. Often we discuss cultural
|
||||
differences, current events or talk about anything and everything. New
|
||||
friendships are formed and are strengthened, sometimes even by
|
||||
exchanging sweets and delicacies.
|
||||
|
||||
## What do we do?
|
||||
|
||||
Apart from the daily discussions, we also do projects of every kind
|
||||
together. One of the long-living projects is the administration of our
|
||||
Linux root server, which hosts our Mumble server, mail server, Gitlab,
|
||||
DNS, a Nextcloud instance, a web service for synchronized video watching
|
||||
and a bunch of more services for our members.
|
||||
|
||||
Sometimes we play games together whether it'd be in person or through
|
||||
the internet. Among the latter are games like Minecraft, Rust, CS:GO,
|
||||
Dota 2, TableTop Simulator, Arma 3, Guns of Icarus and whatever else
|
||||
sounds fun.
|
||||
2
index.md
2
index.md
|
|
@ -1,6 +1,8 @@
|
|||
---
|
||||
title: The friendly neighborhood undead tech community
|
||||
menutitle: Startseite
|
||||
lang: de
|
||||
ref: home
|
||||
---
|
||||
|
||||
# Willkommen bei Zombi
|
||||
|
|
|
|||
29
mumble-en.md
Normal file
29
mumble-en.md
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
---
|
||||
title: Mumble
|
||||
menutitle: Mumble
|
||||
lang: en
|
||||
ref: mumble
|
||||
---
|
||||
|
||||
# Mumble
|
||||
|
||||
<img src="/assets/images/Icons_mumble.svg" width="200" style="float: right; margin-left: 50px; margin-right: 40px" />
|
||||
|
||||
Our community hosts a Mumble server. If you want to contact us or talk about
|
||||
Technology or any other topic, you can connect to our Mumble server.
|
||||
|
||||
You can find our Mumble server here: Unser Mumble-Server findet sich unter:
|
||||
[mumble.zom.bi](mumble://mumble.zom.bi)
|
||||
|
||||
Mumble is an Open Source VOIP software, which provides low latency and high
|
||||
audio quality. You can find more information on the
|
||||
[official webpage for Mumble](https://wiki.mumble.info/wiki/Main_Page).
|
||||
|
||||
For the mobile users among you there is
|
||||
[Mumblefy for Apple iOS](https://itunes.apple.com/us/app/mumblefy/id858752232?mt=8)
|
||||
and the
|
||||
[Plumble app for Android](https://play.google.com/store/apps/details?id=com.morlunk.mumbleclient.free&hl=en)
|
||||
|
||||
We would like you to join our discussions and conversations. The more ther merrier!
|
||||
|
||||
<span style="clear: right"/>
|
||||
Loading…
Reference in a new issue