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

assets/u/static/generic-header.css

@@ -0,0 +1,33 @@
+:root {
+    font-size: 16px;
+}
+
+.blue-bg {
+    background-color: #40a9e3;
+}
+
+.black-bg {
+    background-color: black;
+}
+  
+.red-bg {
+    background-color: #d1240c;
+}
+
+.green-bg {
+    background-color: #5cab06;
+}
+
+
+h1.generic-header {
+    line-height: 6rem;
+    font-size: 7rem;
+    text-transform: uppercase;
+}
+
+@media only screen and (max-width: 1068px){
+    h1.generic-header {
+        font-size: 10vw;
+        line-height: 12vw;
+    }
+}

content/u/events/contents.lr

@@ -0,0 +1,29 @@
+_model: page-2020
+---
+title: Events
+---
+content:
+
+The following is a list of events we provide or participate in.
+
+## 2020
+
+* [2020-12-04..2020-12-06: Hack4Glarus 2020 Winter Edition @ Data Center Light, Linthal](https://hack4glarus.ch/)
+* [2020-06-05..2020-06-07: Hack4Glarus 2020 Summer Edition @ Data Center Light, Linthal](https://hack4glarus.ch/)
+* [2020-04-25: IPv6 in der Bildung - Open Education Day @ PHBern, Bern](https://openeducationday.ch/programm-2020/ipv6-in-der-bildung/)
+* [2020-02-18: 9. Glarner Innovationsapéro: Digitalisierung in der Praxis @ Linthpark, Linthal](https://www.myswitzerland.com/en-ca/experiences/events/9-glarner-innovationsapero-digitalisierung-in-der-praxis/)
+
+
+## 2019
+
+* [2019-12-12: Ungleich IPv6-only Hosting @ IPv6 Council Annual Meeting 2019, UK IPv6 Council, London](https://www.ipv6.org.uk/2019/09/06/ipv6-council-annual-meeting-2019/)
+  * [Ungleich IPv6-only Hosting Presentation](https://www.ipv6.org.uk/wp-content/uploads/2019/12/UKIPv6Council_meeting_2019_Ungleich_IPv6-only_Hosting.pdf)
+* [2019-11-29..2019-12-01: Hack4Glarus 2019 Winter Edition @ Data Center Light, Linthal](https://hack4glarus.ch/)
+* [2019-10-18..2019-10-18: RIPE79, Rotterdam](https://ripe79.ripe.net/)
+  * [RIPE79 Presentation](https://ripe79.ripe.net/presentations/19-How-to-Build-Maintain-and-Market-an-IPv6-only-Data-Center-RIPE79.pdf)
+  * [RIPE79 Recording](https://ripe79.ripe.net/archives/video/165/)
+* [2019-09-03: The reasons for IPv6-only hosting @ Cloud and IPv6 Workshop, UK IPv6 Council, London](https://www.ipv6.org.uk/2019/08/08/cloud-and-ipv6-workshop/)
+  * [The reasons for IPv6-only hosting: Presentation](https://www.ipv6.org.uk/wp-content/uploads/2019/08/2019-IPv6-Cloud-ipv6-only-hosting.pdf)
+* [2019-05-31..2019-06-02: Hack4Glarus 2019 Summer Edition @ Data Center Light, Linthal](https://hack4glarus.ch/)
+* [2019-10-25: White Hat Hacking @ Digital Bridge Forum, Nur-Sultan](http://digitalbridge.kz/)
+  * [Profession of a White Hat Hacker (Presentation)](profession_of_a_white_hat_hacker-20191025_digitalbridge.pdf)

content/u/products/zero-carbon-cloud/contents.lr

@@ -21,6 +21,7 @@ feature3_title: Go fully conscious
 feature3_text: Our services are mission-coherent: slim down everything as much as possible for reducing computer power and energy consumption.
 ---
 content1_text:
+
 ## What is Zero Carbon Cloud?
 
 In the era of rapid climate change and sea level rise, we're here to provide an alternative system that does not use environmentally harmful energy sources. It is a safe and clean alternative to your dropbox or google cloud: our cloud storage service is built with sustainability to its core: it is fully renewable and fully recycled.
@@ -80,6 +81,7 @@ content2_image: /u/image/zerocarbon-no.jpg
 offer1_title: 100 GB @ 23CHF/month
 ---
 offer1_text:
+
 * **One free IPv6 VPN** included for increased security
 * Datacenter location: Glarus, Switzerland
 * Enhanced security by limiting access to only your devices
@@ -92,6 +94,7 @@ offer1_link: https://ungleich.ch
 offer2_title: 1 TB @ 36.5CHF/month
 ---
 offer2_text:
+
 * **Two free IPv6 VPNs** included for increased security
 * Datacenter location: Glarus, Switzerland
 * Enhanced security by limiting access
@@ -105,6 +108,7 @@ offer2_link: https://ungleich.ch
 offer3_title: 50 TB @ 540 CHF/month
 ---
 offer3_text:
+
 * **Ten free IPv6 VPNs** included for increased security
 * Datacenter location: Glarus, Switzerland
 * Enhanced security by limiting access to only your devices
@@ -115,3 +119,15 @@ Recommended for medium to large organisations
 ---
 offer3_link: https://ungleich.ch
 ---
+header:
+
+#### generic-header ####
+headers:
+
+carbon free
+zero carbon
+cloud solution
+----
+primary_color: blue
+----
+header_color: text-light

flowblocks/generic-header.ini

@@ -0,0 +1,22 @@
+[block]
+name = generic-header
+
+[fields.headers]
+label = headers
+type = strings
+
+[fields.primary_color]
+name = Landing Page Primary Color
+label = primary_color
+type = select
+choices = blue, black, red, green
+choice_labels = Blue, Black, Red, Green
+default = blue
+
+[fields.header_color]
+name = Header Color
+label = header_color
+type = select
+choices = text-light, text-dark
+choice_labels = light, dark
+default = text-light

models/product.ini

@@ -12,6 +12,10 @@ size = large
 label = Subtitle
 type = string
 
+[fields.header]
+type = flow
+flow_blocks = generic-header
+
 [fields.description1]
 label = Description 1
 type = markdown

templates/blocks/generic-header.html

@@ -0,0 +1,7 @@
+<div class="jumbotron jumbotron-fluid {{this.primary_color}}-bg">
+    <div class="container-fluid">
+      {% for h in this.headers %}
+        <h1 class="display-1 generic-header {{this.header_color}}" style="font-weight: bolder;">{{h}}</h1>
+      {% endfor %}
+    </div>
+</div>

templates/layout-2020.html

@@ -11,6 +11,7 @@
           href="/u/static/bootstrap-4.4.1-dist/css/bootstrap.min.css">
 
     <link rel="shortcut icon" href="/u/static/images/favicon.ico"/>
+    <link rel="stylesheet" href="/u/static/generic-header.css"/>
 
     <!-- Google analytics -->
     <script>
@@ -26,7 +27,18 @@
 
   </head>
   <body>
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
+    {% if this.header %}
+      {% set nav_classes = this.header.blocks[0].primary_color + '-bg' %}
+      {% if this.header.blocks[0].primary_color != 'Black' %}
+        {% set nav_classes = nav_classes  + ' navbar-dark' %}
+      {% else %}
+        {% set nav_classes = nav_classes  + ' navbar-light' %}
+      {% endif %}
+    {% else %}
+      {% set nav_classes = 'navbar-light bg-light' %}
+    {% endif %}
+
+    <nav class="navbar navbar-expand-lg {{ nav_classes }}">
       <a class="navbar-brand" href="https://ungleich.ch">ungleich</a>
       <button class="navbar-toggler" type="button"
               data-toggle="collapse"
@@ -56,6 +68,9 @@
           <li class="nav-item">
             <a class="nav-link" href="/u/deals/">Deals</a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/u/events/">Events</a>
+          </li>
         </ul>
         <form class="form-inline my-2 my-lg-0"
               action="https://search.ungleich.ch/yacysearch.html" method="get">
@@ -72,7 +87,9 @@
         </form>
       </div>
     </nav>
-
+    {% if this.header %}
+      {{ this.header.blocks[0] }}
+    {% else %}
     <div class="position-relative overflow-hidden p-3 p-md-5 m-md-3 text-center bg-light">
       <div class="col-md-5 p-lg-5 mx-auto my-5">
         <h1 class="display-4 font-weight-normal">{{ self.title() }}
@@ -83,6 +100,7 @@
       <div class="product-device shadow-sm d-none d-md-block"></div>
       <div class="product-device product-device-2 shadow-sm d-none d-md-block"></div>
     </div>
+    {% endif %}
 
     {% block content %}{% endblock %}