Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms

content/contents.lr

@@ -8,3 +8,16 @@ There is not much here - everything is stored below /u/.
 You should actually not be able to see this page below ungleich.ch. If
 you do, please let us know.
 ---
+slider:
+
+title:
+
+description:
+
+button_text:
+
+button_link:
+
+background_image:
+
+video_mp4:

content/u/blog/deutschsprachiger-coronavirus-chat/contents.lr

@@ -15,6 +15,7 @@ Wo man sich über den Virus austauschen kann
 ---
 body:
 
+
 ## Wie es funktioniert in Kürze
 
 * Gehe auf https://account.ungleich.ch und erzeuge einen neuen Account

content/u/products/bgp-peering/contents.lr

@@ -1,4 +1,4 @@
-_discoverable: no
+_discoverable: yes
 ---
 _hidden: no
 ---
@@ -6,3 +6,48 @@ title: BGP Peering
 ---
 subtitle: Manage your own address space
 ---
+---
+headline1: BGP Peering
+---
+headline2: Your own IP Space
+---
+headline3: At Data Center Light
+---
+header_background_color: #6298CB
+---
+header_text_color: text-light
+---
+content1_text:
+
+## For whom is BGP peering?
+
+If you have your own ASN with IPv6 or IPv4 address space, you can
+announce it in our data centers.
+
+## What is required for BGP peering
+
+To be able to peer with us, you will need to have IP addresses in our
+data center. This is the case if you have one of these products:
+
+* [A Data Center Light VM](../virtual-machine-hosting/)
+* [An IPv6 Only VM](../ipv6-only-hosting/)
+* [Physical co-located hardware](../colocation/)
+
+## How to setup BGP peering
+
+Send a mail to support -at- ungleich.ch containing the following
+information:
+
+* Your ASN and the list of networks you intend to announce
+* Your local IP addresses
+
+Before we can peer, ensure that all objects in the RIPE database are
+setup correctly. Specifically ensure that you have
+
+* route6 / route objects
+* inet6num / inetnum objects
+* ROA / RPKI configured
+
+## Pricing
+
+Setting up peering has a 42 CHF one time fee.

content/u/products/ipv6-vpn/contents.lr

@@ -6,16 +6,18 @@ title: IPv6 VPN
 ---
 subtitle: Take your IPv6 with you.
 ---
-image: /u/image/cards/ipv6-vpn.jpg
+image: /u/image/cards/ipv6vpn.jpg
 ---
-headline1: IPv6
+headline1: Get IPv6
+---
+headline2: Anywhere, anytime
+---
+headline3: IPv6 VPN
+---
+header_background_color: #1393B4
 ---
-headline2: VPN
-----
-header_background_color: #7B95D4
-----
 header_text_color: text-light
-----
+---
 nav_classes: navbar-dark
 ---
 feature1_title: Versatile
@@ -35,7 +37,9 @@ feature3_text: The VPN works in situations where you have NAT, NAT64
 or other network inspection modes in place. It just requires UDP
 traffic to pass.
 ---
-description1:
+content1_text:
+
+##IPv6 VPN
 
 At ungleich we believe that IPv6 should be available everywhere. To
 help you connecting to IPv6 only resources, we offer the IPv6-VPN.
@@ -50,3 +54,16 @@ One VPN is free for all existing customers with resources on
 
 You can find more about the VPN and technical details,
 on [IPv6VPN.ch](https://ipv6vpn.ch).
+--- 
+content1_image /u/image/ipv6-vpn-ungleich-swiss.jpg
+---
+offer1_title: IPv6 VPN 120 CHF/Year
+---
+offer1_text:
+* IPv6 addresses registerd in Switzerland
+* 80 bit of IPv6 space
+* Encrypted
+* with a /48 network 
+
+---
+offer1_link: https://datacenterlight.ch/product/ipv6-vpn-48/

content/u/projects/this-week-via-ipv6/contents.lr

@@ -2,6 +2,8 @@ title: This.week.via-IPv6.com
 ---
 subtitle: What happens in a week with IPv6?
 ---
+_discoverable: no
+---
 content:
 
 To be able to track what is going on in the IPv6 world, we created a

models/page-2020.ini

@@ -17,3 +17,7 @@ type = markdown
 [fields.image]
 label = Image
 type = url
+
+[fields.slider]
+type = flow
+flow_blocks = slider

templates/blocks/slider.html

@@ -0,0 +1,3 @@
+<div class="text-block text-block-{{ this.class }}">
+  {{ this.text }}
+</div>

templates/layout-2020.html

@@ -99,6 +99,12 @@
         </form>
       </div>
     </nav>
+    {# Priority:
+    If slider given, take slider.
+    If headline1/2/3 given, take the headline.
+    Else default to boxed title + subtitle
+    #}
+
     {% if this.headline1 or this.headline2 or this.headline3 %}
     <div class="jumbotron jumbotron-fluid" style="background-color: {{this.header_background_color}};">
       <div class="container-fluid">

templates/summary-page.html

@@ -6,6 +6,22 @@
 
 <div class="container">
   {% for childpage in this.children %}
+
+  {# Setup default settings for the overview #}
+
+  {% if childpage.header_background_color %}
+      {% set div_style = 'background-color:' + childpage.header_background_color + ';' %}
+  {% else %}
+      {% set div_style = 'background-color: #6FB0E5;' %}
+  {% endif %}
+
+  {% if childpage.header_text_color %}
+      {% set div_classes = childpage.header_text_color %}
+  {% else %}
+      {% set div_classes = 'text-light' %}
+  {% endif %}
+
+
   {% if loop.first %}
   <div class="row mb-3">
     {% endif %}
@@ -16,8 +32,13 @@
         <img class="card-img-top" src="{{ childpage.image }}"
              alt="{{ childpage.title }}">
         {% else %}
-        <img class="card-img-top" src="/u/image/cards/placeholder.jpg"
-             alt="{{ childpage.title }}">
+        <div style="{{ div_style }} font-weight: bold; padding-left:
+        12px; padding-right: 6px; text-transform: uppercase;"
+             class="{{ div_classes }} display-4">
+          &nbsp;<br/>
+          {{ childpage.title }}<sup style="font-weight: normal;">≠</sup><br/>
+          &nbsp;<br/>
+        </div>
         {% endif %}
         </a>
         <div class="card-body">