Merge branch 'test' of Disroot/Website into master

pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.en.md

@@ -1,5 +1,5 @@
 ---
-title: 'Calendars and Contacts'
+title: 'Calenders and Contacts'
 bgcolor: '#FFF'
 fontcolor: '#555'
 ---
@@ -10,7 +10,7 @@ fontcolor: '#555'
 
 ## Calendars and Contacts
 
-Share your calendar/s with other **Nextcloud** users or groups on your **Nextcloud** server, easily and quickly. Store your contacts in **Nextcloud** and share them among your devices so you always have access to it no matter which device you are currently on.
+Share your calendar's with other **Nextcloud** users or groups on your **Nextcloud** server, easily and quickly. Store your contacts in **Nextcloud** and share them among your devices so you always have access to it no matter which device you are currently on.
 
 ### Use your favorite client
 

pages/03.services/04.diaspora/_empty-bar/fullbar.md

@@ -1,7 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----
-

pages/03.services/04.diaspora/modular.en.md

@@ -14,7 +14,6 @@ content:
             - _diaspora-reshare
             - _diaspora-mentions
             - _diaspora-love
-            - _empty-bar
 body_classes: modular
 header_image: diaspora.jpg
 ---

pages/03.services/09.privatebin/_empty-bar/fullbar.md

@@ -1,7 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----
-

pages/03.services/09.privatebin/modular.en.md

@@ -10,8 +10,6 @@ content:
             - _bin-highlights
             - _bin-easy
             - _bin-safe
-            - _empty-bar
 body_classes: modular
 header_image: bin_banner.jpg
 ---
-

pages/06.donate/_overview/fullbar.de.md

@@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)
 
 
-Unterstützt von <button class="button button4">179</button> 
+Unterstützt von <button class="button button4">179</button>
 _(Click the number for an overview)_
 
 

pages/aliaschallenge/_domains/domains.en.md

@@ -0,0 +1,35 @@
+---
+title: Domains
+section_id: services
+bgcolor: '#f2f2f2ff'
+fontcolor: '#555'
+text_align: left
+services:
+    -
+        title: "#GlorifiedHacker"
+        text: "glorifiedhacker.net"
+        button1: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=J36HJARW8FGGS'
+        button2: 'aliaschallenge/glorifiedhacker'
+    -
+        title: "#GetGoogleOffMe"
+        text: "getgoogleoff.me"
+        button1: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=ZE2GP4QZNZ7L6'
+        button2: 'aliaschallenge/getgoogleoffme'
+    -
+        title: "#Morecats"
+        text: "morecats.net"
+        button1: 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=B5RR8H4Q7MKN6'
+        button2: 'aliaschallenge/morecats'
+
+---
+
+<div style="width: 50%; margin-left: auto; margin-right: auto;">
+
+<h4 style="color:#327E82;">Bank transfer:</h4>
+<p style="color:#327E82; font-size:1.8em; line-height:1.4"> Stichting Disroot.org <br>
+IBAN NL19 TRIO 0338 7622 05 <br>
+BIC TRIONL2U
+</p>
+<h4 style="color:#327E82;">Don't forget to mention your choice in the reference!</h4>
+</div>
+<br>

pages/aliaschallenge/_goal/fullbar.en.md

@@ -0,0 +1,24 @@
+---
+title: 'Goal'
+bgcolor: '#09846aff'
+fontcolor: '#FFFFFF'
+text_align: left
+---
+
+<br>
+
+
+<h3 id="goaltitle"> Help us reach 1500€ </h3>
+
+<div class="cup">
+<img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />
+
+<span class="timer">
+7 days left
+</span>
+
+</div>
+
+<div class="tree">
+<img src="/user/pages/aliaschallenge/_goal/tree.png" alt="Tree of cats" />
+</div>

pages/aliaschallenge/_intro/fullbar.en.md

@@ -0,0 +1,18 @@
+---
+title: 'Introduction'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: left
+---
+
+<br>
+
+<span style="padding-right:10%;" id="fund1">
+In the last days of this year, when the entire world prepares to greet the light of the new decade, three domains are fighting for the dominance of the beetroot market. **Join the battle and choose your Overlord**.
+</span>
+
+<span style="padding-right:30%;" id="fund2">
+From 23rd of December until 1st of January, take part in our end of the year fundraising event. **Donate to Disroot** using one of the below domain hashtags as your donation reference. Victorious domain name will be given as an **extra alias for all Disrooters now and in the future**.
+</span>
+
+## Let the coolest domain win!

pages/aliaschallenge/_pagebottom/3col.md

@@ -0,0 +1,14 @@
+---
+title: 'Ranking'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+---
+
+---
+
+<div id="iconlicence">
+- Icons on this page were created by Smashicons, Freepik and Monkik from flaticon.com -
+</div>

pages/aliaschallenge/_ranking/fullbar.en.md

@@ -0,0 +1,35 @@
+---
+title: 'Ranking'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<h1 style="color: #ffffff; font-size: 56px; font-family: 'kingthings_christmas'; line-height: 1.2;">Ranking</h1>
+
+
+<div class="dots">
+    <hr class="left"  style="width: 1vw;" /><h2 class="right"> 0€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
+    <figcaption>glorifiedhacker.net</figcaption>
+    </figure>
+</div>
+
+<div class="dots" >
+    <hr class="left" style="width: 1vw;" /><h2 class="right"> 0€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
+    <figcaption>getgoogleoff.me</figcaption>
+    </figure>
+
+
+</div>
+
+<div class="dots" >
+    <hr class="left" style="width:1vw;" /><h2 class="right"> 0€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
+    <figcaption>morecats.net</figcaption>
+    </figure>
+</div>

pages/aliaschallenge/_rewards/challenges.en.md

@@ -0,0 +1,28 @@
+---
+title: 'Challenges'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#327E82'
+text_align: left
+clients:
+    -
+        title: "Donate 30€"
+        text: "Choose a verification question used during user registration process.*"
+    -
+        title: "Donate 50€"
+        text: "Get a personal new year's greeting card."
+    -
+        title: "Donate 75€"
+        text: "A New years special surprise heading your mailbox."
+    -
+        title: "Donate 100€"
+        text: "Choose a new Image for the Disroot.org front page for two weeks.*"
+    -
+        title: "Donate 500€"
+        text: "Select a new domain name for a custom Disroot alias given to all Disrooters.*"
+
+
+---
+
+<div markdown=1>
+`*` Disroot.org reserve the right to deny the reward if image or name are in violation of our <a href="/tos"> TOS</a>
+</div>

pages/aliaschallenge/_rewardstitle/fullbar.en.md

@@ -0,0 +1,11 @@
+---
+title: 'Rewards title'
+bgcolor: '#09846aff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<br>
+<p id="rewardtitle">
+Special rewards extravganza:
+</p>

pages/aliaschallenge/_title/fullbar.en.md

@@ -0,0 +1,12 @@
+---
+title: 'Challenge title'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<br>
+<p id="challengetitle">
+The Phenomenal End-of-the-Year<br>
+<span id="challengesubtitle"> Bonus Alias Challenge </span>
+</p>

pages/aliaschallenge/getgoogleoffme/_bitcoin/2col-right.en.md

@@ -0,0 +1,13 @@
+---
+title: Bitcoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](googleoff-bitcoin.png)
+
+---
+
+# Bitcoin
+Send your bitcoins to our wallet at:
+bc1q2sxxsuz7r8qwgaj4u29grukapwjq9e7cetwl9u

pages/aliaschallenge/getgoogleoffme/_crypto/2col-left.en.md

@@ -0,0 +1,8 @@
+---
+title: crypto
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+text_align: left
+---
+
+## Donate and vote for getgoogleoff.me:

pages/aliaschallenge/getgoogleoffme/_monero/2col-right.en.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](googleoff-monero.png)
+
+---
+
+# Monero
+Send your monero's to our wallet at:
+87Js9xHUSReL3RTxJve8ZxZQzsJmzk4fD2rrdvC5tJBqSXMkBtLsiDZLDzrf6GbQpj4N35RH39HsA8iwgWmoonyqLzSwtaz

pages/aliaschallenge/getgoogleoffme/_pagebottom/3col.md

@@ -1,6 +1,6 @@
 ---
-title: 'Empty Bar'
-bgcolor: '#8EB726'
+title: 'Ranking'
+bgcolor: '#1F5C60'
 fontcolor: '#FFF'
 text_align: center
 ---

pages/aliaschallenge/getgoogleoffme/modular.en.md

@@ -0,0 +1,15 @@
+---
+title: Cryptocurrencies
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _crypto
+            - _bitcoin
+            - _monero
+            - _pagebottom
+body_classes: modular
+header_image: burning_money.png
+---

pages/aliaschallenge/glorifiedhacker/_bitcoin/2col-right.en.md

@@ -0,0 +1,13 @@
+---
+title: Bitcoin
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](hacker-bitcoin.png)
+
+---
+
+# Bitcoin
+Send your bitcoins to our wallet at:
+bc1qld0wgrpd29uv3u3uhvrnqec9s8j57qspasngc9

pages/aliaschallenge/glorifiedhacker/_crypto/2col-left.en.md

@@ -0,0 +1,8 @@
+---
+title: crypto
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+text_align: left
+---
+
+## Donate and vote for glorifiedhacker.net:

pages/aliaschallenge/glorifiedhacker/_monero/2col-right.en.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](hacker-monero.png)
+
+---
+
+# Monero
+Send your monero's to our wallet at:
+88rqxvsMEorAuPXTSCgnRRH8CFHubxcxPKircpudbx1VfbTj73MxuZka7FrkKB1WuEG4UM8vCqY76Mo47DPb7jTSV1ni46p

pages/aliaschallenge/glorifiedhacker/_pagebottom/3col.md

@@ -1,6 +1,6 @@
 ---
-title: 'Empty Bar'
-bgcolor: '#8EB726'
+title: 'Ranking'
+bgcolor: '#1F5C60'
 fontcolor: '#FFF'
 text_align: center
 ---

pages/aliaschallenge/glorifiedhacker/modular.en.md

@@ -0,0 +1,15 @@
+---
+title: Cryptocurrencies
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _crypto
+            - _bitcoin
+            - _monero
+            - _pagebottom
+body_classes: modular
+header_image: burning_money.png
+---

pages/aliaschallenge/modular.en.md

@@ -0,0 +1,19 @@
+---
+title: Alias-challenge
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _title
+            - _intro
+            - _goal
+            - _domains
+            - _rewardstitle
+            - _rewards
+            - _ranking
+            - _pagebottom
+body_classes: modular
+header_image: 'header2.jpg'
+---

pages/aliaschallenge/morecats/_bitcoin/2col-right.en.md

@@ -0,0 +1,14 @@
+---
+title: Bitcoin
+media_order: '1GN.png,qr0719.png'
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](morecats-bitcoin.png)
+
+---
+
+# Bitcoin
+Send your bitcoins to our wallet at:
+bc1q2r5ufc68unc8g8na57sufjgcjpvgvlztnswgw3

pages/aliaschallenge/morecats/_crypto/2col-left.en.md

@@ -0,0 +1,8 @@
+---
+title: crypto
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+text_align: left
+---
+
+## Donate and vote for morecats.net:

pages/aliaschallenge/morecats/_monero/2col-right.en.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+![](morecats-monero.png)
+
+---
+
+# Monero
+Send your monero's to our wallet at:
+8BXP6mKZioYjRJtwzpB1vQ6iMCXbyasMMa8VUbu6LbBa25KvAUn7fSteNyv5KsE1dhjPxBSoDo7rzVGMmfXYwntXBDQhNQr

pages/aliaschallenge/morecats/_pagebottom/3col.md

@@ -1,7 +1,6 @@
 ---
-title: 'Empty Bar'
-bgcolor: '#8EB726'
+title: 'Ranking'
+bgcolor: '#1F5C60'
 fontcolor: '#FFF'
 text_align: center
 ---
-

pages/aliaschallenge/morecats/modular.en.md

@@ -0,0 +1,15 @@
+---
+title: Cryptocurrencies
+content:
+    items: '@self.modular'
+    order:
+        by: default
+        dir: asc
+        custom:
+            - _crypto
+            - _bitcoin
+            - _monero
+            - _pagebottom
+body_classes: modular
+header_image: burning_money.png
+---

pages/cryptocurrency/_bitcoin/2col.de.md

@@ -7,8 +7,8 @@ fontcolor: '#FFF'
 
 # Bitcoin
 Sende Deine Bitcoin an unser Portemonnaie:
-16GoS122zKZ1dPyseJzraJStqRFBWJe1Ru
+bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
 
 ---
 
-![](qr0719.png)
+![](qr1223.png)

pages/cryptocurrency/_bitcoin/2col.en.md

@@ -7,8 +7,8 @@ fontcolor: '#FFF'
 
 # Bitcoin
 Send your bitcoins to our wallet at:
-16GoS122zKZ1dPyseJzraJStqRFBWJe1Ru
+bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
 
 ---
 
-![](qr0719.png)
+![](qr1223.png)

pages/cryptocurrency/_bitcoin/2col.es.md

@@ -6,8 +6,8 @@ fontcolor: '#FFF'
 
 # Bitcoin
 Envía [bitcoins](https://es.wikipedia.org/wiki/Bitcoin) a nuestra cartera a:  
-16GoS122zKZ1dPyseJzraJStqRFBWJe1Ru
+bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
 
 ---
 
-![](qr0719.png)
+![](qr1223.png)

pages/cryptocurrency/_bitcoin/2col.fr.md

@@ -6,8 +6,8 @@ fontcolor: '#FFF'
 
 # Bitcoin
 Envoyez vos bitcoins à notre porte-monnaie:
-16GoS122zKZ1dPyseJzraJStqRFBWJe1Ru
+bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
 
 ---
 
-![](qr0719.png)
+![](qr1223.png)

pages/cryptocurrency/_bitcoin/2col.it.md

@@ -7,8 +7,8 @@ fontcolor: '#FFF'
 
 # Bitcoin
 Invia i tuoi bitcoin nel nostro portafoglio a:
-16GoS122zKZ1dPyseJzraJStqRFBWJe1Ru
+bc1qju6pzk7lgfxcj0ddedv2l5vfvlmava93g4zxnl
 
 ---
 
-![](qr0719.png)
+![](qr1223.png)

pages/cryptocurrency/_monero/2col.de.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+# Monero
+Sende Deine Monero an unser Portemonnaie:
+8BwHmxFDKxrNLHDvFfSCmgA2ztRML3vMg96zgXz4eFoGb4hEKWWoAoBcDx3oWqR4Hp5ucgbPpGpB4NMhykKZfMJEJcNJFEx
+
+---
+
+![](mon1223.png)

pages/cryptocurrency/_monero/2col.en.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+# Monero
+Send your monero's to our wallet at:
+8BwHmxFDKxrNLHDvFfSCmgA2ztRML3vMg96zgXz4eFoGb4hEKWWoAoBcDx3oWqR4Hp5ucgbPpGpB4NMhykKZfMJEJcNJFEx
+
+---
+
+![](mon1223.png)

pages/cryptocurrency/_monero/2col.es.md

@@ -0,0 +1,13 @@
+---
+title: Mooero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+# Monero
+Envía Monero's a nuestra cartera a:  
+8BwHmxFDKxrNLHDvFfSCmgA2ztRML3vMg96zgXz4eFoGb4hEKWWoAoBcDx3oWqR4Hp5ucgbPpGpB4NMhykKZfMJEJcNJFEx
+
+---
+
+![](mon1223.png)

pages/cryptocurrency/_monero/2col.fr.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+# Monero
+Envoyez vos monero à notre porte-monnaie:
+8BwHmxFDKxrNLHDvFfSCmgA2ztRML3vMg96zgXz4eFoGb4hEKWWoAoBcDx3oWqR4Hp5ucgbPpGpB4NMhykKZfMJEJcNJFEx
+
+---
+
+![](mon1223.png)

pages/cryptocurrency/_monero/2col.it.md

@@ -0,0 +1,13 @@
+---
+title: Monero
+bgcolor: '#1F5C60'
+fontcolor: '#FFF'
+---
+
+# Monero
+Invia i tuoi monero nel nostro portafoglio a:
+8BwHmxFDKxrNLHDvFfSCmgA2ztRML3vMg96zgXz4eFoGb4hEKWWoAoBcDx3oWqR4Hp5ucgbPpGpB4NMhykKZfMJEJcNJFEx
+
+---
+
+![](mon1223.png)

pages/cryptocurrency/modular.de.md

@@ -8,6 +8,7 @@ content:
         custom:
             - _crypto
             - _bitcoin
+            - _monero
             - _faircoin
 body_classes: modular
 header_image: burning_money.png

pages/cryptocurrency/modular.en.md

@@ -8,6 +8,7 @@ content:
         custom:
             - _crypto
             - _bitcoin
+            - _monero
             - _faircoin
 body_classes: modular
 header_image: burning_money.png

pages/cryptocurrency/modular.es.md

@@ -8,6 +8,7 @@ content:
         custom:
             - _crypto
             - _bitcoin
+            - _monero
             - _faircoin
 body_classes: modular
 header_image: burning_money.png

pages/cryptocurrency/modular.fr.md

@@ -8,6 +8,7 @@ content:
         custom:
             - _crypto
             - _bitcoin
+            - __monero
             - _faircoin
 body_classes: modular
 header_image: burning_money.png

pages/cryptocurrency/modular.it.md

@@ -8,6 +8,7 @@ content:
         custom:
             - _crypto
             - _bitcoin
+            - _monero
             - _faircoin
 body_classes: modular
 header_image: burning_money.png