Merge branch 'IT-homepage-update' of Disroot/Website into master

This commit is contained in:
meaz 2019-11-02 07:00:49 +00:00 committed by Gitea
commit 4e3f0482d0
8 changed files with 25 additions and 19 deletions

View File

@ -8,4 +8,4 @@ body_classes: modular
---
<br>
<a class="button button2" href="https://disroot.org/en/donate">SUPPORT US</a>
<a class="button button2" href="https://disroot.org/en/donate">SUPPORTACI</a>

View File

@ -3,17 +3,17 @@ title: Online-donation
bgcolor: '#f2f2f2'
---
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution.</p>
<p style="color:#1e5a5e; padding-left:10%; padding-right:10%; text-align:justify;">Disroot si basa su donazioni e supporto da parte della sua comunità. Se desideri che il progetto continui a vivere e vuoi contribuire ad aumentare lo spazio disponibile per potenziali nuovi disrooter, utilizza uno dei seguenti metodi per fornire un contributo finanziario.</p>
---
<div class="donate">
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Dona utilizzando Liberapay" src="donate/_donate/lp_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Diventa un Patron" src="donate/_donate/p_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter this!" src="donate/_donate/f_button.png" /></a>
<a href="https://flattr.com/profile/disroot" target=_blank><img alt="Flatter" src="donate/_donate/f_button.png" /></a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="Paypal" src="donate/_donate/pp_button.png" /></a>

View File

@ -66,9 +66,15 @@ services:
title: Umfragen
icon: polls.png
link: 'https://disroot.org/services/polls'
<<<<<<< HEAD
text: "Online service for planning an appointment or making decisions quickly and easily."
button: 'https://poll.disroot.org'
buttontext: "Start a poll"
=======
text: "Onlinedienst zur Abstimmung von Terminen oder um schnell eine gemeinsame Entscheidung zu treffen."
button: 'https://polls.disroot.org'
buttontext: "Umfrage starten"
>>>>>>> master
-
title: 'Projekt-Board'
icon: project_board.png

View File

@ -67,7 +67,7 @@ services:
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Online service for planning an appointment or making decisions quickly and easily."
button: 'https://polls.disroot.org'
button: 'https://poll.disroot.org'
buttontext: "Start a poll"
-
title: 'Project Board'

View File

@ -67,7 +67,7 @@ services:
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Servicio en línea para planificar reuniones o tomar decisiones en forma rápida y sencilla."
button: 'https://polls.disroot.org'
button: 'https://poll.disroot.org'
buttontext: "Comienza una encuesta"
-
title: 'Tablero de proyecto'

View File

@ -67,7 +67,7 @@ services:
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Service en ligne pour planifier un rendez-vous ou prendre des décisions rapidement et facilement."
button: 'https://polls.disroot.org'
button: 'https://poll.disroot.org'
buttontext: "Sonder"
-
title: 'Project Board'

View File

@ -10,42 +10,42 @@ services:
title: Email
icon: email.png
link: 'https://disroot.org/services/email'
text: "Free and secure email accounts for your desktop IMAP client or via a Web-interface."
text: "Account di posta libero e sicuro accessibile attraverso client o interfaccia web."
button: 'https://mail.disroot.org'
buttontext: "Log in"
-
title: Cloud
icon: cloud.png
link: 'https://disroot.org/services/nextcloud/'
text: "Your data under your control! Collaborate, sync & share files, calendars, contacts and more."
text: "I tuoi dati sotto il tuo controllo. Collabora, sincronizza e condividi file, calendari e contatti."
button: 'https://cloud.disroot.org'
buttontext: "Log in"
-
title: Forum
icon: forum.png
link: 'https://disroot.org/services/forum'
text: "Discussion forums / mailing-list for your community, group or collective."
text: "Forum di discussione/mailing list per la tua comunità, gruppo o collettivo."
button: 'https://forum.disroot.org'
buttontext: "Log in"
-
title: XMPP Chat
icon: xmpp.png
link: 'https://disroot.org/services/xmpp'
text: "Decentralized instant messaging."
text: "Sistema di messaggistica decentralizzato."
button: 'https://webchat.disroot.org'
buttontext: "Log in"
-
title: Pads
icon: pads.png
link: 'https://disroot.org/services/pads'
text: "Create and edit documents and spreadsheets collaboratively in real-time directly in the web browser."
text: "Crea e modifica documenti e fogli di calcolo direttamente nel browser web."
button: 'https://pad.disroot.org'
buttontext: "Start a pad"
-
title: 'Paste Bin'
icon: pastebin.png
link: 'https://disroot.org/services/privatebin'
text: "Encrypted online paste-bin/discussion board."
text: "Paste Bin crittografata."
button: 'https://bin.disroot.org'
buttontext: "Share a pastebin"
-
@ -59,21 +59,21 @@ services:
title: Search
icon: search.png
link: 'https://disroot.org/services/search'
text: "An anonymous multi search engine platform."
text: "Un metamotore di ricerca anonimo."
button: 'https://search.disroot.org'
buttontext: "Search"
-
title: Polls
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Online service for planning an appointment or making decisions quickly and easily."
button: 'https://polls.disroot.org'
text: "Servizio online per pianificare appuntamenti e prendere decisioni in modo veloce e facile."
button: 'https://poll.disroot.org'
buttontext: "Start a poll"
-
title: 'Project Board'
icon: project_board.png
link: 'https://disroot.org/services/project-board'
text: "A project management tool."
text: "Uno strumento di project management."
button: 'https://board.disroot.org'
buttontext: "Log in"
---

View File

@ -67,7 +67,7 @@ services:
icon: polls.png
link: 'https://disroot.org/services/polls'
text: "Online service for planning an appointment or making decisions quickly and easily."
button: 'https://polls.disroot.org'
button: 'http://polls.disroot.org'
buttontext: "Start a poll"
-
title: 'Project Board'