From d8968f1e4419360b3d4d2468a2757ff0748f29e4 Mon Sep 17 00:00:00 2001 From: meow Date: Mon, 9 Mar 2020 21:17:43 +0500 Subject: [PATCH 1/3] generic-header flowblock removed + existing products reflects new changes --- content/u/offers/acti-kit/contents.lr | 25 ++++++++--------- .../offers/valentine-machine-2020/contents.lr | 26 ++++++++--------- content/u/offers/womensday-2020/contents.lr | 26 ++++++++--------- content/u/offers/zero-carbon-shop/contents.lr | 25 ++++++++--------- content/u/products/colocation/contents.lr | 23 ++++++--------- content/u/products/data-storage/contents.lr | 23 ++++++--------- .../u/products/hosted-matrix-chat/contents.lr | 23 ++++++--------- .../u/products/ipv4-to-ipv6-proxy/contents.lr | 22 ++++++--------- .../u/products/ipv6-only-hosting/contents.lr | 25 +++++++---------- .../virtual-machine-hosting/contents.lr | 28 ++++++++----------- .../u/products/zero-carbon-chat/contents.lr | 26 ++++++++--------- .../u/products/zero-carbon-cloud/contents.lr | 25 ++++++++--------- .../contents.lr | 25 ++++++++--------- content/u/projects/contents.lr | 13 +++------ flowblocks/generic-header.ini | 26 ----------------- models/product.ini | 27 ++++++++++++++++-- templates/blocks/generic-header.html | 7 ----- templates/layout-2020.html | 16 +++++++---- 18 files changed, 174 insertions(+), 237 deletions(-) delete mode 100644 flowblocks/generic-header.ini delete mode 100644 templates/blocks/generic-header.html diff --git a/content/u/offers/acti-kit/contents.lr b/content/u/offers/acti-kit/contents.lr index da5ba39..c53fa70 100644 --- 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 --- diff --git a/content/u/offers/valentine-machine-2020/contents.lr b/content/u/offers/valentine-machine-2020/contents.lr index 05fc0a0..eb4644c 100644 --- 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 --- diff --git a/content/u/offers/womensday-2020/contents.lr b/content/u/offers/womensday-2020/contents.lr index f6b153c..2f396a8 100644 --- 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 --- diff --git a/content/u/offers/zero-carbon-shop/contents.lr b/content/u/offers/zero-carbon-shop/contents.lr index e5f9292..4779728 100644 --- 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 diff --git a/content/u/products/colocation/contents.lr b/content/u/products/colocation/contents.lr index 2597a8d..354b7a7 100644 --- 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 --- diff --git a/content/u/products/data-storage/contents.lr b/content/u/products/data-storage/contents.lr index 8709e6b..834c212 100644 --- 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 --- diff --git a/content/u/products/hosted-matrix-chat/contents.lr b/content/u/products/hosted-matrix-chat/contents.lr index 34f6d98..3d8a2bd 100644 --- 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: diff --git a/content/u/products/ipv4-to-ipv6-proxy/contents.lr b/content/u/products/ipv4-to-ipv6-proxy/contents.lr index 3127f60..0439a2f 100644 --- 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: diff --git a/content/u/products/ipv6-only-hosting/contents.lr b/content/u/products/ipv6-only-hosting/contents.lr index 37644eb..3cb1dce 100644 --- 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 diff --git a/content/u/products/virtual-machine-hosting/contents.lr b/content/u/products/virtual-machine-hosting/contents.lr index 1fb68ea..7b6375a 100644 --- 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 diff --git a/content/u/products/zero-carbon-chat/contents.lr b/content/u/products/zero-carbon-chat/contents.lr index b9fe588..ab151c9 100644 --- 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 diff --git a/content/u/products/zero-carbon-cloud/contents.lr b/content/u/products/zero-carbon-cloud/contents.lr index 36d2f19..cbf3e1e 100644 --- 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 diff --git a/content/u/products/zerocarbon-webhosting-with-ipv6/contents.lr b/content/u/products/zerocarbon-webhosting-with-ipv6/contents.lr index 4cbbf27..c72b18a 100644 --- 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: diff --git a/content/u/projects/contents.lr b/content/u/projects/contents.lr index dca1a71..9211276 100644 --- 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 --- \ No newline at end of file diff --git a/flowblocks/generic-header.ini b/flowblocks/generic-header.ini deleted file mode 100644 index b5c9dbd..0000000 --- a/flowblocks/generic-header.ini +++ /dev/null @@ -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 diff --git a/models/product.ini b/models/product.ini index 93d1601..be8906d 100644 --- 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 diff --git a/templates/blocks/generic-header.html b/templates/blocks/generic-header.html deleted file mode 100644 index ea2fe98..0000000 --- a/templates/blocks/generic-header.html +++ /dev/null @@ -1,7 +0,0 @@ -
-
- {% for h in this.headers %} -

{{h}}

- {% endfor %} -
-
\ No newline at end of file diff --git a/templates/layout-2020.html b/templates/layout-2020.html index 1a16795..870dcc5 100644 --- a/templates/layout-2020.html +++ b/templates/layout-2020.html @@ -43,9 +43,9 @@ - {% 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 @@ - {% if this.header %} - {{ this.header.blocks[0] }} + {% if this.headline1 %} +
+
+

{{this.headline1}}

+

{{this.headline2}}

+

{{this.headline3}}

+
+
{% else %}
From 5affc2d0851785aec8d658cd4c9a924dfa525e48 Mon Sep 17 00:00:00 2001 From: meow Date: Wed, 11 Mar 2020 11:26:47 +0500 Subject: [PATCH 2/3] Fix incorrect html tag endings + Put every headline into its own if check --- .gitignore | 1 + templates/layout-2020.html | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 769e5e2..e9842fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ venv/ .DS_Store +.idea/ diff --git a/templates/layout-2020.html b/templates/layout-2020.html index 870dcc5..3a70c7b 100644 --- a/templates/layout-2020.html +++ b/templates/layout-2020.html @@ -78,14 +78,14 @@ OFFERS
  • - OLD BLOG + OLD BLOG
  • - BLOG + BLOG
  • CHAT - WITH US + WITH US
  • EVENTS @@ -99,18 +99,28 @@
    • - {% if this.headline1 %} + {% if this.headline1 or this.headline2 or this.headline3 %}
    -

    {{this.headline1}}

    -

    {{this.headline2}}

    -

    {{this.headline3}}

    +

    + {% if this.headline1 %} + {{this.headline1}} + {% endif %} + + {% if this.headline2 %} +
    {{this.headline2}} + {% endif %} + + {% if this.headline3 %} +
    {{this.headline3}} + {% endif %} +

    {% else %}
    -

    {{ self.title() }} +

    {{ self.title() }}

    {% block subtitle %}{% endblock %}

    From b5138a66b394232ef43783a62959cd00966db50d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 19 Mar 2020 12:32:05 +0100 Subject: [PATCH 3/3] ++ link to colocation --- content/u/projects/data-center-light/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/projects/data-center-light/contents.lr b/content/u/projects/data-center-light/contents.lr index 4a52a93..5c200ae 100644 --- a/content/u/projects/data-center-light/contents.lr +++ b/content/u/projects/data-center-light/contents.lr @@ -104,7 +104,7 @@ In the Data Center Light we offer * [Virtual Machine Hosting](/u/products/virtual-machine-hosting) * [IPv6 only Virtual Machine Hosting](/u/products/ipv6-only-hosting) * [Data Storage](/u/products/data-storage/) -* Colocation +* [Colocation](/u/products/colocation/) Our objective is to enable people world wide and locally. From easier working to giving safety to being able to store your data sustainable.