diff --git a/pages/03.services/02.email/_email-x-storage/2col.en.md b/pages/03.services/02.email/_email-x-storage/2col.en.md index b25fbe0c..b3131c1a 100644 --- a/pages/03.services/02.email/_email-x-storage/2col.en.md +++ b/pages/03.services/02.email/_email-x-storage/2col.en.md @@ -7,14 +7,25 @@ section_id: storage --- ## Add storage to your mailbox +If the FREE 1GB is not enough, you can extend your E-mail storage. -It is possible to extend your E-mail storage from 1GB to 10GB for the cost of 0.15 euro per GB per month, paid yearly. +Here are the prices **per year, payment fees included**: -To request extra storage you need to fill in this [form](/forms/extra-storage-mailbox).
+|||| +|---:|---|---:| +| 5GB |......| 11€ | +| 10GB |......| 20€ | +| 15GB |......| 29€ | +| 30GB |......| 56€ | +| 45GB |......| 83€ | +| 60GB |......| 110€ | +
+Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%. + ---

-Request Extra Mailbox Storage +Request Extra Mailbox Storage diff --git a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md index 14e2d760..9d46588c 100644 --- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md +++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col.en.md @@ -8,14 +8,25 @@ section_id: storage ## Cloud Storage Space -With your **Disroot** account, you get 2GB FREE storage. -It is possible to extend your cloud storage from 2GB to 14, 29 or 54GB for the cost of 0.15 euro per GB per month. You can also choose to use some or all of the additional space for mail storage, please specify that in the comment section in the request form. +If the FREE 2GB is not enough, you can extend your cloud storage. -To request extra storage you need to fill in this [form](/forms/extra-storage-space).
+Here are the prices **per year, payment fees included**: +|||| +|---:|---|---:| +| 5GB |......| 11€ | +| 10GB |......| 20€ | +| 15GB |......| 29€ | +| 30GB |......| 56€ | +| 45GB |......| 83€ | +| 60GB |......| 110€ | + + +
+Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%. ---

-Request Extra Storage +Request Extra Storage diff --git a/pages/07.perks/_cloud_storage/2col.en.md b/pages/07.perks/_cloud_storage/2col.en.md deleted file mode 100644 index 788264ec..00000000 --- a/pages/07.perks/_cloud_storage/2col.en.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: 'Cloud storage' -bgcolor: '#FFF' -fontcolor: '#555' -wider_column: right ---- - -# Cloud storage - -![cloud](logo_cloud.png?resize=150) - ---- - -
-With your **Disroot** account, you get 2GB of FREE storage. - -However, it is possible to extend your cloud storage from 2GB **to 14, 29 or 54GB** for the cost of 0.15 euro per GB per month (VAT not included). - -You can also choose to use some or all of the additional space for email storage *(make sure to specify it in the comment section of the request form)*. - -Request Extra Cloud Storage diff --git a/pages/07.perks/_cloud_storage/2col.de.md b/pages/07.perks/_extra_storage/2col.de.md similarity index 100% rename from pages/07.perks/_cloud_storage/2col.de.md rename to pages/07.perks/_extra_storage/2col.de.md diff --git a/pages/07.perks/_extra_storage/2col.en.md b/pages/07.perks/_extra_storage/2col.en.md new file mode 100644 index 00000000..0eb3e095 --- /dev/null +++ b/pages/07.perks/_extra_storage/2col.en.md @@ -0,0 +1,34 @@ +--- +title: 'Extra storage' +bgcolor: '#FFF' +fontcolor: '#555' +wider_column: right +--- + +# More storage for mail and/or cloud + +![email](logo_email.png?resize=150) ![cloud](logo_cloud.png?resize=150) + +--- + +
+With your **Disroot** account, you get FREE storage: 1GB for your emails, 2GB for the cloud. However, we offer the possibility to extend this. + +Here are the prices **per year, payment fees included**: + +|||| +|---:|---|---:| +| 5GB |......| 11€ | +| 10GB |......| 20€ | +| 15GB |......| 29€ | +| 30GB |......| 56€ | +| 45GB |......| 83€ | +| 60GB |......| 110€ | + + +
+Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%. + +You can decide to allocate this extra storage as you wish between mail and cloud. For example, if you get the 10GB storage, you could decide to have 8GB for cloud, and 2GB for mail. + +Request Extra Storage diff --git a/pages/07.perks/_cloud_storage/2col.es.md b/pages/07.perks/_extra_storage/2col.es.md similarity index 100% rename from pages/07.perks/_cloud_storage/2col.es.md rename to pages/07.perks/_extra_storage/2col.es.md diff --git a/pages/07.perks/_cloud_storage/2col.fr.md b/pages/07.perks/_extra_storage/2col.fr.md similarity index 100% rename from pages/07.perks/_cloud_storage/2col.fr.md rename to pages/07.perks/_extra_storage/2col.fr.md diff --git a/pages/07.perks/_cloud_storage/2col.it.md b/pages/07.perks/_extra_storage/2col.it.md similarity index 100% rename from pages/07.perks/_cloud_storage/2col.it.md rename to pages/07.perks/_extra_storage/2col.it.md diff --git a/pages/07.perks/_cloud_storage/logo_cloud.png b/pages/07.perks/_extra_storage/logo_cloud.png similarity index 100% rename from pages/07.perks/_cloud_storage/logo_cloud.png rename to pages/07.perks/_extra_storage/logo_cloud.png diff --git a/pages/07.perks/_mail_storage/logo_email.png b/pages/07.perks/_extra_storage/logo_email.png similarity index 100% rename from pages/07.perks/_mail_storage/logo_email.png rename to pages/07.perks/_extra_storage/logo_email.png diff --git a/pages/07.perks/_mail_storage/2col.de.md b/pages/07.perks/_mail_storage/2col.de.md deleted file mode 100644 index 199042a2..00000000 --- a/pages/07.perks/_mail_storage/2col.de.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: 'Email Speicher' -bgcolor: '#1F5C60' -fontcolor: '#FFF' -wider_column: right ---- - -
-In Deinem **Disroot** Account sind 1 GB FREIER Speicher für Deine E‑Mails enthalten. - -Natürlich ist es möglich, Deinen E‑Mailspeicherplatz von 1 GB **auf bis zu 10 GB** zu erweitern, zum Preis von 0,15 EUR pro GB pro Monat mit jährlicher Zahlung (VAT nicht enthalten). - -Zusätzlichen E‑Mailspeicher beantragen - ---- - -# E‑Mailspeicher - -![email](logo_email.png?resize=150) diff --git a/pages/07.perks/_mail_storage/2col.en.md b/pages/07.perks/_mail_storage/2col.en.md deleted file mode 100644 index cd912620..00000000 --- a/pages/07.perks/_mail_storage/2col.en.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: 'Mail storage' -bgcolor: '#1F5C60' -fontcolor: '#FFF' -wider_column: right ---- - -
-With your **Disroot** account, you get 1GB of FREE storage for your emails. - -However, it is possible to extend your E-mail storage from 1GB **up to 10GB** for the cost of 0.15 euro per GB per month, paid yearly (VAT not included). - -Request Extra Mailbox Storage - ---- - -# Mail storage - -![email](logo_email.png?resize=150) diff --git a/pages/07.perks/_mail_storage/2col.es.md b/pages/07.perks/_mail_storage/2col.es.md deleted file mode 100644 index 10f9cd70..00000000 --- a/pages/07.perks/_mail_storage/2col.es.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: 'Almacenamiento para el Correo' -bgcolor: '#1F5C60' -fontcolor: '#FFF' -wider_column: right ---- - -
-Con tu cuenta de **Disroot**, obtienes 1GB de almacenamiento gratuito para el buzón. - -Sin embargo, es posible ampliar el espacio del correo de 1GB **hasta 10GB** por 0.15 euro mensuales por GB, abonado anualmente (IVA no incluido). - -Solicitar Almacenamiento Extra para el Buzón - ---- - -# Almacenamiento de Correo - -![email](logo_email.png?resize=150) diff --git a/pages/07.perks/_mail_storage/2col.fr.md b/pages/07.perks/_mail_storage/2col.fr.md deleted file mode 100644 index ddff7d42..00000000 --- a/pages/07.perks/_mail_storage/2col.fr.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: 'Espace email' -bgcolor: '#1F5C60' -fontcolor: '#FFF' -wider_column: right ---- - -
-Avec votre compte **Disroot**, vous bénéficiez d'1 Go d'espace de stockage GRATUIT pour vos e-mails. - -Cependant, il est possible d'étendre ce stockage de vos e-mails de 1 Go **jusqu'à 10 Go** pour le coût de 0,15 euro par Go par mois, payé annuellement (TVA non incluse). - -Demande d'un espace mail supplémentaire - ---- - -# Mail storage - -![email](logo_email.png?resize=150) diff --git a/pages/07.perks/_mail_storage/2col.it.md b/pages/07.perks/_mail_storage/2col.it.md deleted file mode 100644 index 799a604a..00000000 --- a/pages/07.perks/_mail_storage/2col.it.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: 'Spazio email' -bgcolor: '#1F5C60' -fontcolor: '#FFF' -wider_column: right ---- - -
-Con il tuo account **Disroot**, ricevi 1 GB di spazio di archiviazione gratuito per le tue e-mail. - -Tuttavia, è possibile estendere lo spazio di archiviazione della posta elettronica da 1GB **fino a 10GB** al costo di 0,15 euro per GB al mese, con pagamento annuale(IVA esclusa). - -Richiedi spazio extra per la tua Mailbox - ---- - -# Spazio email - -![email](logo_email.png?resize=150) diff --git a/pages/07.perks/modular.en.md b/pages/07.perks/modular.en.md index eff1e26e..420a0511 100644 --- a/pages/07.perks/modular.en.md +++ b/pages/07.perks/modular.en.md @@ -8,8 +8,7 @@ content: dir: asc custom: - _message1 - - _cloud_storage - - _mail_storage + - _extra_storage - _message2 - _custom_domain - _how diff --git a/pages/forms/extra-storage-space/form.en.md b/pages/forms/extra-storage-space/form.en.md index 8b358af7..6ea97366 100644 --- a/pages/forms/extra-storage-space/form.en.md +++ b/pages/forms/extra-storage-space/form.en.md @@ -25,13 +25,32 @@ form: name: 'Amount of Space' label: 'Total Storage Space' type: select - default: 14GB + default: 5GB options: - 14GB: '14GB (2.10€ per month)' - 29GB: '29GB (4.35€ per month)' - 54GB: '54GB (8.10€ per month)' + 5GB: '5GB for 11€ annually' + 10GB: '10GB for 20€ annually' + 15GB: '15GB for 29€ annually' + 30GB: '30GB for 56€ annually' + 45GB: '45GB for 83€ annually' + 60GB: '60GB for 110€ annually' validate: required: true + - + name: 'Mail size' + label: 'How many of these GB do you want for mail?' + placeholder: 'Enter the desired size for mail storage' + autofocus: 'on' + autocomplete: 'on' + type: number + + - + name: 'Cloud size' + label: 'How many of these GB do you want for cloud?' + placeholder: 'Enter the desired size for cloud storage' + autofocus: 'on' + autocomplete: 'on' + type: number + - name: comments type: textarea @@ -52,7 +71,7 @@ form: required: true - name: payment - label: 'Payment via (May be subjected to extra transaction fees)' + label: 'Payment via' placeholder: select type: select options: @@ -64,16 +83,6 @@ form: patreon: Patreon validate: required: true - - - name: frequency - label: Monthly/Yearly - type: radio - default: yearly - options: - monthly: Monthly - yearly: Yearly - validate: - required: true - name: honeypot type: honeypot @@ -111,4 +120,6 @@ form: ---

Extra Storage Space

-

It is possible to extend your cloud storage to 14, 29 or 54 GB for the cost of 0.15 euro per GB per month. You can also choose to use some of all of the additional space for mail storage, please specify that in the comment section in the request form.

+

With your Disroot account, you get FREE storage: 1GB for your emails, 2GB for the cloud. However, we offer the possibility to extend this.
+Prices are per year and payment fees included.
+However, European users have to add a VAT (Value Added Tax) which is 21% more.
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index ba9a4a7b..519565ea 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -97,6 +97,7 @@ yes | sudo -u "${WWW_USER}" php8.0 bin/gpm install tagcloud # https://github.com/Perlkonig/grav-plugin-tagcloud yes | sudo -u "${WWW_USER}" php8.0 bin/gpm install form +# https://github.com/getgrav/grav-plugin-form # Add Grav config (the second extra false should be set to true, but it creates an error in Grav ("Trying to access array offset on value of type null") # Create the Nginx config files and restart webserver