From 02af2c943914a264084078d49a51eac9f684c5a5 Mon Sep 17 00:00:00 2001
From: Bady <bady@disroot.org>
Date: Fri, 16 Oct 2020 17:00:43 +0530
Subject: [PATCH] Update videos
---
css/style.css | 3 +++
index.html | 13 +++++++++----
welcome/index.html | 10 +++++++---
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/css/style.css b/css/style.css
index 82de9ed..117702c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -9,6 +9,9 @@ h1, h2{
font-weight: 400;
padding: 20px 10px;
}
+h3 {
+ margin: 32px 0 16px;
+}
ul, ol{
padding-left: 40px;
}
diff --git a/index.html b/index.html
index 433f35b..96a98a7 100644
--- a/index.html
+++ b/index.html
@@ -173,10 +173,10 @@
<div class="about-section" style="margin: 10vh auto;">
<div id="tools" class="about-text">
<h1 class="medium-heading" style="color: #469198">Camp Communication Infrastructure</h1>
- <div>
+ <div style="width: 100%;">
<ul>
- <li><a href="https://bigbluebutton.org/" target="_blank">Big Blue Button</a> (browser based free software video conferencing platform) for presentations, sessions, and other interactions.</li>
- <li><a href="https://matrix.org" target="_blank">Matrix</a> rooms for instant messaging.</li>
+ <li><a href="https://videos.fsci.in/videos/watch/b3f34489-ad2b-4cfb-956b-7a8bad799d89" target="_blank">BigBlueButton</a> (browser based free software video conferencing platform) for presentations, sessions, and other interactions.</li>
+ <li><a href="https://videos.fsci.in/videos/watch/5fbd125f-d309-4eda-a4af-4009ced56f71" target="_blank">Matrix</a> rooms for instant messaging.</li>
<li><a href="https://joinmastodon.org/" target="_blank">Mastodon</a> for announcements.</li>
<li><a href="https://videos.fsci.in/videos/watch/76f79bb3-b5ca-4929-8ceb-74bb18783803" target="_blank">Mailing list</a> for announcements and discussions.</li>
<li><a href="https://about.gitlab.com" target="_blank">Gitlab</a> wiki for documentation, etc.</li>
@@ -185,7 +185,12 @@
<li>Each project will have their own project communication platforms.</li>
</ul>
<p>These tools will be introduced during the course of the camp.</p>
- <iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups" src="https://videos.fsci.in/videos/embed/76f79bb3-b5ca-4929-8ceb-74bb18783803" frameborder="0" allowfullscreen style="padding:10px"></iframe>
+ <h3>Mailman (Mailing List)</h3>
+ <iframe src="https://videos.fsci.in/videos/embed/76f79bb3-b5ca-4929-8ceb-74bb18783803" style="min-height: 400px; width: 100%;" frameborder="0" sandbox="allow-same-origin allow-scripts" allowfullscreen="allowfullscreen"></iframe>
+ <h3>Matrix (Instant Messaging)</h3>
+ <iframe src="https://videos.fsci.in/videos/embed/5fbd125f-d309-4eda-a4af-4009ced56f71" style="min-height: 400px; width: 100%;" frameborder="0" sandbox="allow-same-origin allow-scripts" allowfullscreen="allowfullscreen"></iframe>
+ <h3>BigBlueButton (Web Conferencing)</h3>
+ <iframe src="https://videos.fsci.in/videos/embed/b3f34489-ad2b-4cfb-956b-7a8bad799d89" style="min-height: 400px; width: 100%;" frameborder="0" sandbox="allow-same-origin allow-scripts" allowfullscreen="allowfullscreen"></iframe>
</div>
</div>
</div>
diff --git a/welcome/index.html b/welcome/index.html
index 04703c8..2fe0425 100644
--- a/welcome/index.html
+++ b/welcome/index.html
@@ -83,13 +83,17 @@ We have received your application to join Free Software Camp 2020 organized by F
<p>A mail send to a mailing list is distributed to all members, so when we send an email to camp-announce mailing list, all of you will get a copy of the mail.</p>
<p>We have sent you an invitation to join the camp-announce mailing list, but Gmail seems to be marking it as spam even though we have correct DKIM and SPF records (these are standards for authenticating emails) for our emails. If you mark the invitation as not spam, it may help new people receive the mail in their inbox.</p>
<p>Akshay has created a <a href="https://videos.fsci.in/videos/watch/76f79bb3-b5ca-4929-8ceb-74bb18783803">video</a> to explain how to join the mailing list:</p>
-<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups" src="https://videos.fsci.in/videos/embed/76f79bb3-b5ca-4929-8ceb-74bb18783803" frameborder="0" allowfullscreen style="padding:10px"></iframe>
+<iframe src="https://videos.fsci.in/videos/embed/76f79bb3-b5ca-4929-8ceb-74bb18783803" style="min-height: 400px; width: 100%; margin: 10px;" frameborder="0" sandbox="allow-same-origin allow-scripts" allowfullscreen="allowfullscreen"></iframe>
<h2 id="mastodonfediverse">Mastodon/Fediverse:</h2>
<p>Mastodon is a Free Software to create a social media service similar to Twitter in features. Unlike twitter, mastodon is not controlled by a single company. Many people and organizations around the world run their own mastodon services which are referred to as instances and users of any of these instances can interact with users of any other instance. Additionally there are other software interoperable with mastodon and all of it together constitute the fediverse. Some other software part of the Fediverse are Pleroma, Friendica, Peertube, Pixelfed etc.</p>
<h2 id="matrixelement">Matrix/Element:</h2>
<p>Matrix is a communication protocol for sharing instant messages, photos, files and audio/video calls. Element is most feature-complete app for Matrix protocol and is available on smart phones and laptop/desktop. Matrix has a similar decentralized architecture to mastodon, where different people and organizations provide an interoperable network of home servers (similar to an instance of mastodon). If you are new to using matrix, you can sign up for accounts by following instructions at <a href="https://chat.feneas.org">https://chat.feneas.org</a>, <a href="https://chat.tchncs.de">https://chat.tchncs.de</a> or <a href="https://chat.privacytools.io">https://chat.privacytools.io</a>, instead of using matrix.org which will help to reduce their server load.</p>
-<p>Akhil has created a <a href="https://videos.fsci.in/videos/watch/5fbd125f-d309-4eda-a4af-4009ced56f71">video</a> to explain how to use Matrix with Element.</p>
-<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts allow-popups" src="https://videos.fsci.in/videos/embed/5fbd125f-d309-4eda-a4af-4009ced56f71" frameborder="0" allowfullscreen style="padding:10px"></iframe>
+<p>Akhil has created a <a href="https://videos.fsci.in/videos/watch/5fbd125f-d309-4eda-a4af-4009ced56f71">video</a> to explain how to use Matrix with Element:</p>
+<iframe src="https://videos.fsci.in/videos/embed/5fbd125f-d309-4eda-a4af-4009ced56f71" style="min-height: 400px; width: 100%; margin: 10px;" frameborder="0" sandbox="allow-same-origin allow-scripts" allowfullscreen="allowfullscreen"></iframe>
+<h2 id="bigbluebutton">BigBlueButton:</h2>
+<p>BigBlueButton is a browser-based free software video conferencing platform which we will use for camp presentations, sessions, and other interactive sessions.</p>
+<p>Bady has created a <a href="https://videos.fsci.in/videos/watch/b3f34489-ad2b-4cfb-956b-7a8bad799d89">video</a> to explain how to use BigBlueButton:</p>
+<iframe src="https://videos.fsci.in/videos/embed/b3f34489-ad2b-4cfb-956b-7a8bad799d89" style="min-height: 400px; width: 100%; margin: 10px;" frameborder="0" sandbox="allow-same-origin allow-scripts" allowfullscreen="allowfullscreen"></iframe>
<p>You can reach out to us by mailing to camp at mm.gnu.org.in for any queries or concerns.
<br><br>
Regards,</p>
--
GitLab