diff --git a/Makefile b/Makefile index 5b3a484..8d6a3f4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BUILDDIR=../ungleich-staticcms-build -DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/ +DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/ all: publish @@ -7,7 +7,7 @@ pull: git pull publish: pull build permissions - rsync -av --exclude .lektor/ $(BUILDDIR)/ $(DESTINATION) + rsync -av --delete --exclude .lektor/ $(BUILDDIR)/u/ $(DESTINATION) permissions: build find $(BUILDDIR) -type f -exec chmod 0644 {} \; @@ -17,4 +17,4 @@ build: lektor build -O $(BUILDDIR) clean: - rm -rf $(BUILDDIR) \ No newline at end of file + rm -rf $(BUILDDIR) diff --git a/content/u/products/cloud-backup/contents.lr b/content/u/products/cloud-backup/contents.lr new file mode 100644 index 0000000..2b868f2 --- /dev/null +++ b/content/u/products/cloud-backup/contents.lr @@ -0,0 +1,8 @@ +_discoverable: yes +--- +_hidden: no +--- +title: Cloud Backup +--- +subtitle: Your insurance in Switzerland +--- diff --git a/content/u/products/contents.lr b/content/u/products/contents.lr index 052bce3..45bbce7 100644 --- a/content/u/products/contents.lr +++ b/content/u/products/contents.lr @@ -1,3 +1,5 @@ _model: products --- -title: ungleich products +title: Products +--- +subtitle: Our offer to make your life easier. diff --git a/content/u/products/ipv4-to-ipv6-proxy/contents.lr b/content/u/products/ipv4-to-ipv6-proxy/contents.lr new file mode 100644 index 0000000..e13de4e --- /dev/null +++ b/content/u/products/ipv4-to-ipv6-proxy/contents.lr @@ -0,0 +1,8 @@ +_discoverable: yes +--- +_hidden: no +--- +title: IPv6 to IPv6 Proxy +--- +subtitle: Make your IPv6 resources reachable from the IPv4 world +--- diff --git a/content/u/products/ipv6-only-hosting/contents.lr b/content/u/products/ipv6-only-hosting/contents.lr index 643c7ca..ac3f249 100644 --- a/content/u/products/ipv6-only-hosting/contents.lr +++ b/content/u/products/ipv6-only-hosting/contents.lr @@ -1,4 +1,4 @@ -name: IPv6 Only Hosting +title: IPv6 Only Hosting --- link: https://ipv6onlyhosting.com --- @@ -6,8 +6,4 @@ _discoverable: yes --- _hidden: no --- -abstract: We provide best IPv6 only hosting ---- -description: - -Hi there this is descriptino +subtitle: We provide best IPv6 only hosting diff --git a/content/u/products/ipv6vpn/contents.lr b/content/u/products/ipv6vpn/contents.lr index e880f5f..f9375dd 100644 --- a/content/u/products/ipv6vpn/contents.lr +++ b/content/u/products/ipv6vpn/contents.lr @@ -1,4 +1,4 @@ -name: IPv6 VPN +title: IPv6 VPN --- _discoverable: yes --- @@ -6,6 +6,5 @@ _hidden: no --- buy_link: http://ungleich.ch --- -description: This is description +subtitle: We enable you with IPv6 everywhere --- -teaser: This is teaser diff --git a/content/u/products/privacy-chat/contents.lr b/content/u/products/privacy-chat/contents.lr new file mode 100644 index 0000000..83f1595 --- /dev/null +++ b/content/u/products/privacy-chat/contents.lr @@ -0,0 +1,55 @@ +_discoverable: yes +--- +_hidden: no +--- +title: Privacy enhanced Chat +--- +subtitle: Your personal chat server +--- +link: http://ungleich.ch +--- +feature1_title: Location: Switzerland +--- +feature1_text: The chat server is located in the neutral country +Switzerland with strong privacy laws. +--- +feature2_title: Scalable +--- +feature2_text: + +Are you running a small team? Or are you a bigger +organisation? There is an instance that works for each of your +cases. +--- +feature3_title: Open Source +--- +feature3_text: + +The chat server only consists of Open Source +Software. The software can easily be audited by third parties and its +security verified. It also does not lock you in with us. If you are +ever not happy with our service, you can take the data and host the +chat server somewhere else. +--- +offer1_title: Regular +--- +offer1_text: text of offer +--- +offer1_link: text of offer +--- +offer2_title: Pro +--- +offer2_text: text of offer +--- +offer2_link: link of offer +--- +offer3_title: Starter +--- +offer3_text: text of offer +--- +offer3_link: link of offer +--- +content1_text: Text of the first content block +--- +content1_image: https://hack4glarus.ch/static/ungleich_page/img/logo_black.svg +--- diff --git a/content/u/products/private-search-engine/contents.lr b/content/u/products/private-search-engine/contents.lr new file mode 100644 index 0000000..dc1a0c9 --- /dev/null +++ b/content/u/products/private-search-engine/contents.lr @@ -0,0 +1,55 @@ +_discoverable: yes +--- +_hidden: no +--- +title: Private Search Engine +--- +subtitle: Your own alternative to google +--- +link: http://ungleich.ch +--- +feature1_title: Have your own +--- +You can provide search results from your own web sites without having +to rely on google. +--- +feature2_title: Scalable +--- +feature2_text: + +Are you running a small team? Or are you a bigger +organisation? There is an instance that works for each of your +cases. +--- +feature3_title: Open Source +--- +feature3_text: + +The chat server only consists of Open Source +Software. The software can easily be audited by third parties and its +security verified. It also does not lock you in with us. If you are +ever not happy with our service, you can take the data and host the +chat server somewhere else. +--- +offer1_title: Regular +--- +offer1_text: text of offer +--- +offer1_link: text of offer +--- +offer2_title: Pro +--- +offer2_text: text of offer +--- +offer2_link: link of offer +--- +offer3_title: Starter +--- +offer3_text: text of offer +--- +offer3_link: link of offer +--- +content1_text: Text of the first content block +--- +content1_image: https://hack4glarus.ch/static/ungleich_page/img/logo_black.svg +--- diff --git a/content/u/products/storage-glarnercloud/contents.lr b/content/u/products/storage-glarnercloud/contents.lr new file mode 100644 index 0000000..3ef914a --- /dev/null +++ b/content/u/products/storage-glarnercloud/contents.lr @@ -0,0 +1,8 @@ +_discoverable: yes +--- +_hidden: no +--- +title: Cloud Storage +--- +subtitle: Stored safely in Switzerland +--- diff --git a/content/u/products/test-desc/contents.lr b/content/u/products/test-desc/contents.lr deleted file mode 100644 index 576c7df..0000000 --- a/content/u/products/test-desc/contents.lr +++ /dev/null @@ -1,66 +0,0 @@ -_discoverable: yes ---- -_hidden: no ---- -_model: testproduct ---- -title: IPv6 VPN ---- -subtitle: The IPv6 VPN allows you to reach the IPv6 Internet from everywhere! ---- -link: http://ungleich.ch ---- -feature1_title: title of feature ---- -feature1_text: text of feature ---- -feature3_title: title of feature ---- -feature3_text: text of feature ---- -offer1_title: title of offer ---- -offer1_text: text of offer ---- -offer1_link: text of offer ---- -offer2_title: title of offer ---- -offer2_text: text of offer ---- -offer2_link: link of offer ---- -offer3_title: title of offer ---- -offer3_text: text of offer ---- -offer3_link: link of offer ---- -upper_content: upper content ---- -lower_content: lower content ---- -content1_text: Text of the first content block ---- -content1_image: https://hack4glarus.ch/static/ungleich_page/img/logo_black.svg ---- ---- ---- - -description: - -Something about the product - -## Feature 1 - -... - -## Feature 2 - -Something else - -## Feature 3 - -and so on - -so on diff --git a/content/u/products/test-nondesc/contents.lr b/content/u/products/test-nondesc/contents.lr deleted file mode 100644 index 99aef34..0000000 --- a/content/u/products/test-nondesc/contents.lr +++ /dev/null @@ -1,46 +0,0 @@ -_discoverable: yes ---- -_hidden: no ---- -_model: testproduct ---- -title: IPv6 VPN ---- -subtitle: The IPv6 VPN allows you to reach the IPv6 Internet from everywhere! ---- -link: http://ungleich.ch ---- -feature1_title: title of feature ---- -feature1_text: text of feature ---- -feature2_title: title of feature ---- -feature2_text: text of feature ---- -feature3_title: title of feature ---- -feature3_text: text of feature ---- -offer1_title: title of offer ---- -offer1_text: text of offer ---- -offer1_link: text of offer ---- -offer2_title: title of offer ---- -offer2_text: text of offer ---- -offer2_link: link of offer ---- -offer3_title: title of offer ---- -offer3_text: text of offer ---- -offer3_link: link of offer ---- -upper_content: upper content ---- -lower_content: lower content ---- diff --git a/content/u/products/virtual-machine-hosting/contents.lr b/content/u/products/virtual-machine-hosting/contents.lr new file mode 100644 index 0000000..aa073d6 --- /dev/null +++ b/content/u/products/virtual-machine-hosting/contents.lr @@ -0,0 +1,8 @@ +_discoverable: yes +--- +_hidden: no +--- +title: Virtual Machine Hosting +--- +subtitle: Sustainable, green and safe +--- diff --git a/models/product.ini b/models/product.ini index 703ab9f..65d17b2 100644 --- a/models/product.ini +++ b/models/product.ini @@ -3,22 +3,96 @@ name = Product label = {{ this.title }} hidden = yes -[fields.name] -label = Product Name +[fields.title] +label = Title of the product type = string size = large -[fields.abstract] -label = Abstract +[fields.subtitle] +label = Subtitle type = string -width = 1/2 [fields.description] label = Description -type = string -width = 1/4 +type = markdown [fields.link] label = Link type = url width = 1/4 + +[fields.feature1_title] +label = Feature1 Title +type = string + +[fields.feature2_title] +label = Feature2 Title +type = string + +[fields.feature3_title] +label = Feature3 Title +type = string + +[fields.feature1_text] +label = Feature1 Text +type = text + +[fields.feature2_text] +label = Feature2 Text +type = text + +[fields.feature3_text] +label = Feature3 Text +type = text + +[fields.content1_text] +label = Content1 Text +type = text + +[fields.content1_image] +label = Content 1 Image +type = url + +[fields.content2_text] +label = Content 2 Text +type = text + +[fields.content2_image] +label = Content 2 Image +type = url + +[fields.offer1_title] +label = Offer 1 Title +type = string + +[fields.offer1_text] +label = Offer 1 Text +type = text + +[fields.offer1_link] +label = Offer 1 Link +type = url + +[fields.offer2_title] +label = Offer 2 Title +type = string + +[fields.offer2_text] +label = Offer 2 Text +type = text + +[fields.offer2_link] +label = Offer 2 Link +type = url + +[fields.offer3_title] +label = Offer 3 Title +type = string + +[fields.offer3_text] +label = Offer 3 Text +type = text + +[fields.offer3_link] +label = Offer 3 Link +type = url diff --git a/models/products.ini b/models/products.ini index baabe3f..c9c030d 100644 --- a/models/products.ini +++ b/models/products.ini @@ -6,3 +6,6 @@ hidden = yes [fields.title] label = Title type = string + +[children] +model = product \ No newline at end of file diff --git a/models/testproduct.ini b/models/testproduct.ini deleted file mode 100644 index 588734a..0000000 --- a/models/testproduct.ini +++ /dev/null @@ -1,54 +0,0 @@ -[model] -name = Product -label = {{ this.title }} -hidden = yes - -[fields.title] -label = Title of the product -type = string -size = large - -[fields.subtitle] -label = Subtitle -type = string - -[fields.description] -label = Description -type = markdown - -[fields.link] -label = Link -type = url -width = 1/4 - -[fields.feature1_title] -label = Feature1 Title -type = string - -[fields.feature2_title] -label = Feature2 Title -type = string - -[fields.feature3_title] -label = Feature3 Title -type = string - -[fields.feature1_text] -label = Feature1 Text -type = string - -[fields.feature2_text] -label = Feature2 Text -type = string - -[fields.feature3_text] -label = Feature3 Text -type = string - -[fields.content1_text] -label = Content1 Text -type = string - -[fields.content1_image] -label = Content1 Image -type = url diff --git a/templates/layout-2020.html b/templates/layout-2020.html index 6359230..52620ce 100644 --- a/templates/layout-2020.html +++ b/templates/layout-2020.html @@ -5,8 +5,11 @@ - - + + + + {% block title %}Welcome to {% endblock %} | ungleich.ch @@ -23,10 +26,16 @@ + + + + + diff --git a/templates/product.html b/templates/product.html index 4f801c1..3706dff 100644 --- a/templates/product.html +++ b/templates/product.html @@ -1,34 +1,87 @@ -{% extends "layout.html" %} -{% from "macros/blog.html" import render_blog_post %} -{% from "macros/pagination.html" import render_pagination %} +{% extends "layout-2020.html" %} {% block title %}{{ this.title }}{% endblock %} -{% block body %} -
-
-
-
-
-

ungleich store

-
- -
-
+{% block subtitle %}{{ this.subtitle }}{% endblock %} + +{% block content %} +
+
+
+

{{ this.feature1_title }}

+

{{ this.feature1_text }}

+
+
+

{{ this.feature2_title }}

+

{{ this.feature2_text }}

+
+
+

{{ this.feature3_title }}

+

{{ this.feature3_text }}

-
-
-
-
-
-
-

{{this.name}}

-
-
- {{this.description}} -
-
-
-
+ +
+
+
+ {{ this.content1_text }} +
+
+ {% if this.content1_image %} + + {% endif %} +
+
+
+ +
+
+
+ {% if this.offer1_title and this.offer1_text and this.offer1_link %} +
+
+
{{ this.offer1_title }}
+

{{ this.offer1_text }}

+ Order +
+
+ {% endif %} +
+
+ {% if this.offer2_title and this.offer2_text and this.offer2_link %} +
+
+
{{ this.offer2_title }}
+

{{ this.offer2_text }}

+ Order +
+
+ {% endif %} +
+
+ {% if this.offer3_title and this.offer3_text and this.offer3_link %} +
+
+
{{ this.offer3_title }}
+

{{ this.offer3_text }}

+ Order +
+
+ {% endif %} +
+
+
+
+ +
+
+
+ {{ this.content2_text }} +
+
+ {% if this.content2_image %} + + {% endif %} +
+
{% endblock %} diff --git a/templates/products.html b/templates/products.html index b573313..b0b8ae4 100644 --- a/templates/products.html +++ b/templates/products.html @@ -1,37 +1,31 @@ -{% extends "layout.html" %} -{% from "macros/blog.html" import render_blog_post %} -{% from "macros/pagination.html" import render_pagination %} +{% extends "layout-2020.html" %} {% block title %}{{ this.title }}{% endblock %} -{% block body %} +{% block content %} -
-
-
-
-
-

Products

-
- -
-
-
-
-
-
- {% for product in this.children %} -
-
-
-

{{ product.name}}

-
-
- {{product.teaser}} + {% for product in this.children %} + {% if loop.first %} +
+ {% endif %} +
+
+
+
{{ product.title }}
+

{{ product.subtitle }}

+ Check it out
- {% endfor %} + {% if loop.index is divisibleby 3 %} +
+
+
+ {% endif %} + {% if loop.last %} +
+ {% endif %} + {% endfor %}
diff --git a/templates/testproduct.html b/templates/testproduct.html deleted file mode 100644 index f65e7d6..0000000 --- a/templates/testproduct.html +++ /dev/null @@ -1,82 +0,0 @@ -{% extends "layout-2020.html" %} -{% block title %}{{ this.title }}{% endblock %} -{% block subtitle %}{{ this.subtitle }}{% endblock %} - -{% block content %} -
-
-
-

{{ this.feature1_title }}

-

{{ this.feature1_text }}

-
-
-

{{ this.feature2_title }}

-

{{ this.feature2_text }}

-
-
-

{{ this.feature3_title }}

-

{{ this.feature3_text }}

-
-
-
- -
-
-
- {{ this.content1_text }} -
-
- {% if this.content1_image %} - - {% endif %} -
-
-
- -
-
-
-
-
-
Offer 1
-

Some quick example text to build on the card title and make up the bulk of the card's content.

- Go somewhere -
-
-
-
-
-
-
Offer 2
-

Some quick example text to build on the card title and make up the bulk of the card's content.

- Go somewhere -
-
-
-
-
-
-
Offer 3
-

Some quick example text to build on the card title and make up the bulk of the card's content.

- Go somewhere -
-
-
-
-
- -
- -
-
-
- {{ this.content2_text }} -
-
- {% if this.content2_image %} - - {% endif %} -
-
-
-{% endblock %}