Merge branch 'NC_clients2' of Disroot/Website into master

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

@@ -1,7 +1,26 @@
 ---
-title: 'Nextcloud bookmarks'
+title: 'Bookmarks'
 bgcolor: '#FFF'
 fontcolor: '#555'
+text_align: left
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: Bookmarks
+        logo: en/bookmarks_logo.png
+        link: https://f-droid.org/en/packages/org.schabi.nxbookmarks/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
+
 ---
 
 ![](en/Bookmarks.png?lightbox=1024)
@@ -11,5 +30,3 @@ fontcolor: '#555'
 ## Bookmarks
 
 A bookmark manager for **Nextcloud**. Save your favourite pages and sync across devices.
-
-[Bookmarks on Android](https://f-droid.org/en/packages/org.schabi.nxbookmarks/)

pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.en.old

@@ -0,0 +1,15 @@
+---
+title: 'Nextcloud bookmarks'
+bgcolor: '#FFF'
+fontcolor: '#555'
+---
+
+![](en/Bookmarks.png?lightbox=1024)
+
+---
+
+## Bookmarks
+
+A bookmark manager for **Nextcloud**. Save your favourite pages and sync across devices.
+
+[Bookmarks on Android](https://f-droid.org/en/packages/org.schabi.nxbookmarks/)

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

@@ -1,19 +1,51 @@
 ---
-title: 'Calenders and Contacts'
+title: 'Calendars and Contacts'
 bgcolor: '#FFF'
 fontcolor: '#555'
+text_align: left
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: GOA
+        logo: en/goa.png
+        link: https://wiki.gnome.org/Projects/GnomeOnlineAccounts
+        text: 'Gnome online accounts'
+        platforms: [fa-linux]
+    -
+        title: Kaddressbook
+        logo: en/KDE.png
+        link: https://kde.org/applications/office/org.kde.kaddressbook
+        text:
+        platforms: [fa-linux]
+    -
+        title: Thunderbird
+        logo: en/thunderbird.png
+        link: https://www.thunderbird.net/
+        text:
+        platforms: [fa-linux, fa-windows]
+    -
+        title: DAVx⁵
+        logo: en/davx5.png
+        link: https://f-droid.org/en/packages/at.bitfire.davdroid/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
+
 ---
 
 ![](en/nextcloud-cal.png?lightbox=1024)
 
 ---
 
+
 ## 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.
-
-### Use your favorite client
-
-- **Gnome online accounts** on **Gnome**
-- **Kaddressbook** on **KDE**
-- [**DAVx⁵** on **Android**](https://f-droid.org/en/packages/at.bitfire.davdroid/)
+Share your calendars 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.

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

@@ -0,0 +1,47 @@
+---
+title: 'Calendars and Contacts Clients'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+text: 'Share your calendars 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.'
+text2: 'Choose your favorite client'
+image: /en/nextcloud-cal.png
+clients:
+    -
+        title: GOA
+        logo: en/goa.png
+        link: https://wiki.gnome.org/Projects/GnomeOnlineAccounts
+        text: 'Gnome online accounts'
+        platforms: [fa-linux]
+    -
+        title: Kaddressbook
+        logo: en/KDE.png
+        link: https://kde.org/applications/office/org.kde.kaddressbook
+        text:
+        platforms: [fa-linux]
+    -
+        title: Thunderbird
+        logo: en/thunderbird.png
+        link: https://www.thunderbird.net/
+        text:
+        platforms: [fa-linux, fa-windows]
+    -
+        title: DAVx⁵
+        logo: en/davx5.png
+        link: https://f-droid.org/en/packages/at.bitfire.davdroid/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
+
+---
+
+<div class=clients markdown=1>
+
+</div>

pages/03.services/03.nextcloud/_nextcloud-deck/2col-left.en.md

@@ -1,16 +1,32 @@
 ---
-title: 'Nextcloud Deck'
+title: 'Deck'
 bgcolor: '#FFF'
 fontcolor: '#555'
 text_align: left
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: Deck
+        logo: en/deck_logo.png
+        link: https://f-droid.org/en/packages/it.niedermann.nextcloud.deck/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
+
 ---
 
 ## Deck
 
 Deck helps you organize your personal or team work within Nextcloud. You can add tasks, classify them, share them and comment on them.
 
-[Deck on Android](https://f-droid.org/en/packages/it.niedermann.nextcloud.deck/)
-
 ---
 
 ![](en/nextcloud-deck.png?lightbox=1024)

pages/03.services/03.nextcloud/_nextcloud-deck/2col-left.en.old

@@ -0,0 +1,16 @@
+---
+title: 'Nextcloud Deck'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## Deck
+
+Deck helps you organize your personal or team work within Nextcloud. You can add tasks, classify them, share them and comment on them.
+
+[Deck on Android](https://f-droid.org/en/packages/it.niedermann.nextcloud.deck/)
+
+---
+
+![](en/nextcloud-deck.png?lightbox=1024)

pages/03.services/03.nextcloud/_nextcloud-news/2col-left.en.md

@@ -1,20 +1,37 @@
 ---
-title: 'Nextcloud News'
+title: 'News'
 bgcolor: '#FFF'
 fontcolor: '#555'
 text_align: left
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: Feedreader
+        logo: en/rss_logo.png
+        link: https://github.com/jangernert/FeedReader
+        text:
+        platforms: [fa-linux]
+    -
+        title: News
+        logo: en/news_logo.png
+        link: https://f-droid.org/en/packages/de.luhmer.owncloudnewsreader/
+        text:
+        platforms: [fa-android]
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
+
 ---
 
 ## News
 
 RSS/Atom feed aggregator. You can keep track and manage all your feeds in one place, and sync them across multiple devices and clients.
 
-<ul class=disc>
-<li>[News on Android](https://f-droid.org/en/packages/de.luhmer.owncloudnewsreader/)</li>
-<li>[Feedreader on GNU/Linux](https://github.com/jangernert/)</li>
-</ul>
-
-
 ---
 
 ![](en/nextcloud-news.png?lightbox=1024)

pages/03.services/03.nextcloud/_nextcloud-news/2col-left.en.old

@@ -0,0 +1,20 @@
+---
+title: 'Nextcloud News'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## News
+
+RSS/Atom feed aggregator. You can keep track and manage all your feeds in one place, and sync them across multiple devices and clients.
+
+<ul class=disc>
+<li>[News on Android](https://f-droid.org/en/packages/de.luhmer.owncloudnewsreader/)</li>
+<li>[Feedreader on GNU/Linux](https://github.com/jangernert/)</li>
+</ul>
+
+
+---
+
+![](en/nextcloud-news.png?lightbox=1024)

pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.en.md

@@ -1,16 +1,32 @@
 ---
-title: 'Nextcloud Notes'
+title: 'Notes'
 bgcolor: '#FFF'
 fontcolor: '#555'
 text_align: left
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: Notes
+        logo: en/notes_logo.png
+        link: https://f-droid.org/en/packages/it.niedermann.owncloud.notes/
+        text:
+        platforms: [fa-android]
+
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
+
 ---
 
 ## Notes
 
 Create notes, share and sync them with all your devices.
 
-[Notes on Android](https://f-droid.org/en/packages/it.niedermann.owncloud.notes/)
-
 ---
 
 ![](en/nextcloud-notes.png?lightbox=1024)

pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.en.old

@@ -0,0 +1,16 @@
+---
+title: 'Nextcloud Notes'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## Notes
+
+Create notes, share and sync them with all your devices.
+
+[Notes on Android](https://f-droid.org/en/packages/it.niedermann.owncloud.notes/)
+
+---
+
+![](en/nextcloud-notes.png?lightbox=1024)

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

@@ -2,17 +2,35 @@
 title: 'Nextcloud Sync'
 bgcolor: '#FFF'
 fontcolor: '#555'
+text_align: left
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: Desktop
+        logo: en/nextcloud_logo.png
+        link: https://nextcloud.com/install/#install-clients
+        text:
+        platforms: [fa-linux, fa-windows, fa-apple]
+    -
+        title: Mobile
+        logo: en/nextcloud_logo.png
+        link: https://nextcloud.com/install/#install-clients
+        text:
+        platforms: [fa-android, fa-apple]
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
+
 ---
 
 ![](en/nextcloud-files.png?lightbox=1024)
 
 ---
 
-## Use your favorite client
+## Nextcloud Sync
 
 Access and organize your data on any platform. Use the **Desktop**, **Android** or **iOS** clients to work with your files on the go or synchronize your favorite folders seamlessly between your desktop and laptop devices.
-
-- [Nextcloud desktop](https://nextcloud.com/install/#install-clients)
-- [Nextcloud on Android](https://f-droid.org/en/packages/com.nextcloud.client/)
-- [Nextcloud on iOS](https://apps.apple.com/us/app/nextcloud/id1125420102)
-- [Web browser](https://cloud.disroot.org)

pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.en.old

@@ -0,0 +1,18 @@
+---
+title: 'Nextcloud Sync'
+bgcolor: '#FFF'
+fontcolor: '#555'
+---
+
+![](en/nextcloud-files.png?lightbox=1024)
+
+---
+
+## Use your favorite client
+
+Access and organize your data on any platform. Use the **Desktop**, **Android** or **iOS** clients to work with your files on the go or synchronize your favorite folders seamlessly between your desktop and laptop devices.
+
+- [Nextcloud desktop](https://nextcloud.com/install/#install-clients)
+- [Nextcloud on Android](https://f-droid.org/en/packages/com.nextcloud.client/)
+- [Nextcloud on iOS](https://apps.apple.com/us/app/nextcloud/id1125420102)
+- [Web browser](https://cloud.disroot.org)

pages/03.services/03.nextcloud/_nextcloud-talk/2col-left.en.md

@@ -3,16 +3,30 @@ title: 'Talk'
 bgcolor: '#FFF'
 fontcolor: '#555'
 text_align: left
----
+cloudclients: true
+text2: 'Choose your favorite client'
+clients:
+    -
+        title: Talk
+        logo: en/talk_logo.png
+        link: https://f-droid.org/en/packages/com.nextcloud.talk2/
+        text:
+        platforms: [fa-android]
+    -
+        title: Webbrowser
+        logo: en/webbrowser.png
+        link: https://cloud.disroot.org
+        text: 'Access directly from your browser'
+        platforms: [fa-linux, fa-windows, fa-apple]
 
-## Nextcloud Talk
+
+---
+## Talk
 
 Audio/video conference calls. Securely communicate with your friends and family using rich audio and video from your browser.  All calls are peer 2 peer utilizing WebRTC technology so the only bottleneck is your local internet speed rather than **Disroot**'s server resources.
 
 You can create a public link that you can share with people that don't have a **Nextcloud** account.
 
-[Talk on Android](https://f-droid.org/en/packages/com.nextcloud.talk2/)
-
 ---
 
-![](call-in-action.png?lightbox=1024)
+![](en/call-in-action.png?lightbox=1024)

pages/03.services/03.nextcloud/_nextcloud-talk/2col-left.en.old

@@ -0,0 +1,18 @@
+---
+title: 'Talk'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## Nextcloud Talk
+
+Audio/video conference calls. Securely communicate with your friends and family using rich audio and video from your browser.  All calls are peer 2 peer utilizing WebRTC technology so the only bottleneck is your local internet speed rather than **Disroot**'s server resources.
+
+You can create a public link that you can share with people that don't have a **Nextcloud** account.
+
+[Talk on Android](https://f-droid.org/en/packages/com.nextcloud.talk2/)
+
+---
+
+![](call-in-action.png?lightbox=1024)