diff --git a/pages/03.services/02.email/_email-alias/2col-right.en.md b/pages/03.services/02.email/_email-alias/2col-right.en.md index 4059f70a..f573c82d 100644 --- a/pages/03.services/02.email/_email-alias/2col-right.en.md +++ b/pages/03.services/02.email/_email-alias/2col-right.en.md @@ -7,7 +7,7 @@ fontcolor: '#7A7A7A' ## Email Aliases Request Aliases - +Link Own Domain --- Aliases are now available for our regular supporters. By regular supporters we think of those who contribute the equivalent of at least one cup of coffee a month. @@ -16,6 +16,7 @@ We found this [list](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in- Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the Disroot platform running and make sure it is available for free for other people with less means. To request aliases you need to fill in this [form](https://disroot.org/forms/alias-request-form). +If you would like to use your own domain use this [form](https://disroot.org/forms/domain-linking-form). *If you already donated to disroot in the past and would still like to get aliases please get in contact with us.* diff --git a/pages/CHANGE.LOG b/pages/CHANGE.LOG new file mode 100644 index 00000000..689630d0 --- /dev/null +++ b/pages/CHANGE.LOG @@ -0,0 +1,4 @@ +This is changelog of disroot.org page. Here we will be noting all significant changes to the texts, such as added information, significant modifications and updates to existing ones etc. + +**CHANGELOG:** + - 20.12.2017 - added domain linking form and button diff --git a/pages/cryptocurrency/modular.en.md b/pages/cryptocurrency/modular.md similarity index 90% rename from pages/cryptocurrency/modular.en.md rename to pages/cryptocurrency/modular.md index 07dd6389..039fd42b 100644 --- a/pages/cryptocurrency/modular.en.md +++ b/pages/cryptocurrency/modular.md @@ -1,5 +1,5 @@ --- -title: Cryptocurrencies +title: Bitcoin content: items: '@self.modular' order: @@ -12,4 +12,3 @@ content: body_classes: modular header_image: burning_money.png --- - diff --git a/pages/forms/alias-request-form/form.en.md b/pages/forms/alias-request-form/form.en.md index 4f6ea05a..5613b612 100644 --- a/pages/forms/alias-request-form/form.en.md +++ b/pages/forms/alias-request-form/form.en.md @@ -87,8 +87,8 @@ form: validate: required: true - - name: referance - label: Referance + name: reference + label: Reference type: text placeholder: 'Name of payment holder or other transfer referance' validate: diff --git a/pages/forms/domain-linking-form/form.en.md b/pages/forms/domain-linking-form/form.en.md new file mode 100644 index 00000000..4e49956e --- /dev/null +++ b/pages/forms/domain-linking-form/form.en.md @@ -0,0 +1,154 @@ +--- +title: 'Domain Linking Form' +header_image: introverts.jpg +form: + name: Domain-linking-form + fields: + - + name: username + label: 'User Name' + placeholder: 'Enter your disroot user name' + autofocus: 'on' + autocomplete: 'on' + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: true + - + name: 'Domain' + lable: 'Your domain' + placeholder: your-domain + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: true + - + name: 'Alias 1' + label: Alias + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: true + - + name: 'Alias 2' + label: 'Second Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false + - + name: 'Alias 3' + label: 'Third Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false + - + name: 'Alias 4' + label: 'Forth Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false + - + name: 'Alias 5' + label: 'Fifth Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false + - + name: contribution + label: 'Contributing via' + placeholder: select + type: select + options: + patreon: Patreon + paypal: Paypal + bank: 'Bank transfer' + faircoin: Faircoin + bitcoin: Bitcoin + + validate: + required: true + - + name: amount + label: Amount + placeholder: 'in €, $, BTC etc.' + type: text + validate: + pattern: '[0-9.,]*' + required: true + - + name: frequency + label: Repeated + type: radio + default: monthly + options: + monthly: Monthly + yearly: Yearly + validate: + required: true + - + name: reference + label: Reference + type: text + placeholder: 'Name of payment holder or other transfer referance' + validate: + required: true + - + name: comments + type: textarea + - + name: honeypot + type: honeypot + buttons: + - + type: submit + value: Submit + - + type: reset + value: Reset + process: + - + email: + from: domain-request@disroot.org + to: '{{ form.value.username }}@disroot.org' + subject: '[Disroot] Your domain linking request' + body: '

Hi {{ form.value.username|e }},

Thank you for your contribution to Disroot.org!
We truly appreciate your generosity.

We will review your request and get back to you as soon as we can.


Here is a summary of the received request:

{% include ''forms/data.html.twig'' %}' + - + email: + from: domain-request@disroot.org + to: '{{ config.plugins.email.to }}' + subject: '[Domain linking request] - {{ form.value.username|e }}' + body: '{% include ''forms/data.html.twig'' %}' + - + save: + fileprefix: feedback- + dateformat: Ymd-His-u + extension: txt + body: '{% include ''forms/data.txt.twig'' %}' + - + message: 'Your domain linking request has been sent!' + - + display: thankyou +--- + +

Domain Linking Request

+

Fill in this form if you would like to use your own domain for Email aliases. +

+Please follow these steps to point your domain to our server (*this will also serve to verify the domain is really owned by you.*): +

    +
  1. Go to the DNS records settings for your domain
    2. +
  2. Point MX 10 record to disroot.org
    3. +
  3. Point SPF record to "v=spf1 mx a ptr include:disroot.org ~all"
    4. +
  4. Point TXT record to "v=spf1 mx ~all"
    5. +
+ +Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the Disroot platform running and make sure it is available for free for other people with less means. +

diff --git a/pages/forms/domain-linking-form/introverts.jpg b/pages/forms/domain-linking-form/introverts.jpg new file mode 100644 index 00000000..97c5b738 Binary files /dev/null and b/pages/forms/domain-linking-form/introverts.jpg differ diff --git a/pages/forms/domain-linking-form/thankyou/formdata.en.md b/pages/forms/domain-linking-form/thankyou/formdata.en.md new file mode 100644 index 00000000..848ccaf9 --- /dev/null +++ b/pages/forms/domain-linking-form/thankyou/formdata.en.md @@ -0,0 +1,12 @@ +--- +title: 'Aliases requested' +cache_enable: false +process: + twig: true +--- + +

**We will review your request and get back to you in the next days.** +
+
+
+**Here is a summary of the received request:** diff --git a/pages/forms/domain-linking-form/thankyou/formdata.fr.md b/pages/forms/domain-linking-form/thankyou/formdata.fr.md new file mode 100644 index 00000000..885cda76 --- /dev/null +++ b/pages/forms/domain-linking-form/thankyou/formdata.fr.md @@ -0,0 +1,12 @@ +--- +title: 'Alias demandés' +cache_enable: false +process: + twig: true +--- + +

**Nous examinerons votre demande et vous répondrons dans les prochains jours..** +
+
+
+**Voici un résumé de la demande reçue:**