Commit 17c7185f authored by Niklaus Hofer's avatar Niklaus Hofer

Merge branch 'sponsoring_site' into 'master'

Sponsor Subpage

See merge request chaostreffbern/chaostreffbern_website!202
parents 9f137198 5601ffca
Title: Impressum
Slug: impressum
Date: 2015-04-13
Modified: 2018-12-16
Lang: de
## License
......@@ -22,7 +23,3 @@ info [at] chaostreffbern.ch
**Sources**<br />
<span class="glyphicon glyphicon-pencil"></span>
[GitLab](https://git.chaostreffbern.ch/chaostreffbern/chaostreffbern_website)
**Hosting**<br />
<span class="glyphicon glyphicon-cloud"></span>
Hosting provided by [cirrax](https://www.cirrax.com/)
Title: Sponsoren
Slug: sponsoren
Date: 2018-12-16
Modified: 2018-12-16
Lang: de
Wir möchten uns ganz herzlich bei unseren Sponsoren bedanken. Diese tragen einen Teil dazu bei, dass es den Hackerspace gibt:
## Hosting
Das Hosting unserer Server wird von <a href="https://www.cirrax.com/"><img alt="Cloud Logo" height="12px" src="/images/cirrax/logo_cloud.svg" /><img alt="Cirrax" height="12px" src="/images/cirrax/cirrax.svg"/></a> Cloud zur Verfügung gestellt.
## Network Connectivity
Der Internetzugang unseres Spaces wird von <a href="https://www.init7.net/de/"><img alt="init7" height="25px" src="/images/init7/init7-logo-rgb.jpg"/></a> zur Verfügung gestellt.
Title: Impressum
Slug: impressum
Date: 2015-04-13
Modified: 2018-12-16
Lang: en
## License
......@@ -22,7 +23,3 @@ info [at] chaostreffbern.ch
**Sources**<br />
<span class="glyphicon glyphicon-pencil"></span>
[GitLab](https://git.chaostreffbern.ch/chaostreffbern/chaostreffbern_website)
**Hosting**<br />
<span class="glyphicon glyphicon-cloud"></span>
Hosting provided by [cirrax](https://www.cirrax.com/)
Title: Sponsors
Slug: sponsoren
Date: 2018-12-16
Modified: 2018-12-16
Lang: en
We would like to thank all of our sponsors.
## Hosting
Hosting of our servers is provided by <a href="https://www.cirrax.com/"><img alt="Cloud Logo" height="12px" src="/images/cirrax/logo_cloud.svg" /><img alt="Cirrax" height="12px" src="/images/cirrax/cirrax.svg"/></a> Cloud.
## Network Connectivity
The network connectivity of our space is provided by <a href="https://www.init7.net/en/"><img alt="init7" height="25px" src="/images/init7/init7-logo-rgb.jpg"/></a>.
......@@ -65,6 +65,7 @@ MENUITEMS = [
('Protokolle', 'protokolle.html'),
('Mitgliedschaft', 'membership.html'),
('Unterlagen', 'unterlagen.html'),
('Sponsoren', 'sponsoren.html'),
]),
('Projekte', '#', [
('Keysigning', 'keysigning.html'),
......@@ -103,6 +104,7 @@ I18N_SUBSITES = {
('Protocols', 'protokolle.html'),
('Membership', 'membership.html'),
('Media', 'unterlagen.html'),
('Sponsors', 'sponsoren.html'),
]),
('Projects', '#', [
('Keysigning', 'keysigning.html'),
......
......@@ -137,18 +137,9 @@
</div>
{% endblock footer_left %}
{% block footer_middle %}
<center>
<div class="col-md-6">
Hosting provided by
<a href="https://www.cirrax.com/">
<img alt="Cloud Logo" height="12px" src="/images/cirrax/logo_cloud.svg" />
<img alt="Cirrax" height="12px" src="/images/cirrax/cirrax.svg"/></a>
Cloud
</div>
</center>
{% endblock footer_middle %}
{% block footer_right %}
<div class="col-md-3"><p class="text-muted pull-right"><a class="text-muted" href="impressum.html">Impressum</a></p></div>
<div class="col-md-9"><p class="text-muted pull-right"><a class="text-muted" href="impressum.html">Impressum</a></p></div>
{% endblock footer_right %}
{% endblock footer %}
</div>
......
......@@ -37,7 +37,7 @@
<p>
{% if DEFAULT_LANG == 'de' %}
Bis zur Eröffnung unseres neuen Hackerspaces, finden keine wöchentlichen Treffen statt. Die Eröffnung <a href="einweihung_kyburgstrasse_13_einladung.html">findet am Samstag, 2019-13-16 statt</a>.
Bis zur Eröffnung unseres neuen Hackerspaces, finden keine wöchentlichen Treffen statt. Die Eröffnung <a href="einweihung_kyburgstrasse_13_einladung.html">findet am Samstag, 2019-03-16 statt</a>.
{% elif DEFAULT_LANG == 'en' %}
Until the official opening of our new Hackerspace, there are no weekly meetings. The official opening will take place on <a href="einweihung_kyburgstrasse_13_einladung.html">Saturday, 2019-03-16</a>
{% endif %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment