Merge remote-tracking branch 'origin/refactoring'

This commit is contained in:
Nico Schottelius 2020-03-16 13:12:24 +01:00
commit 75104e61fd
19 changed files with 189 additions and 241 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
venv/ venv/
.DS_Store .DS_Store
.idea/

View file

@ -8,20 +8,17 @@ _hidden: no
--- ---
_discoverable: no _discoverable: no
--- ---
header: headline1: Activism
---
#### generic-header #### headline2: in the era of
headers: ---
headline3: Climate Change
Activism ---
in the era of header_background_color: #07b76e
Climate Change ---
---- header_text_color: text-light
primary_color: #07b76e ---
---- nav_classes:navbar-dark
header_color: text-light
----
nav_link_color:navbar-dark
--- ---
feature1_title: Free from fossil fuel feature1_title: Free from fossil fuel
--- ---

View file

@ -8,21 +8,17 @@ _hidden: no
--- ---
_discoverable: yes _discoverable: yes
--- ---
header: headline1: Be My
---
#### generic-header #### headline2: Zerocarbon
headers: ---
headline3: Valentine
Be My ---
Zerocarbon header_background_color: #ef92bd
Valentine ---
header_text_color: text-light
---- ---
primary_color: #ef92bd nav_classes: navbar-dark
----
header_color: text-light
----
nav_link_color:navbar-dark
--- ---
image: /u/image/cards/zerocarbon-valentine.jpg image: /u/image/cards/zerocarbon-valentine.jpg
--- ---

View file

@ -8,21 +8,17 @@ _hidden: no
--- ---
_discoverable: yes _discoverable: yes
--- ---
header: headline1: First Month Free
---
#### generic-header #### headline2: For Women
headers: ---
headline3: In Tech
First Month Free ---
For Women header_background_color: #46286e
In Tech ---
header_text_color: text-light
---- ---
primary_color: #46286e nav_classes:navbar-dark
----
header_color: text-light
----
nav_link_color:navbar-dark
--- ---
image: /u/image/cards/womensday2020.jpg image: /u/image/cards/womensday2020.jpg
--- ---

View file

@ -106,17 +106,14 @@ Recommended for medium to large organisations
--- ---
offer3_link: https://ungleich.ch/product/0carbonshop-50TB/ offer3_link: https://ungleich.ch/product/0carbonshop-50TB/
--- ---
header: header_background_color: #40a9e3
---
#### generic-header #### header_text_color: text-light
headers: ---
nav_classes: navbar-dark
don't offset, ---
do zero carbon. headline1: don't offset,
zero carbon shop ---
---- headline2: do zero carbon.
primary_color: #40a9e3 ---
---- headline3: zero carbon shop
header_color: text-light
----
nav_link_color: navbar-dark

View file

@ -8,20 +8,15 @@ _hidden: no
--- ---
subtitle: Your space in Data Center Light subtitle: Your space in Data Center Light
--- ---
header: headline1: Zero Carbon
---
#### generic-header #### headline2: Colocation
headers: ---
header_background_color: #92BD44
Zero Carbon ---
Colocation header_text_color: text-light
---
---- nav_classes:navbar-dark
primary_color: #92BD44
----
header_color: text-light
----
nav_link_color:navbar-dark
--- ---
image:/u/image/cards/colocation.jpg image:/u/image/cards/colocation.jpg
--- ---

View file

@ -6,20 +6,15 @@ title: Data Storage
--- ---
subtitle: Stored safely in Switzerland subtitle: Stored safely in Switzerland
--- ---
header: headline1: Data Storage
---
#### generic-header #### headline2: in Switzerland
headers: ---
header_background_color: #2EBFC3
Data Storage ---
in Switzerland header_text_color: text-light
---
---- nav_classes: navbar-dark
primary_color: #2EBFC3
----
header_color: text-light
----
nav_link_color:navbar-dark
--- ---
image:/u/image/cards/datastorage.jpg image:/u/image/cards/datastorage.jpg
--- ---

View file

@ -8,20 +8,15 @@ subtitle: Easy, decentralised & end-to-end encrypted chat
--- ---
image:/u/image/cards/zerocarbonmatrix.jpg image:/u/image/cards/zerocarbonmatrix.jpg
--- ---
header: headline1: Open, Secure
---
#### generic-header #### headline2: Decentralized Chat
headers: ---
header_background_color: #1BC0A1
Open, Secure ---
Decentralized Chat header_text_color: text-light
---
---- nav_classes: navbar-dark
primary_color: #1BC0A1
----
header_color: text-light
----
nav_link_color: navbar-dark
--- ---
description1: description1:

View file

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

View file

@ -8,21 +8,16 @@ _hidden: no
--- ---
subtitle: Future ready, today. subtitle: Future ready, today.
--- ---
header: headline1: Future ready
---
#### generic-header #### headline2: IPv6 only Hosting
headers: ---
header_background_color: #6FB0E5
Future ready ---
IPv6 only Hosting header_text_color: text-light
---
---- nav_classes:navbar-dark
primary_color: #6FB0E5 ---
----
header_color: text-light
----
nav_link_color:navbar-dark
----
image:/u/image/cards/ipv6onlyhosting.jpg image:/u/image/cards/ipv6onlyhosting.jpg
--- ---
feature1_title: Necessary feature1_title: Necessary

View file

@ -6,22 +6,18 @@ title: Virtual Machine Hosting
--- ---
subtitle: Sustainable, green and safe subtitle: Sustainable, green and safe
--- ---
header: headline1: Zero Carbon
---
#### generic-header #### headline2: Virtual Machine
headers: ---
headline3: Hosting
Zero Carbon ---
Virtual Machine header_background_color: #5273C2
Hosting ---
header_text_color: text-light
---- ---
primary_color: #5273C2 nav_classes: navbar-dark
---- ---
header_color: text-light
----
nav_link_color:navbar-dark
----
image:/u/image/cards/zerocarbonvps.jpg image:/u/image/cards/zerocarbonvps.jpg
--- ---
feature1_title: Full virtualisation feature1_title: Full virtualisation

View file

@ -128,18 +128,14 @@ Recommended for large groups
--- ---
offer3_link: https://ungleich.ch/product/0carbonchat-power/ offer3_link: https://ungleich.ch/product/0carbonchat-power/
--- ---
header: headline1: zero carbon chat
---
#### generic-header #### headline2: team chat
headers: ---
headline3: made clean
zero carbon chat ---
team chat header_background_color: #4da553
made clean ---
header_text_color: text-light
---- ---
primary_color: #4da553 nav_classes: navbar-dark
----
header_color: text-light
----
nav_link_color: navbar-dark

View file

@ -123,17 +123,14 @@ Recommended for medium to large organisations
--- ---
offer3_link: https://ungleich.ch/product/0carboncloud-50TB/ offer3_link: https://ungleich.ch/product/0carboncloud-50TB/
--- ---
header: headline1: don't offset,
---
#### generic-header #### headline2: do zero carbon.
headers: ---
headline3: zero carbon cloud
don't offset, ---
do zero carbon. header_background_color: #40a9e3
zero carbon cloud ---
---- header_text_color: text-light
primary_color: #40a9e3 ---
---- nav_classes: navbar-dark
header_color: text-light
----
nav_link_color: navbar-dark

View file

@ -8,20 +8,17 @@ subtitle: Host your page without negative climate effects
--- ---
image: /u/image/cards/zerocarbonwebhosting.jpg image: /u/image/cards/zerocarbonwebhosting.jpg
--- ---
header: headline1: Zero Carbon
---
#### generic-header #### headline2: Web
headers: ---
headline3: Hosting
Zero Carbon ---
Web header_background_color: #7B95D4
Hosting ---
---- header_text_color: text-light
primary_color: #7B95D4 ---
---- nav_classes: navbar-dark
header_color: text-light
----
nav_link_color: navbar-dark
--- ---
content1_text: content1_text:

View file

@ -4,16 +4,11 @@ title: PROJECTS
--- ---
subtitle: Things we do at ungleich subtitle: Things we do at ungleich
--- ---
header: headline1: OUR PROJECTS
#### generic-header ####
headers:
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
--- ---

View file

@ -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

View file

@ -12,9 +12,30 @@ size = large
label = Subtitle label = Subtitle
type = string type = string
[fields.header] # Replaces generic-header.fields.headers
type = flow [fields.headline1]
flow_blocks = generic-header 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] [fields.description1]
label = Description 1 label = Description 1

View file

@ -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>

View file

@ -43,9 +43,9 @@
</head> </head>
<body> <body>
{% if this.header %} {% if this.header_background_color %}
{% set nav_style = 'background-color:' + this.header.blocks[0].primary_color + ';' %} {% set nav_style = 'background-color:' + this.header_background_color + ';' %}
{% set nav_classes = this.header.blocks[0].nav_link_color %} {% set nav_classes = this.nav_classes %}
{% else %} {% else %}
{% set nav_classes = 'navbar-light bg-light' %} {% set nav_classes = 'navbar-light bg-light' %}
{% endif %} {% endif %}
@ -78,14 +78,14 @@
<a class="nav-link" href="/u/offers/">OFFERS</a> <a class="nav-link" href="/u/offers/">OFFERS</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/blog/">OLD BLOG<a/> <a class="nav-link" href="/blog/">OLD BLOG</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/u/blog/">BLOG<a/> <a class="nav-link" href="/u/blog/">BLOG</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/u/projects/open-chat/">CHAT <a class="nav-link" href="/u/projects/open-chat/">CHAT
WITH US<a/> WITH US</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/u/events/">EVENTS</a> <a class="nav-link" href="/u/events/">EVENTS</a>
@ -99,12 +99,28 @@
</form> </form>
</div> </div>
</nav> </nav>
{% if this.header %} {% if this.headline1 or this.headline2 or this.headline3 %}
{{ this.header.blocks[0] }} <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;">
{% if this.headline1 %}
{{this.headline1}}
{% endif %}
{% if this.headline2 %}
<br/>{{this.headline2}}
{% endif %}
{% if this.headline3 %}
<br/>{{this.headline3}}
{% endif %}
</h1>
</div>
</div>
{% else %} {% else %}
<div class="position-relative overflow-hidden p-3 p-md-5 m-md-3 text-center bg-light"> <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"> <div class="col-md-5 p-lg-5 mx-auto my-5">
<h1 class="display-4 font-weight-normal">{{ self.title() }} <h1 class="display-4 font-weight-normal">{{ self.title() }}</h1>
<p class="lead font-weight-normal"> <p class="lead font-weight-normal">
{% block subtitle %}{% endblock %} {% block subtitle %}{% endblock %}
</p> </p>