Merge branch 'multiple_web_fixes' into 'master'

added x-storgae buttong to email service page and relevant form

See merge request disroot/website!74
This commit is contained in:
antil0pa 2019-05-01 10:24:58 +02:00
commit 0b7b531b98
22 changed files with 576 additions and 24 deletions

View File

@ -7,12 +7,14 @@ text_align: left
The best email experience is through somewhat forgotten native email clients. There is plenty of E-mail clients for desktop or mobile devices, using those is usually much more convenient than login in to the web-client every time.
Below we mention just a few, but similar configuration applies to most of email clients out there:
- Desktop: Thunderbird (most popular open source email client by Mozilla).
- Android: K9 Mail.
- SailfishOS Mail - Default email client for SailfishOS.
<ul class=disc>
<li>Desktop: Thunderbird (most popular open source email client by Mozilla).</li>
<li>Android: K9 Mail.</li>
</li>SailfishOS Mail - Default email client for SailfishOS.</li>
</ul>
Check our [Howto page](https://howto.disroot.org/en/communication/email/clients) dedicated to all email clients.
<br>
*Check the settings on top of this page to set up your* **Disroot** *email on your device. These settings are standard information that tells your email client how to reach* **Disroot**'*s email server.*
---

View File

@ -7,10 +7,11 @@ text_align: left
La mejor experiencia con el correo electrónico es a través de los, en cierta manera, olvidados clientes de correo nativos. Hay un montón de clientes de Correo para el escritorio y dispositivos móviles, y utilizarlos es, habitualmente, mucho más práctico que iniciar sesión cada vez en el cliente web.
Debajo sólo mencionamos algunos, pero la misma configuración aplica para la mayoría de los clientes de correo que hay:
- Escritorio: Thunderbird (el cliente de correo de código abierto más popular, de Mozilla).
- Android: K9 Mail.
- SailfishOS Mail: el cliente de correo por defecto para SailfishOS.
<ul class=disc>
<li>Escritorio: Thunderbird (el cliente de correo de código abierto más popular, de Mozilla).</li>
<li>Android: K9 Mail.</li>
<li>SailfishOS Mail: el cliente de correo por defecto para SailfishOS.</li>
</ul>
Mira nuestra [página de manuales](https://howto.disroot.org/es/communication/email/clients) dedicada a los clientes de correo.
*Verifica las configuraciones en la parte superior de esta página para configurar tu cuenta de correo de* **Disroot** *en tu dispositivo. Estos ajustes son información estándar que le dicen a tu cliente de correo cómo conectar con el servidor de correo de* **Disroot**.

View File

@ -7,10 +7,11 @@ text_align: left
La meilleure expérience email est par le biais de clients de messagerie natifs quelque peu oubliés. Il y a beaucoup de clients e-mail pour les PC ou les appareils mobiles, l'utilisation de ceux-ci est généralement beaucoup plus pratique que de se connecter au client Web à chaque fois.
Ci-dessous, nous n'en mentionnons que quelques-uns, mais une configuration similaire s'applique à la plupart des clients de messagerie:
- PC: Thunderbird (le client de messagerie open source le plus populaire de Mozilla).
- Android: K9 Mail.
- SailfishOS Mail - Client de messagerie par défaut pour SailfishOS.
<ul class=disc>
<li>PC: Thunderbird (le client de messagerie open source le plus populaire de Mozilla).</li>
<li>Android: K9 Mail.</li>
<li>SailfishOS Mail - Client de messagerie par défaut pour SailfishOS.</li>
</ul>
Consultez notre [page de guides](https://howto.disroot.org/en/communication/email/clients) dédié à tous les clients de messagerie.
*Vérifiez les paramètres en haut de cette page pour configurer votre messagerie* **Disroot** *sur votre appareil. Ces paramètres sont des informations standard qui indiquent à votre client de messagerie comment accéder au serveur de messagerie de* **Disroot**.

View File

@ -7,9 +7,11 @@ text_align: left
Il miglior modo per utilizzare il servizio di posta elettronica è attraverso un client. Esistono svariati client di posta elettronica sia per dispositivi desktop sia per dispositivi mobili.
Di seguito menzioniamo quelli più comuni, ma ne esistono molti altri la cui configurazione è solitamente simile:
- Desktop: Thunderbird (il popolare client di posta open source di Mozilla)
- Android: K9 Mail
- SailfishOS Mail - Client di posta elettronica predefinito per SailfishOS.
<ul class=disc>
<li>Desktop: Thunderbird (il popolare client di posta open source di Mozilla)</li>
<li>Android: K9 Mail</li>
<li>SailfishOS Mail - Client di posta elettronica predefinito per SailfishOS.</li>
</ul>
Guarda la pagina delle [guide](https://howto.disroot.org/en/communication/email/clients) dedicata ai client di posta elettronica.

View File

@ -0,0 +1,18 @@
---
title: 'Extra mailbox Storage'
bgcolor: '#FFF'
fontcolor: '#7A7A7A'
---
## Add storage to your mailbox
It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month.
To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-mailbox).<br>
---
<br><br>
<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>

View File

@ -0,0 +1,18 @@
---
title: 'Extra mailbox Storage'
bgcolor: '#FFF'
fontcolor: '#7A7A7A'
---
## Add storage to your mailbox
It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month.
To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-mailbox).<br>
---
<br><br>
<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>

View File

@ -0,0 +1,18 @@
---
title: 'Extra mailbox Storage'
bgcolor: '#FFF'
fontcolor: '#7A7A7A'
---
## Add storage to your mailbox
It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month.
To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-mailbox).<br>
---
<br><br>
<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>

View File

@ -0,0 +1,18 @@
---
title: 'Extra mailbox Storage'
bgcolor: '#FFF'
fontcolor: '#7A7A7A'
---
## Add storage to your mailbox
It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month.
To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-mailbox).<br>
---
<br><br>
<a class="button button1" href="https://disroot.org/en/forms/extra-storage-mailbox">Request Extra Mailbox Storage</a>

View File

@ -9,9 +9,10 @@ content:
- _email
- _email-settings
- _email-encryption
- _email-alias
- _email-x-storage
- _email-webmail
- _email-client
- _email-alias
body_classes: modular
header_image: 'riot-dog.jpg'
---

View File

@ -6,7 +6,7 @@ fontcolor: '#7A7A7A'
## Extra Cloud 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.
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 or all of the additional space for mail storage, please specify that in the comment section in the request form.
To request extra storage you need to fill in this [form](https://disroot.org/en/forms/extra-storage-space).<br>
@ -15,4 +15,4 @@ To request extra storage you need to fill in this [form](https://disroot.org/en/
<br><br>
<a class="button button1" href="https://disroot.org/en/forms/extra-storage-space">Request Extra Storage</a>
<a class="button button1" href="https://disroot.org/en/forms/extra-storage-space">Request Extra Storage</a>

View File

@ -7,10 +7,10 @@ content:
dir: asc
custom:
- _nextcloud
- _nextcloud-x-storage
- _nextcloud-data
- _nextcloud-highlights
- _nextcloud-encryption
- _nextcloud-x-storage
- _nextcloud-e2e
- _nextcloud-federation
- _nextcloud-sync
@ -29,4 +29,3 @@ content:
body_classes: modular
header_image: smokecloud.jpg
---

View File

@ -0,0 +1,110 @@
---
title: 'Extra Mailbox Storage'
form:
name: 'Extra Mailbox Space'
fields:
-
name: username
label: 'User Name'
placeholder: 'Enter the Disroot user name'
autofocus: 'on'
autocomplete: 'on'
type: text
validate:
pattern: '[A-Za-z0-9.]*'
required: true
-
name: email
label: 'Contact Email Address'
placeholder: 'Enter an email address to contact you'
type: text
validate:
pattern: '[A-Za-z0-9.-_@]*'
required: true
-
name: 'Additional Storage'
label: 'Additional Storage in GB'
type: range
validate:
min: 1
max: 10
default: 1
required: true
-
name: comments
type: textarea
-
name: 'payment details'
type: display
size: large
label: ' '
markdown: true
content: '**Payment details:**'
-
name: country
label: 'Country (necessary for VAT purposes)'
placeholder: 'Please specify the country your paying account is registered in'
type: text
validate:
pattern: '[A-Za-z]*'
required: true
-
name: payment
label: 'Payment via (May be subjected to extra transaction fees)'
placeholder: select
type: select
options:
paypal: Paypal
bank: 'Bank transfer'
faircoin: Faircoin
bitcoin: Bitcoin
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
buttons:
-
type: submit
value: Submit
-
type: reset
value: Reset
process:
-
email:
from: extra-storage@disroot.org
to: '{{ form.value.email }}'
subject: '[Disroot] Extra Storage Request'
body: 'Dear {{ form.value.username }}, <br><br> We have received a request for extra storage space. <br><br>You should receive your confirmation per E-mail with you billing reference. <br> Once we receive your payment we will assign you the extra storage. <br><br> Thank you for supporting Disroot!'
-
email:
from: extra-storage@disroot.org
to: '{{ config.plugins.email.to }}'
subject: '[Extra storage request] - {{ form.value.username|e }}'
body: '{% include ''forms/data.html.twig'' %}'
-
save:
fileprefix: feedback-
dateformat: Ymd-His-u
extension: txt
body: '{% include ''forms/data.html.twig'' %}'
-
message: 'Your request has been sent!'
-
display: thankyou
---
<h1 class="form-title"> Extra Storage Space </h1>
<p class="form-text">It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)</p>

View File

@ -0,0 +1,109 @@
---
title: 'Extra Mailbox Storage'
form:
name: 'Extra Mailbox Space'
fields:
-
name: Nombre de usuario
label: 'Nombre de usuario'
placeholder: 'Ingresa el nombre de usuario de Disroot'
autofocus: 'on'
autocomplete: 'on'
type: text
validate:
pattern: '[A-Za-z0-9.]*'
required: true
-
name: Correo
label: 'Dirección de correo de Contacto'
placeholder: 'Ingresa una dirección de correo para contactarte'
type: text
validate:
pattern: '[A-Za-z0-9.-_@]*'
required: true
-
name: 'Additional Storage'
label: 'Additional Storage in GB'
type: range
validate:
min: 1
max: 10
default: 1
required: true
-
name: Comentarios
type: textarea
-
name: 'Detalles del Pago'
type: display
size: large
label: ' '
markdown: true
content: '**Detalles del Pago:**'
-
name: País
label: 'País (Necesario por razones de I.V.A)'
placeholder: 'Por favor, especifica el país en el que está registrada tu cuenta de pago'
type: text
validate:
pattern: '[A-Za-z]*'
required: true
-
name: Pago
label: 'Pago a través de: (Podría estar sujeto a costos adicionales de transacción)'
placeholder: select
type: select
options:
paypal: Paypal
bank: 'Transferencia bancaria'
faircoin: Faircoin
bitcoin: Bitcoin
validate:
required: true
-
name: Frecuencia
label: Mensual/Anual
type: radio
default: yearly
options:
monthly: Mensual
yearly: Mensual/Anual
validate:
required: true
-
name: honeypot
type: honeypot
buttons:
-
type: submit
value: Enviar
-
type: reset
value: Reiniciar
process:
-
email:
from: extra-storage@disroot.org
to: '{{ form.value.email }}'
subject: '[Disroot] Solicitud de Almacenamiento Extra'
body: 'Estimad@ {{ form.value.username }}, <br><br> Hemos recibido una solicitud de espacio extra de almacenamiento. <br><br>Deberías recibir tu confirmación por correo con tu referencia de facturación. <br> Una vez que hayamos recibido tu pago, te adjudicaremos el espacio adicional. <br><br> ¡Gracias por apoyar a Disroot!'
-
email:
from: extra-storage@disroot.org
to: '{{ config.plugins.email.to }}'
subject: '[Solicitud de espacio extra] - {{ form.value.username|e }}'
body: '{% include ''forms/data.html.twig'' %}'
-
save:
fileprefix: feedback-
dateformat: Ymd-His-u
extension: txt
body: '{% include ''forms/data.html.twig'' %}'
-
message: '¡Tu solicitud ha sido enviada!'
-
display: thankyou
---
<h1 class="form-title"> Extra Storage Space </h1>
<p class="form-text">It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)</p>

View File

@ -0,0 +1,109 @@
---
title: 'Extra Mailbox Storage'
form:
name: 'Extra Mailbox Space'
fields:
-
name: username
label: "Nom d'utilisateur"
placeholder: "Tapez votre nom d'utilisateur Disroot"
autofocus: 'on'
autocomplete: 'on'
type: text
validate:
pattern: '[A-Za-z0-9.]*'
required: true
-
name: email
label: 'Adresse email de contact'
placeholder: 'Tapez une adresse email pour vous contacter'
type: text
validate:
pattern: '[A-Za-z0-9.-_@]*'
required: true
-
name: 'Additional Storage'
label: 'Additional Storage in GB'
type: range
validate:
min: 1
max: 10
default: 1
required: true
-
name: comments
type: textarea
-
name: 'Informations de paiement'
type: display
size: large
label: ' '
markdown: true
content: '**Informations de paiement:**'
-
name: country
label: 'Pays (nécessaires à des fins de TVA)'
placeholder: 'Veuillez spécifier le pays dans lequel votre compte de paiement est enregistré.'
type: text
validate:
pattern: '[A-Za-z]*'
required: true
-
name: payment
label: 'Paiement par'
placeholder: select
type: select
options:
paypal: Paypal
bank: 'Virement bancaire'
faircoin: Faircoin
bitcoin: Bitcoin
validate:
required: true
-
name: frequency
label: Mensuellement/Annuellement
type: radio
default: Annuellement
options:
monthly: Mensuellement
yearly: Annuellement
validate:
required: true
-
name: honeypot
type: honeypot
buttons:
-
type: submit
value: Envoyer
-
type: reset
value: Réinitialiser
process:
-
email:
from: extra-storage@disroot.org
to: '{{ form.value.email }}'
subject: '[Disroot] Demande de stockage supplémentaire'
body: 'Cher/Chère {{ form.value.username }}, <br><br> Nous avons reçu une demande de stockage supplémentaire. <br><br>Vous devriez recevoir votre confirmation par E-mail avec votre référence de facturation. <br> Une fois que nous aurons reçu votre paiement, nous vous attribuerons le stockage supplémentaire. <br><br> Merci de soutenir Disroot!'
-
email:
from: extra-storage@disroot.org
to: '{{ config.plugins.email.to }}'
subject: '[Extra storage request] - {{ form.value.username|e }}'
body: '{% include ''forms/data.html.twig'' %}'
-
save:
fileprefix: feedback-
dateformat: Ymd-His-u
extension: txt
body: '{% include ''forms/data.html.twig'' %}'
-
message: 'Votre demande a été envoyée!'
-
display: Merci
---
<h1 class="form-title"> Extra Storage Space </h1>
<p class="form-text">It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)</p>

View File

@ -0,0 +1,110 @@
---
title: 'Extra Mailbox Storage'
form:
name: 'Extra Mailbox Space'
fields:
-
name: username
label: 'Nome utente'
placeholder: 'Inserire il nome utente Disroot'
autofocus: 'on'
autocomplete: 'on'
type: text
validate:
pattern: '[A-Za-z0-9.]*'
required: true
-
name: email
label: 'Indirizzo Email del contatto'
placeholder: 'Inserisci un indirizzo Email per contattarti'
type: text
validate:
pattern: '[A-Za-z0-9.-_@]*'
required: true
-
name: 'Additional Storage'
label: 'Additional Storage in GB'
type: range
validate:
min: 1
max: 10
default: 1
required: true
-
name: comments
type: textarea
-
name: 'payment details'
type: display
size: large
label: ' '
markdown: true
content: '**Dettagli del pagamento:**'
-
name: country
label: 'Paese (necessario ai fini IVA)'
placeholder: 'Si prega di specificare il paese in cui è registrato il tuo conto di pagamento'
type: text
validate:
pattern: '[A-Za-z]*'
required: true
-
name: payment
label: 'Pagamento tramite (Può essere soggetto a spese di transazione extra)'
placeholder: select
type: select
options:
paypal: Paypal
bank: 'Bonifico bancario'
faircoin: Faircoin
bitcoin: Bitcoin
patreon: Patreon
validate:
required: true
-
name: frequency
label: Monthly/Yearly
type: radio
default: yearly
options:
monthly: Mensile
yearly: Annuale
validate:
required: true
-
name: honeypot
type: honeypot
buttons:
-
type: submit
value: Invia
-
type: reset
value: Azzera
process:
-
email:
from: extra-storage@disroot.org
to: '{{ form.value.email }}'
subject: '[Disroot] Richiesta di archiviazione extra'
body: 'Gentile {{ form.value.username }}, <br><br> Abbiamo ricevuto una richiesta di spazio di archiviazione supplementare. <br><br>Dovresti ricevere la tua conferma via Email con il tuo riferimento di fatturazione. <br> Una volta ricevuto il tuo pagamento ti assegneremo il volume extra. <br><br> Grazie per sostenere Disroot!'
-
email:
from: extra-storage@disroot.org
to: '{{ config.plugins.email.to }}'
subject: '[Extra storage request] - {{ form.value.username|e }}'
body: '{% include ''forms/data.html.twig'' %}'
-
save:
fileprefix: feedback-
dateformat: Ymd-His-u
extension: txt
body: '{% include ''forms/data.html.twig'' %}'
-
message: 'La tua richiesta è stata inviata!'
-
display: grazie
---
<h1 class="form-title"> Extra Storage Space </h1>
<p class="form-text">It is possible to extend your E-mail storage with up to 10 GB for the cost of 0.15 euro per GB per month. If you are adding storage both to your mailbox and cloud account - use [this form](https://disroot.org/en/forms/extra-storage-space)</p>

View File

@ -0,0 +1,12 @@
---
title: 'Extra storage requested'
cache_enable: false
process:
twig: true
---
<br><br> **We have received your request. <br><br>You will get a confirmation per E-mail with you billing reference. <br> Once we receive your payment we will assign you the extra storage. <br><br> Thank you for supporting Disroot!'**
<br>
<hr>
<br>
**Here is a summary of the received request:**

View File

@ -0,0 +1,12 @@
---
title: 'Almacenamiento extra solicitado'
cache_enable: false
process:
twig: true
---
<br><br> **Hemos recibido tu solicitud. <br><br>Recibirás una confirmación por correo con tu referencia de facturación. <br> Una vez que hayamos recibido tu pago, te adjudicaremos el espacio adicional. <br><br> ¡Gracias por apoyar a Disroot!**
<br>
<hr>
<br>
**Aquí está el resumen de la solicitud recibida:**

View File

@ -0,0 +1,12 @@
---
title: 'Richiesta di archiviazione extra'
cache_enable: false
process:
twig: true
---
<br><br> **Abbiamo ricevuto la vostra richiesta. <br><br>Riceverai una conferma via e-mail con il tuo riferimento di fatturazione. <br> Una volta ricevuto il tuo pagamento ti assegneremo il deposito extra. <br><br> Grazie per il sostegno a Disroot!'**
<br>
<hr>
<br>
**Ecco una sintesi della richiesta ricevuta:**

View File

@ -24,7 +24,7 @@ form:
-
name: 'Amount of Space'
label: 'Total Storage Space'
type: radio
type: select
default: 14GB
options:
14GB: '14GB (2.10€ per month)'

View File

@ -24,7 +24,7 @@ form:
-
name: 'Cantidad de espacio'
label: 'Espacio total de almacenamiento'
type: radio
type: select
default: 14GB
options:
14GB: '14GB (2.10€ por mes)'

View File

@ -24,7 +24,7 @@ form:
-
name: "Quantité d'espace"
label: "Espace de stockage total"
type: radio
type: select
default: 14GB
options:
14GB: '14Go (2.10€ par mois)'

View File

@ -24,7 +24,7 @@ form:
-
name: 'Quantità di spazio'
label: 'Spazio di archiviazione totale'
type: radio
type: select
default: 14GB
options:
14GB: '14GB (2.10€ mensili)'