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

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

@@ -14,13 +14,14 @@ headline2: 2020.11.26 - 2020.11.30
 ---
 image: /u/image/cards/blackfriday20.jpg
 ---
-header_background_color: #48BE75
+header_background_color: #211C1E
 ---
 header_text_color: text-light
 ---
 nav_classes: navbar-dark
 ---
-content1_text:
+description1:
+
 
 ## Black IPv6 Friday 
 
@@ -31,10 +32,9 @@ Get yourself a treat with sustainable technology!
 * Deal 2: Get a VIIRB and get 2 years of VPN with it
 * Deal 3: 50% Discount for the VPN extension for VIIRB and PIB users
 * Deal 4: 5% Discount for all ungleich Gift Cards
+
 ---
-content1_image: giftcard.jpg
----
-content2_text:
+content1_text:
 
 ## Deal 1. IPv6 VPN for 2 years for the price of 1.
 
@@ -47,19 +47,28 @@ The underlying technology is wireguard, a secure and easy to use VPN protocol. I
 IPv6 VPN encrypts the traffic until the endpoint in Switzerland. Thus the IPv6 VPN allows you to originate traffic in a different country.
 As you receive 80 bit of IPv6 space, you can divide the network to your liking. The connection is encrypted with modern cryptographic algorithms. No network traffic is logged to preserve privacy.
 
-### Order VPN now and save 120 CHF!
+### Order IPv6 VPN now and save 120 CHF!
 
 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/)
+---
+content1_image: blackfriday-vpn.jpg
+---
+content2_text:
 
-## Deal 2. VIIRB with 2 years of free VPN
+## Deal 2. VIIRB with 2 years of free IPv6 VPN
 
-For everyone who orders VIIRB during Black Friday Sales gets a VIIRB with 2 years IPv6 VPN included instead of 1 year. Buy a VIIRB now, and you get the special deal included automatically. 
+Everyone who orders VIIRB during Black Friday Sales gets a VIIRB with 2 years IPv6 VPN included instead of 1 year. Buy a VIIRB now, and you get the special deal included automatically. 
 
 * [Buy VIIRB](https://ungleich.ch/u/products/viirb-ipv6-box/)
 * [Buy PIB](https://ungleich.ch/u/products/pro-ipv6-box/)
 
+---
+content2_image: viirb-blackfriday.jpg
+---
+content3_text:
+
 ## Deal 3. 50% Discount on IPv6 VPN extension for VIIRB or PIB users
 
 Do you already have our star product [VIIRB,](https://ungleich.ch/u/products/viirb-ipv6-box/) or [PIB](https://ungleich.ch/u/products/pro-ipv6-box/)? Now we offer the next year's VPN for your VIIRB with 50% discount. Our standard VPN costs 120 CHF per year, but with this deal you can have your current VPN extended for another year for just half the price. Enjoy the adorable VIIRB and powerful PIB, and keep your IPv6 VPN uninterrupted!
@@ -67,6 +76,11 @@ Offer is valid for VIIRB and PIB users.
 
 [Order IPv6 VPN for VIIRB or PIB with 50% discount](https://ungleich.ch/product/vpn-black-friday-viirb/)
 
+---
+content3_image: vpn-extension.jpg
+---
+content4_text:
+
 ## Deal 4. 5% off on all ungleich Gift Cards
 
 Now you have a way of giving sustainable technology to people you care. With our [Gift Card,](https://ungleich.ch/u/products/giftcard/) you can choose any of our products as a gift. For the Gift Cards bought during Black Friday Deals, we give you 5% discount. 
@@ -90,6 +104,10 @@ You can use our Gift Card for the following products.
 Go through the checkout and write us that you bought the Gift Card during Black Friday sales, we will give you back the 5% of the amount you purchased. 
 
 [Order Gift Card](https://ungleich.ch/u/products/giftcard/)
+---
+content4_image: blackfriday-giftcard.jpg
+---
+description6:
 
 ## More Info
 
@@ -98,6 +116,5 @@ Go through the checkout and write us that you bought the Gift Card during Black
 * Our PIB is the powerful, professional IPv6 router box that lets you do your serious work with IPv6. You can find more information on it on our [PIB product page.](https://ungleich.ch/u/products/pro-ipv6-box/)  
 
 Any questions, you can drop us a mail to support@ungleich.ch and our team will get back to you as soon as possible! Happy IPv6 Black Friday everyone!
----
-content2_image: blackfriday.jpg
----
+
+

templates/product.html

@@ -38,6 +38,8 @@
   </div>
 </div>
 {% endif %}
+
+{% if this.content1_text %}
 <div class="container">
   <div class="row mb-3">
     <div class="col-md-7">
@@ -50,6 +52,8 @@
     </div>
   </div>
 </div>
+{% endif %}
+
 {% if this.description3 %}
 <div class="container">
   <div class="row mb-3">
@@ -107,6 +111,7 @@
 </div>
 {% endif %}
 
+{% if this.content2_text %}
 <div class="container">
   <div class="row mb-3">
     <div class="col-md-7">
@@ -119,6 +124,7 @@
     </div>
   </div>
 </div>
+{% endif %}
 
 {% if this.description5 %}
 <div class="container">
@@ -130,6 +136,7 @@
 </div>
 {% endif %}
 
+{% if this.content3_text %}
 <div class="container">
   <div class="row mb-3">
     <div class="col-md-7">
@@ -142,6 +149,7 @@
     </div>
   </div>
 </div>
+{% endif %}
 
 <div class="container">
   <div class="row mb-3">
@@ -182,6 +190,7 @@
 </div>
 <hr/>
 
+{% if this.content4_text %}
 <div class="container">
   <div class="row mb-3">
     <div class="col-md-7">
@@ -194,6 +203,7 @@
     </div>
   </div>
 </div>
+{% endif %}
 
 {% if this.description6 %}
 <div class="container">