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

content/u/advent-calendar/03/contents.lr

@@ -1,8 +1,8 @@
 _model: product
 ---
-_discoverable: no
+_discoverable: yes
 ---
-_hidden: yes
+_hidden: no
 ---
 title: IPv6-only Ubuntu 10.20 VMs 
 ---

content/u/advent-calendar/welcome-viwib/contents.lr

@@ -6,13 +6,13 @@ _hidden: no
 ---
 title: Welcome, VIWIB!
 ---
-subtitle: First 10 get a special extra
+subtitle: Powerful little IPv6 box with WiFi!
 ---
-headaline1: Surprise 02:
+headline1: Surprise 02:
 ---
-headline2: Introducing the VIWIB
+headline2: Introducing VIWIB,
 ---
-headline3: IPv6 and Wifi everywhere
+headline3: IPv6 & Wifi everywhere
 ---
 header_background_color: #C12107
 ---
@@ -26,14 +26,13 @@ content1_image: /u/image/viwib-vertical.jpg
 ---
 content1_text:
 
-## Welcome the VIWIB
+## Meet our VIWIB
 
 Today we are very proud to introduce you to our latest IPv6 enabler:
 the [VIWIB](/u/products/viwib-wifi-ipv6-box/). It is the bigger sister
-of the VIIRB and brings IPv6 enabled WiFi to you!
+of our [VIIRB,](/u/products/viirb-ipv6-box/) and VIWIB brings IPv6 enabled WiFi to you!
 
-It is compatible with the VIIRB add-ons and as such also very
+It is compatible with the VIIRB add-ons: VIWIB is also very
 versatile.
 
-The first 10 VIWIBs orders get a personalised, physical, personally
+Now the preorder is open! The first 10 VIWIB orders will get personally signed VIWIBs.
-signed with their order.

content/u/offers/black-friday-2020/contents.lr

@@ -51,7 +51,7 @@ As you receive 80 bit of IPv6 space, you can divide the network to your liking.
 
 Our IPv6 VPN is 120 CHF per year. Now you can pay just 120 CHF for 2 year's VPN subscription instead of 240 CHF, you save 120 CHF.
 
-[Order IPv6 VPN for 2 years for the price of 1 year](https://ungleich.ch/product/vpn-black-friday-2yr/)
+Order IPv6 VPN for 2 years for the price of 1 year
 ---
 content1_image: blackfriday-vpn.jpg
 ---

content/u/products/hosted-support-system/contents.lr

@@ -18,6 +18,8 @@ header_text_color: text-light
 ---
 nav_classes: navbar-dark
 ---
+image: /u/image/cards/supportsystem.jpg
+---
 feature1_title: Good customer support
 ---
 feature1_text: With our hosted support system you can manage support

content/u/products/viwib-wifi-ipv6-box/contents.lr

@@ -6,13 +6,27 @@ title: VIWIB - The VPN IPv6 WiFi IoT Box
 ---
 subtitle: VIWIB brings you IPv6 and WiFi - everywhere.
 ---
+image: /u/image/cards/viwib.jpg
+---
+headline1: VIWIB:
+---
+headline2: VPN IPv6 
+---
+headline3: WiFi IoT Box
+---
+header_background_color: #EBBD07
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
 content1_text:
 
 ## The VIWIB
 
-The VIWIB is the bigger sister of the
+The VIWIB is the bigger sister of our
-[VIIRB](/u/products/viirb-ipv6-box/). Compared to the VIIRB, it has 2
+[VIIRB](/u/products/viirb-ipv6-box/). Compared to the VIIRB, VIWIB has 2
-Ethernet ports and a reliable WiFi. It is also slightly bigger
+Ethernet ports and a reliable WiFi. It is also slightly bigger in size
 (58 x 58 x 25mm). However it does not weigh much - in fact, it
 only weighs 40g!
 
@@ -24,27 +38,27 @@ VIIRB, we have some different use cases in mind for the VIWIB:
 
 ### IPv6 only Wifi
 
-The VIWIB comes with a built in WiFi network. The default SSID is
+The VIWIB comes with a built-in WiFi network. The default SSID is
 "IPv6 everywhere" and the default password is "iloveipv6". The
 broadcasted WiFi is IPv6 only with DNS64 and NAT64 enabled.
 
-To prove that IPv6 is fun, the default sub network id for the
+To show that IPv6 is fun, the default sub network id for the
 wifi is "7ea", which reads similar to "tea". So if your VPN network
 was 2001:db8:ace::/48, the wifi network would be 2001:db8:ace:7ea::/64.
 
-### IPv6 only LAN
+### IPv6-only LAN
 
 If you connect the LAN port to an unused network switch, the VIWIB
-will create an IPv6 only network. It's very similar to the WiFi.
+will create an IPv6-only network. It is very similar to the WiFi.
 
-To prove that IPv6 is fun, the default subnetwork id for the lan is
+To show that IPv6 is fun, the default subnetwork id for the LAN is
 "cafe", which reads similar to ... you get point.
 
 ### Dual stack LAN
 
 If you connect the LAN port to an existing network with IPv4
-connecvitity, the VIWIB will create a dual stack network. While mode
+connecvitity, the VIWIB will create a dual stack network. Whichever mode
-you prefer is up to you!
+you prefer, is up to you to decide!
 
 ## How it works
 
@@ -81,13 +95,14 @@ the VIWIB and just get started with IPv6.
 
 All VIIRB add-ons are compatible with the VIWIB! So you can turn your
 VIWIB into an IPv6 camera, an IPv6 thermometer, an IPv6 LTE/4G router,
-into an IPv6 GPS tracker, use multiple multiple add ons or even turn
+into an IPv6 GPS tracker, use multiple add-ons or even turn
 the VIWIB into a security system!
 
 ## Ordering
 
-To order the VIWIB, send an email with your shipping address and
+The preorder is open now. To order the VIWIB, send an email with your shipping address and
-the requested quantity to **support -at- ungleich.ch**.
+the requested quantity to **support -at- ungleich.ch**. Let us know if you want tracked or untracked shipping.
+The shipment is planned to begin in mid December 2020.
 
 ### Price
 
@@ -97,12 +112,12 @@ If you need a power supply, we can ship it with a
 [European style connector](https://en.wikipedia.org/wiki/Europlug)
 for 15 CHF.
 
-All prices excluding VAT and shipping costs.
+All prices exclude VAT and shipping costs.
 
 ### Shipping costs
 
 You can order up to 4 VIWIBs within one order. In other words:
-only 1 time shipping costs for 1,2,3 or 4 VIWIBs.
+only 1 time shipping cost for 1,2,3 or 4 VIWIBs.
 
 * [Order to Denmark, Finland, France, Germany, Great Britain, Iceland,
   The Netherlands,
@@ -116,13 +131,19 @@ only 1 time shipping costs for 1,2,3 or 4 VIWIBs.
  * [Order 2 VIWIBs to Australia, Canada, India, South Korea, US](https://datacenterlight.ch/product/viwib-2-us/)
 
 
+The following countries can get the VIWIB with priority shipping with tracking. If you want to receive VIIRB with tracked shipping, get in touch with our team with your shipping address.
+
+* [Order to Denmark, Finland, France, Germany, Great Britain, Iceland,
+  The Netherlands, Romania, Spain, Sweden, Italy with shipping tracking: + 24 CHF](https://datacenterlight.ch/product/viwib-eu-tracked/)
+  * [Order 2 VIIRBs to Denmark, Finland, France, Germany, Great Britain, Iceland,
+  The Netherlands, Romania, Spain, Sweden, Italy with shipping tracking](https://datacenterlight.ch/product/viwib-2-eu-tracked/)
 
 ## More of it
 
 If you need more ports, Gigabit support, more RAM and more storage,
-you can checkout the [Pro IPv6 Box](../pro-ipv6-box).
+you can checkout our [Pro IPv6 Box](../pro-ipv6-box).
 
-If you prefer a smaller case and you do not need wifi, we recommend to
+If you prefer a smaller device and you do not need wifi, we recommend to
-checkout the [VIIRB](/u/products/viirb-ipv6-box/).
+checkout our [VIIRB](/u/products/viirb-ipv6-box/).
 ---
 content1_image: /u/image/viwib-vertical.jpg