Merge branch 'master' into 'master'

Campaign KKBB

See merge request framasoft/peertube/joinpeertube!24
This commit is contained in:
Pierre-Yves Gosset 2018-05-24 18:31:23 +02:00
commit dd8a47f3f8
11 changed files with 407 additions and 11 deletions

View file

@ -3,6 +3,7 @@ all: hugo
locales: locales:
txt2po --progress=none --duplicates=merge -P -i content/home.fr.md -o pot/home.pot txt2po --progress=none --duplicates=merge -P -i content/home.fr.md -o pot/home.pot
txt2po --progress=none --duplicates=merge -P -i content/faq.fr.md -o pot/faq.pot txt2po --progress=none --duplicates=merge -P -i content/faq.fr.md -o pot/faq.pot
txt2po --progress=none --duplicates=merge -P -i content/hall-of-fame.fr.md -o pot/hall-of-fame.pot
txt2po --progress=none --duplicates=merge -P -i config/en.toml -o pot/config.pot txt2po --progress=none --duplicates=merge -P -i config/en.toml -o pot/config.pot
push-locales: locales push-locales: locales

View file

@ -39,3 +39,10 @@ name = "Instances"
weight = 6 weight = 6
identifier = "" identifier = ""
url = "https://instances.joinpeertube.org" url = "https://instances.joinpeertube.org"
[[Languages.en.menu.main]]
name = "Hall of fame"
identifier = "hof"
weight = 7
title = "Hall of fame"
url = "/en/hall-of-fame/"

View file

@ -39,3 +39,10 @@ name = "Instances"
weight = 6 weight = 6
identifier = "" identifier = ""
url = "https://instances.joinpeertube.org" url = "https://instances.joinpeertube.org"
[[Languages.fr.menu.main]]
name = "Tableau dhonneur"
identifier = "hof"
weight = 7
title = "Tableau dhonneur"
url = "/fr/hall-of-fame/"

141
content/hall-of-fame.en.md Normal file
View file

@ -0,0 +1,141 @@
+++
date = "2018-05-24T14:41:00+01:00"
title = "Hall of fame"
author = "Framasoft"
draft = false
type = "page"
+++
{{% grid class="row hof" %}}
{{% grid class="container" %}}
{{< grid class="col-sm-12" >}}
<h2 class="text-center">Hall of fame</h2>
<h3>Sponsors</h3>
<div class="row">
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/your_logo.png" alt="">
</div>
</a>
</div>
</div>
<p class="text-center"><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Become a sponsor</a></p>
<h3>Financial Contributors</h3>
<ul>
<li>Nu Trepanier</li>
<li>Zina Hargis</li>
<li>Katy Comeaux</li>
<li>Leslie Winberg</li>
<li>Federico Hoggatt</li>
<li>Walton Just</li>
<li>Yung Archibald</li>
<li>Jenise Mcfall</li>
<li>Tabitha Howarth</li>
<li>Marquis Matteo</li>
<li>Leonarda Beecham</li>
<li>Leonore Blackwelder</li>
<li>Tamie Bowersox</li>
<li>Sheryll Goers</li>
<li>Howard Frum</li>
<li>Angel Zollner</li>
<li>Sammy Jawad</li>
<li>Tandy Look</li>
<li>Winter Matsunaga</li>
<li>Carola Mcelravy</li>
</ul>
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Add your name here</a></p>
<h3>Contributors</h3>
<ul>
<li>Chocobozzz</li>
<li>gegeweb</li>
<li>rigelk</li>
<li>bnjbvr</li>
<li>DimitriGilbert</li>
<li>Green-Star</li>
<li>jankeromnes</li>
<li>Angristan</li>
<li>okhin</li>
<li>svnet-libre</li>
<li>dedesite</li>
<li>floSoX</li>
<li>dadall</li>
<li>jonathanraes</li>
<li>ldidry</li>
<li>DavidLibeau</li>
<li>mrflos</li>
<li>LecygneNoir</li>
<li>lucaspontoexe</li>
<li>flyingrub</li>
<li>tcitworld</li>
<li>valvin1</li>
<li>kaiyou</li>
<li>taziden</li>
<li>sticmac</li>
<li>luzpaz</li>
<li>qsypoq</li>
<li>noplanman</li>
<li>Nautigsam</li>
<li>ewft</li>
</ul>
<p><a class="button" href="https://github.com/Chocobozzz/PeerTube/">Contribute to the code</a></p>
{{< /grid >}}
{{% /grid %}}
{{% /grid %}}

142
content/hall-of-fame.fr.md Normal file
View file

@ -0,0 +1,142 @@
+++
date = "2018-05-24T14:41:00+01:00"
title = "Tableau dhonneur"
author = "Framasoft"
draft = false
type = "page"
+++
{{% grid class="row hof" %}}
{{% grid class="container" %}}
{{< grid class="col-sm-12" >}}
<h2 class="text-center">Tableau dhonneur</h2>
<h3>Sponsors</h3>
<div class="row">
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
<div class="col-sm-3 col-xs-6">
<a href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">
<div class="thumbnail">
<img src="/votre_logo.png" alt="">
</div>
</a>
</div>
</div>
<p class="text-center"><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Devenir sponsor</a></p>
<h3>Donateurs</h3>
<ul>
<li>Nu Trepanier</li>
<li>Zina Hargis</li>
<li>Katy Comeaux</li>
<li>Leslie Winberg</li>
<li>Federico Hoggatt</li>
<li>Walton Just</li>
<li>Yung Archibald</li>
<li>Jenise Mcfall</li>
<li>Tabitha Howarth</li>
<li>Marquis Matteo</li>
<li>Leonarda Beecham</li>
<li>Leonore Blackwelder</li>
<li>Tamie Bowersox</li>
<li>Sheryll Goers</li>
<li>Howard Frum</li>
<li>Angel Zollner</li>
<li>Sammy Jawad</li>
<li>Tandy Look</li>
<li>Winter Matsunaga</li>
<li>Carola Mcelravy</li>
</ul>
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Ajouter votre nom ici</a></p>
<h3>Contributeurs</h3>
<ul>
<li>Chocobozzz</li>
<li>gegeweb</li>
<li>rigelk</li>
<li>bnjbvr</li>
<li>DimitriGilbert</li>
<li>Green-Star</li>
<li>jankeromnes</li>
<li>Angristan</li>
<li>okhin</li>
<li>svnet-libre</li>
<li>dedesite</li>
<li>floSoX</li>
<li>dadall</li>
<li>jonathanraes</li>
<li>ldidry</li>
<li>DavidLibeau</li>
<li>mrflos</li>
<li>LecygneNoir</li>
<li>lucaspontoexe</li>
<li>flyingrub</li>
<li>tcitworld</li>
<li>valvin1</li>
<li>kaiyou</li>
<li>taziden</li>
<li>sticmac</li>
<li>luzpaz</li>
<li>qsypoq</li>
<li>noplanman</li>
<li>Nautigsam</li>
<li>ewft</li>
</ul>
<p><a class="button" href="https://github.com/Chocobozzz/PeerTube/">Contribuer au code</a></p>
{{< /grid >}}
{{% /grid %}}
{{% /grid %}}

View file

@ -15,9 +15,21 @@ type = "page"
# Take back the control of your videos # Take back the control of your videos
## A decentralized video hosting network, based on free/libre software ## A decentralized video hosting network, based on free/libre software
[Get started](#getting-started) [How it works](#how-it-works)
![](/notebook.jpg)
<div class="col-md-6 well col-md-push-6">
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" allowfullscreen
src="https://framatube.org/videos/embed/217eefeb-883d-45be-b7fc-a788ad8507d3"></iframe>
</div>
<p class="text-left">Help us improve PeerTube to its v1!<br>
Only <b><span id="kkbbDays">45</span> days</b> left to contributing to our crowdfunding!</p>
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Soutenir PeerTube</a></p>
</div>
<div class="col-md-6 col-md-pull-6">
<img src="/notebook.jpg" class="img-responsive" alt="" />
<p><a href="#getting-started">Get started</a> <a href="#how-it-works">How it works</a></p>
</div>
{{% /grid %}} {{% /grid %}}
{{% /grid %}} {{% /grid %}}

View file

@ -15,9 +15,19 @@ type = "page"
# Reprenez le contrôle de vos vidéos # Reprenez le contrôle de vos vidéos
## Lhébergement de vidéos décentralisé, en réseau, basé sur du logiciel libre ## Lhébergement de vidéos décentralisé, en réseau, basé sur du logiciel libre
[Pour commencer](#getting-started) [Comment ça fonctionne](#how-it-works) <div class="col-md-6 well col-md-push-6">
<div class="embed-responsive embed-responsive-16by9">
![](/notebook.jpg) <iframe class="embed-responsive-item" allowfullscreen
src="https://framatube.org/videos/embed/9db9f3f1-9b54-44ed-9e91-461d262d2205"></iframe>
</div>
<p class="text-left">Aidez-nous à réaliser la v1 de PeerTube !<br>
Plus que <b><span id="kkbbDays">45</span> jours</b> pour participer à notre financement participatif !</p>
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Soutenir PeerTube</a></p>
</div>
<div class="col-md-6 col-md-pull-6">
<img src="/notebook.jpg" class="img-responsive" alt="" />
<p><a href="#getting-started">Pour commencer</a> <a href="#how-it-works">Comment ça fonctionne</a></p>
</div>
{{% /grid %}} {{% /grid %}}
{{% /grid %}} {{% /grid %}}

BIN
static/votre_logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/your_logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

View file

@ -85,7 +85,7 @@ body .medias .container {
background: transparent; background: transparent;
} }
.intro, .faq { .intro, .faq, .hof {
background: transparent; background: transparent;
margin-top: -70px; margin-top: -70px;
} }
@ -167,7 +167,8 @@ body .medias .container {
.how-it-works a[href^="#"], .how-it-works a[href^="#"],
.how-it-works a[href*="/faq"], .how-it-works a[href*="/faq"],
.faq .col-sm-12 > p a[href="https://framacolibri.org/c/qualite/peertube"], .faq .col-sm-12 > p a[href="https://framacolibri.org/c/qualite/peertube"],
.getting-started .col-sm-12 > p a[href*="framatube.org"] { .getting-started .col-sm-12 > p a[href*="framatube.org"],
.button {
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
font-weight: 500; font-weight: 500;
@ -182,7 +183,8 @@ body .medias .container {
.intro a[href^="#"]:hover, .intro a[href^="#"]:hover,
.install a:hover, .install a:hover,
.how-it-works a[href^="#"]:hover { .how-it-works a[href^="#"]:hover,
.button {
opacity: 1; opacity: 1;
} }
@ -197,14 +199,16 @@ body .medias .container {
.install a[href="https://github.com/Chocobozzz/PeerTube/#production"], .install a[href="https://github.com/Chocobozzz/PeerTube/#production"],
.how-it-works a[href*="/faq"], .how-it-works a[href*="/faq"],
.faq .col-sm-12 > p a[href="https://framacolibri.org/c/qualite/peertube"], .faq .col-sm-12 > p a[href="https://framacolibri.org/c/qualite/peertube"],
.getting-started .col-sm-12 > p a[href*="framatube.org"] { .getting-started .col-sm-12 > p a[href*="framatube.org"],
.button {
margin-right: auto; margin-right: auto;
color: #F1680D; color: #F1680D;
background: #fff; background: #fff;
border: 1px solid #F1680D; border: 1px solid #F1680D;
} }
.getting-started h2 { .getting-started h2,
a.button {
color: #F1680D; color: #F1680D;
} }
@ -282,3 +286,70 @@ footer { /* Hugos footer != JoinPTs footer */
.faq h2 { .faq h2 {
margin: 40px 0px; margin: 40px 0px;
} }
.thumbnail img {
margin:0;
}
/* Hall of Fame */
.hof ul { /* = .list-inline.well */
margin-left: -5px;
list-style: none;
padding: 19px;
margin-bottom: 20px;
background-color: #f5f5f5;
border: 1px solid #e3e3e3;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
}
.hof ul > li {
display: inline-block;
padding-right: 5px;
padding-left: 5px;
}
.hof li:nth-of-type(n+2):before {
content: "▶";
margin-right: 12px;
color: #F1680D;
}
.hof li:nth-of-type(2n+2):before {
color: #211F20;
}
.hof li:nth-of-type(3n+2):before {
color: #737373;
}
/* KKBB */
.intro .embed-responsive + p {
margin-bottom:0;
margin-top: 20px;
}
.intro .col-md-push-6 .button {
margin-bottom:10px;
}
@media (min-width: 1200px) {
[lang="fr"] .intro .col-md-pull-6 a {
margin-top: 36px;
}
}
@media (max-width: 1200px) {
[lang="fr"] .intro .col-md-pull-6 a {
margin-top: -10px;
}
}
@media (min-width: 992px) {
[lang="en"] .intro .col-md-pull-6 a {
margin-top: 39px;
}
}
@media (min-width: 1200px) {
[lang="en"] .intro .col-md-pull-6 a {
margin-top: 11px;
}
}

View file

@ -8,3 +8,8 @@ $(
scrollTop : 0 // Scroll to top of body scrollTop : 0 // Scroll to top of body
}, 500); }, 500);
}); });
const end = new Date('07/08/2018 11:59 PM');
const now = new Date();
const days = (end - now < 0) ? 0 : Math.floor((end - now) / 86400000); // 24*60*60*1000
document.getElementById('kkbbDays').innerHTML = days;