generic-header flowblock removed + existing products reflects new changes

2 years ago · d8968f1e44
18 changed files with 174 additions and 237 deletions
--- a/content/u/offers/acti-kit/contents.lr
+++ b/content/u/offers/acti-kit/contents.lr
@ -8,20 +8,17 @@ _hidden: no
 ---
 _discoverable: no
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Activism
-in the era of 
-Climate Change
----
-primary_color: #07b76e
----
-header_color: text-light
----
-nav_link_color:navbar-dark
+headline1: Activism
+---
+headline2: in the era of 
+---
+headline3: Climate Change
+---
+header_background_color: #07b76e
+---
+header_text_color: text-light
+---
+nav_classes:navbar-dark
 ---
 feature1_title: Free from fossil fuel
 ---
--- a/content/u/offers/valentine-machine-2020/contents.lr
+++ b/content/u/offers/valentine-machine-2020/contents.lr
@ -8,21 +8,17 @@ _hidden: no
 ---
 _discoverable: yes
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Be My
-Zerocarbon
-Valentine
-
----
-primary_color: #ef92bd
----
-header_color: text-light
----
-nav_link_color:navbar-dark
+headline1: Be My
+---
+headline2: Zerocarbon
+---
+headline3: Valentine
+---
+header_background_color: #ef92bd
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
 ---
 image: /u/image/cards/zerocarbon-valentine.jpg
 ---
--- a/content/u/offers/womensday-2020/contents.lr
+++ b/content/u/offers/womensday-2020/contents.lr
@ -8,21 +8,17 @@ _hidden: no
 ---
 _discoverable: yes
 ---
-header:
-
-#### generic-header ####
-headers:
-
-First Month Free
-For Women 
-In Tech
-
----
-primary_color: #46286e
----
-header_color: text-light
----
-nav_link_color:navbar-dark
+headline1: First Month Free
+---
+headline2: For Women 
+---
+headline3: In Tech
+---
+header_background_color: #46286e
+---
+header_text_color: text-light
+---
+nav_classes:navbar-dark
 ---
 image: /u/image/cards/womensday2020.jpg
 ---
--- a/content/u/offers/zero-carbon-shop/contents.lr
+++ b/content/u/offers/zero-carbon-shop/contents.lr
@ -106,17 +106,14 @@ Recommended for medium to large organisations
 ---
 offer3_link: https://ungleich.ch/product/0carbonshop-50TB/
 ---
-header:
-
-#### generic-header ####
-headers:
-
-don't offset,
-do zero carbon.
-zero carbon shop
----
-primary_color: #40a9e3
----
-header_color: text-light
----
-nav_link_color: navbar-dark
+header_background_color: #40a9e3
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
+headline1: don't offset,
+---
+headline2: do zero carbon.
+---
+headline3: zero carbon shop
--- a/content/u/products/colocation/contents.lr
+++ b/content/u/products/colocation/contents.lr
@ -8,20 +8,15 @@ _hidden: no
 ---
 subtitle: Your space in Data Center Light
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Zero Carbon
-Colocation
-
----
-primary_color: #92BD44
----
-header_color: text-light
----
-nav_link_color:navbar-dark
+headline1: Zero Carbon
+---
+headline2: Colocation
+---
+header_background_color: #92BD44
+---
+header_text_color: text-light
+---
+nav_classes:navbar-dark
 ---
 image:/u/image/cards/colocation.jpg
 ---
--- a/content/u/products/data-storage/contents.lr
+++ b/content/u/products/data-storage/contents.lr
@ -6,20 +6,15 @@ title: Data Storage
 ---
 subtitle: Stored safely in Switzerland
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Data Storage
-in Switzerland
-
----
-primary_color: #2EBFC3
----
-header_color: text-light
----
-nav_link_color:navbar-dark
+headline1: Data Storage
+---
+headline2: in Switzerland
+---
+header_background_color: #2EBFC3
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
 ---
 image:/u/image/cards/datastorage.jpg
 ---
--- a/content/u/products/hosted-matrix-chat/contents.lr
+++ b/content/u/products/hosted-matrix-chat/contents.lr
@ -8,20 +8,15 @@ subtitle: Easy, decentralised & end-to-end encrypted chat
 ---
 image:/u/image/cards/zerocarbonmatrix.jpg
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Open, Secure
-Decentralized Chat
-
----
-primary_color: #1BC0A1
----
-header_color: text-light
----
-nav_link_color: navbar-dark
+headline1: Open, Secure
+---
+headline2: Decentralized Chat
+---
+header_background_color: #1BC0A1
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
 ---
 description1:

--- a/content/u/products/ipv4-to-ipv6-proxy/contents.lr
+++ b/content/u/products/ipv4-to-ipv6-proxy/contents.lr
@ -8,19 +8,15 @@ subtitle: Make your IPv6 resources reachable from the IPv4 world
 ---
 image: /u/image/cards/ipv4-ipv6-proxy.jpg
 ---
-header:
-
-#### generic-header ####
-headers:
-
-IPv4 to 
-IPv6 Proxy
----
-primary_color: #57B7C1
----
-header_color: text-light
----
-nav_link_color: navbar-dark
+headline1: IPv4 to 
+---
+headline2: IPv6 Proxy
+---
+header_background_color: #57B7C1
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
 ---
 description1:

--- a/content/u/products/ipv6-only-hosting/contents.lr
+++ b/content/u/products/ipv6-only-hosting/contents.lr
@ -8,21 +8,16 @@ _hidden: no
 ---
 subtitle: Future ready, today.
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Future ready
-IPv6 only Hosting
-
----
-primary_color: #6FB0E5
----
-header_color: text-light
----
-nav_link_color:navbar-dark
----
+headline1: Future ready
+---
+headline2: IPv6 only Hosting
+---
+header_background_color: #6FB0E5
+---
+header_text_color: text-light
+---
+nav_classes:navbar-dark
+---
 image:/u/image/cards/ipv6onlyhosting.jpg
 ---
 feature1_title: Necessary
--- a/content/u/products/virtual-machine-hosting/contents.lr
+++ b/content/u/products/virtual-machine-hosting/contents.lr
@ -6,22 +6,18 @@ title: Virtual Machine Hosting
 ---
 subtitle: Sustainable, green and safe
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Zero Carbon
-Virtual Machine 
-Hosting
-
----
-primary_color: #5273C2
----
-header_color: text-light
----
-nav_link_color:navbar-dark
----
+headline1: Zero Carbon
+---
+headline2: Virtual Machine 
+---
+headline3: Hosting
+---
+header_background_color: #5273C2
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
 image:/u/image/cards/zerocarbonvps.jpg
 ---
 feature1_title: Full virtualisation
--- a/content/u/products/zero-carbon-chat/contents.lr
+++ b/content/u/products/zero-carbon-chat/contents.lr
@ -128,18 +128,14 @@ Recommended for large groups
 ---
 offer3_link: https://ungleich.ch/product/0carbonchat-power/
 ---
-header:
-
-#### generic-header ####
-headers:
-
-zero carbon chat 
-team chat
-made clean
-
----
-primary_color: #4da553
----
-header_color: text-light
----
-nav_link_color: navbar-dark
+headline1: zero carbon chat
+---
+headline2: team chat
+---
+headline3: made clean
+---
+header_background_color: #4da553
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
--- a/content/u/products/zero-carbon-cloud/contents.lr
+++ b/content/u/products/zero-carbon-cloud/contents.lr
@ -123,17 +123,14 @@ Recommended for medium to large organisations
 ---
 offer3_link: https://ungleich.ch/product/0carboncloud-50TB/
 ---
-header:
-
-#### generic-header ####
-headers:
-
-don't offset, 
-do zero carbon.
-zero carbon cloud
----
-primary_color: #40a9e3
----
-header_color: text-light
----
-nav_link_color: navbar-dark
+headline1: don't offset, 
+---
+headline2: do zero carbon.
+---
+headline3: zero carbon cloud
+---
+header_background_color: #40a9e3
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
--- a/content/u/products/zerocarbon-webhosting-with-ipv6/contents.lr
+++ b/content/u/products/zerocarbon-webhosting-with-ipv6/contents.lr
@ -8,20 +8,17 @@ subtitle: Host your page without negative climate effects
 ---
 image: /u/image/cards/zerocarbonwebhosting.jpg
 ---
-header:
-
-#### generic-header ####
-headers:
-
-Zero Carbon
-Web
-Hosting
----
-primary_color: #7B95D4
----
-header_color: text-light
----
-nav_link_color: navbar-dark
+headline1: Zero Carbon
+---
+headline2: Web
+---
+headline3: Hosting
+---
+header_background_color: #7B95D4
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
 ---
 content1_text:

--- a/content/u/projects/contents.lr
+++ b/content/u/projects/contents.lr
@ -4,16 +4,11 @@ title: PROJECTS
 ---
 subtitle: Things we do at ungleich
 ---
-header:
-
-#### generic-header ####
-headers:
-
-OUR PROJECTS
+headline1: OUR PROJECTS
 ---
-primary_color: #000000
+header_background_color #000000
 ---
-header_color: text-light
+header_text_color: text-light
 ---
-nav_link_color:navbar-dark
+nav_classes:navbar-dark
 ---
--- a/flowblocks/generic-header.ini
+++ b/flowblocks/generic-header.ini
@ -1,26 +0,0 @@
-[block]
-name = generic-header
-
-[fields.headers]
-label = headers
-type = strings
-
-[fields.primary_color]
-name = Landing Page Primary Color
-label = primary_color
-type = string
-
-[fields.header_color]
-name = Header Color
-label = header_color
-type = select
-choices = text-light, text-dark
-choice_labels = light, dark
-default = text-light
-
-[fields.nav_link_color]
-name = Navigation Link Color
-type = select
-choices = navbar-light, navbar-dark
-choice_labels = dark, light
-default = dark
--- a/models/product.ini
+++ b/models/product.ini
@ -12,9 +12,30 @@ size = large
 label = Subtitle
 type = string

-[fields.header]
-type = flow
-flow_blocks = generic-header
+# Replaces generic-header.fields.headers
+[fields.headline1]
+type = string
+
+[fields.headline2]
+type = string
+
+[fields.headline3]
+type = string
+
+# Replaces generic-header.fields.primary_color
+[fields.header_background_color]
+type = string
+
+# Replaces generic-header.fields.header_color
+[fields.header_text_color]
+type = string
+
+# Replaces generic-header.fields.nav_link_color
+[fields.nav_classes]
+type = select
+choices = navbar-light, navbar-dark
+choice_labels = dark, light
+default = dark

 [fields.description1]
 label = Description 1
--- a/templates/blocks/generic-header.html
+++ b/templates/blocks/generic-header.html
@ -1,7 +0,0 @@
-<div class="jumbotron jumbotron-fluid" style="background-color: {{this.primary_color}};">
-    <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>
--- a/templates/layout-2020.html
+++ b/templates/layout-2020.html
@ -43,9 +43,9 @@

  </head>
  <body>
-    {% if this.header %}
-      {% set nav_style = 'background-color:' + this.header.blocks[0].primary_color + ';' %}
-      {% set nav_classes = this.header.blocks[0].nav_link_color %}
+    {% if this.header_background_color %}
+      {% set nav_style = 'background-color:' + this.header_background_color + ';' %}
+      {% set nav_classes = this.nav_classes %}
    {% else %}
      {% set nav_classes = 'navbar-light bg-light' %}
    {% endif %}
@ -99,8 +99,14 @@
        </form>
      </div>
    </nav>
-    {% if this.header %}
-      {{ this.header.blocks[0] }}
+    {% if this.headline1 %}
+    <div class="jumbotron jumbotron-fluid" style="background-color: {{this.header_background_color}};">
+      <div class="container-fluid">
+          <h1 class="display-1 generic-header {{this.header_text_color}}" style="font-weight: bolder;">{{this.headline1}}</h1>
+          <h1 class="display-1 generic-header {{this.header_text_color}}" style="font-weight: bolder;">{{this.headline2}}</h1>
+          <h1 class="display-1 generic-header {{this.header_text_color}}" style="font-weight: bolder;">{{this.headline3}}</h1>
+      </div>
+    </div>
    {% 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">