From ac416c27a4c163b12d73b4c1ea51cef43d2902dd Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 24 May 2018 11:59:12 +0200 Subject: [PATCH 1/6] Hall of Fame + Campaign --- config/en.toml | 7 ++ config/fr.toml | 7 ++ content/hall-of-fame.en.md | 106 ++++++++++++++++++ content/hall-of-fame.fr.md | 105 +++++++++++++++++ content/home.en.md | 13 ++- content/home.fr.md | 13 ++- static/votre_logo.png | Bin 0 -> 4876 bytes static/your_logo.png | Bin 0 -> 4821 bytes .../static/css/style.css | 42 ++++++- 9 files changed, 286 insertions(+), 7 deletions(-) create mode 100644 content/hall-of-fame.en.md create mode 100644 content/hall-of-fame.fr.md create mode 100644 static/votre_logo.png create mode 100644 static/your_logo.png diff --git a/config/en.toml b/config/en.toml index a283a94..5eadb9e 100644 --- a/config/en.toml +++ b/config/en.toml @@ -40,3 +40,10 @@ name = "Instances" weight = 6 identifier = "" 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/" diff --git a/config/fr.toml b/config/fr.toml index 710da85..baba11b 100644 --- a/config/fr.toml +++ b/config/fr.toml @@ -40,3 +40,10 @@ name = "Instances" weight = 6 identifier = "" url = "https://instances.joinpeertube.org" + +[[Languages.fr.menu.main]] +name = "Tableau d’honneur" +identifier = "hof" +weight = 7 +title = "Tableau d’honneur" +url = "/fr/hall-of-fame/" diff --git a/content/hall-of-fame.en.md b/content/hall-of-fame.en.md new file mode 100644 index 0000000..da9ded5 --- /dev/null +++ b/content/hall-of-fame.en.md @@ -0,0 +1,106 @@ ++++ + +date = "2018-05-24T14:41:00+01:00" +title = "Tableau d’honneur" +author = "Framasoft" +draft = false +type = "page" ++++ + +{{% grid class="row hof" %}} +{{% grid class="container" %}} +{{< grid class="col-sm-12" >}} + +

Hall of fame

+ +

Sponsors

+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +

Become a sponsor

+ +

Contributors

+ + + +{{< /grid >}} +{{% /grid %}} +{{% /grid %}} diff --git a/content/hall-of-fame.fr.md b/content/hall-of-fame.fr.md new file mode 100644 index 0000000..4776a3c --- /dev/null +++ b/content/hall-of-fame.fr.md @@ -0,0 +1,105 @@ ++++ + +date = "2018-05-24T14:41:00+01:00" +title = "Tableau d’honneur" +author = "Framasoft" +draft = false +type = "page" ++++ + +{{% grid class="row hof" %}} +{{% grid class="container" %}} +{{< grid class="col-sm-12" >}} + +

Tableau d’honneur

+ +

Sponsors

+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+

Devenir sponsor

+ +

Donateurs

+ + + +{{< /grid >}} +{{% /grid %}} +{{% /grid %}} diff --git a/content/home.en.md b/content/home.en.md index 5cd9ee7..4a77dfc 100644 --- a/content/home.en.md +++ b/content/home.en.md @@ -16,7 +16,18 @@ type = "page" [Get started](#getting-started) [How it works](#how-it-works) -![](/notebook.jpg) +
+
+ +
+

PeerTube est actuellement en campagne de financement participatif. + Ensemble, participons à aller vers une version 1.

+

Soutenir Peertube

+
+
+ +
{{% /grid %}} {{% /grid %}} diff --git a/content/home.fr.md b/content/home.fr.md index 5ab6eac..3ff7d98 100644 --- a/content/home.fr.md +++ b/content/home.fr.md @@ -16,7 +16,18 @@ type = "page" [Pour commencer](#getting-started) [Comment ça fonctionne](#how-it-works) -![](/notebook.jpg) +
+
+ +
+

PeerTube est actuellement en campagne de financement participatif. + Ensemble, participons à aller vers une version 1.

+

Soutenir Peertube

+
+
+ +
{{% /grid %}} {{% /grid %}} diff --git a/static/votre_logo.png b/static/votre_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..849efe3a2f31448b1103719631534c28330f958e GIT binary patch literal 4876 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 literal 0 HcmV?d00001 diff --git a/static/your_logo.png b/static/your_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ab19b81c8c04e8751c4e54c58ef45d5ef487a245 GIT binary patch literal 4821 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 DG^yob literal 0 HcmV?d00001 diff --git a/themes/hugo-bootstrap-premium/static/css/style.css b/themes/hugo-bootstrap-premium/static/css/style.css index b40a885..50008ce 100644 --- a/themes/hugo-bootstrap-premium/static/css/style.css +++ b/themes/hugo-bootstrap-premium/static/css/style.css @@ -85,11 +85,23 @@ body .medias .container { background: transparent; } -.intro, .faq { +.intro, .faq, .hof { background: transparent; margin-top: -70px; } +.intro .embed-responsive + p { + margin-bottom:0; + margin-top: 20px; +} + +.intro .col-md-push-7 .button { + margin-bottom:10px; +} +.intro .col-md-pull-5 { + margin-left:-15px; +} + .medias { background-image: url('../player-peertube-flou.jpg'); background-size: cover; @@ -167,7 +179,8 @@ body .medias .container { .how-it-works a[href^="#"], .how-it-works a[href*="/faq"], .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-bottom: 20px; font-weight: 500; @@ -182,7 +195,8 @@ body .medias .container { .intro a[href^="#"]:hover, .install a:hover, -.how-it-works a[href^="#"]:hover { +.how-it-works a[href^="#"]:hover, +.button { opacity: 1; } @@ -197,14 +211,16 @@ body .medias .container { .install a[href="https://github.com/Chocobozzz/PeerTube/#production"], .how-it-works a[href*="/faq"], .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; color: #F1680D; background: #fff; border: 1px solid #F1680D; } -.getting-started h2 { +.getting-started h2, +a.button { color: #F1680D; } @@ -282,3 +298,19 @@ footer { /* Hugo’s footer != JoinPT’s footer */ .faq h2 { margin: 40px 0px; } + +.thumbnail img { + margin:0; +} + +.hof .list-inline li:nth-of-type(n+2):before { + content: "▶"; + margin-right: 12px; + color: #F1680D; +} +.hof .list-inline li:nth-of-type(2n+2):before { + color: #211F20; +} +.hof .list-inline li:nth-of-type(3n+2):before { + color: #737373; +} From d973644906801cb312bae54e3c73b21c5f0734b9 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 24 May 2018 12:02:27 +0200 Subject: [PATCH 2/6] no frameborder --- content/home.en.md | 2 +- content/home.fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/home.en.md b/content/home.en.md index 4a77dfc..d821283 100644 --- a/content/home.en.md +++ b/content/home.en.md @@ -18,7 +18,7 @@ type = "page"
-

PeerTube est actuellement en campagne de financement participatif. diff --git a/content/home.fr.md b/content/home.fr.md index 3ff7d98..6ad6583 100644 --- a/content/home.fr.md +++ b/content/home.fr.md @@ -18,7 +18,7 @@ type = "page"

-

PeerTube est actuellement en campagne de financement participatif. From 87e643de52c01d745c75163f619f0c0bab9e6ca9 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 24 May 2018 12:23:54 +0200 Subject: [PATCH 3/6] trad hall of fame --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b5efe9d..4cc4dba 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ all: hugo locales: 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/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 push-locales: locales From ccf2f37ee2a1a630c5d969c4de20e5e55cc4ae74 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 24 May 2018 15:57:14 +0200 Subject: [PATCH 4/6] Text, cowntdown, links, video and devs in hof --- content/hall-of-fame.en.md | 62 ++++++++++++---- content/hall-of-fame.fr.md | 59 ++++++++++++--- content/home.en.md | 15 ++-- content/home.fr.md | 15 ++-- .../static/css/style.css | 71 ++++++++++++++----- .../hugo-bootstrap-premium/static/js/site.js | 5 ++ 6 files changed, 174 insertions(+), 53 deletions(-) diff --git a/content/hall-of-fame.en.md b/content/hall-of-fame.en.md index da9ded5..5de8f2c 100644 --- a/content/hall-of-fame.en.md +++ b/content/hall-of-fame.en.md @@ -1,7 +1,7 @@ +++ date = "2018-05-24T14:41:00+01:00" -title = "Tableau d’honneur" +title = "Hall of fame" author = "Framasoft" draft = false type = "page" @@ -17,56 +17,56 @@ type = "page"

- +
- +
- +
- +
- +
- +
- +
- +
@@ -74,11 +74,11 @@ type = "page"
-

Become a sponsor

+

Become a sponsor

-

Contributors

+

Financial Contributors

-
    +
    • Nu Trepanier
    • Zina Hargis
    • Katy Comeaux
      • @@ -101,6 +101,44 @@ type = "page"
    • Carola Mcelravy
    +

    Add your name here

    + +

    Contributors

    +
      +
    • Chocobozzz
      • +
    • gegeweb
      • +
    • rigelk
      • +
    • bnjbvr
      • +
    • DimitriGilbert
      • +
    • Green-Star
      • +
    • jankeromnes
      • +
    • Angristan
      • +
    • okhin
      • +
    • svnet-libre
      • +
    • dedesite
      • +
    • floSoX
      • +
    • dadall
      • +
    • jonathanraes
      • +
    • ldidry
      • +
    • DavidLibeau
      • +
    • mrflos
      • +
    • LecygneNoir
      • +
    • lucaspontoexe
      • +
    • flyingrub
      • +
    • tcitworld
      • +
    • valvin1
      • +
    • kaiyou
      • +
    • taziden
      • +
    • sticmac
      • +
    • luzpaz
      • +
    • qsypoq
      • +
    • noplanman
      • +
    • Nautigsam
      • +
    • ewft
      • +
    + +

    Contribute to the code

    + {{< /grid >}} {{% /grid %}} {{% /grid %}} diff --git a/content/hall-of-fame.fr.md b/content/hall-of-fame.fr.md index 4776a3c..569f691 100644 --- a/content/hall-of-fame.fr.md +++ b/content/hall-of-fame.fr.md @@ -17,67 +17,67 @@ type = "page"
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    -

    Devenir sponsor

    +

    Devenir sponsor

    Donateurs

    -
      +
      • Nu Trepanier
      • Zina Hargis
      • Katy Comeaux
        • @@ -100,6 +100,45 @@ type = "page"
      • Carola Mcelravy
      +

      Ajouter votre nom ici

      + +

      Contributeurs

      + +
        +
      • Chocobozzz
        • +
      • gegeweb
        • +
      • rigelk
        • +
      • bnjbvr
        • +
      • DimitriGilbert
        • +
      • Green-Star
        • +
      • jankeromnes
        • +
      • Angristan
        • +
      • okhin
        • +
      • svnet-libre
        • +
      • dedesite
        • +
      • floSoX
        • +
      • dadall
        • +
      • jonathanraes
        • +
      • ldidry
        • +
      • DavidLibeau
        • +
      • mrflos
        • +
      • LecygneNoir
        • +
      • lucaspontoexe
        • +
      • flyingrub
        • +
      • tcitworld
        • +
      • valvin1
        • +
      • kaiyou
        • +
      • taziden
        • +
      • sticmac
        • +
      • luzpaz
        • +
      • qsypoq
        • +
      • noplanman
        • +
      • Nautigsam
        • +
      • ewft
        • +
      + +

      Contribuer au code

      + {{< /grid >}} {{% /grid %}} {{% /grid %}} diff --git a/content/home.en.md b/content/home.en.md index d821283..56899b4 100644 --- a/content/home.en.md +++ b/content/home.en.md @@ -14,19 +14,20 @@ type = "page" # Take back the control of your videos ## A decentralized video hosting network, based on free/libre software -[Get started](#getting-started) [How it works](#how-it-works) -
      + +
      + src="https://framatube.org/videos/embed/217eefeb-883d-45be-b7fc-a788ad8507d3">
      -

      PeerTube est actuellement en campagne de financement participatif. - Ensemble, participons à aller vers une version 1.

      -

      Soutenir Peertube

      +

      Help us improve PeerTube to its v1!
      + Only 45 days left to contributing to our crowdfunding!

      +

      Soutenir PeerTube

      -
      +
      +

      Get started How it works

      {{% /grid %}} diff --git a/content/home.fr.md b/content/home.fr.md index 6ad6583..73b495f 100644 --- a/content/home.fr.md +++ b/content/home.fr.md @@ -14,19 +14,18 @@ type = "page" # Reprenez le contrôle de vos vidéos ## L’hébergement de vidéos décentralisé, en réseau, basé sur du logiciel libre -[Pour commencer](#getting-started) [Comment ça fonctionne](#how-it-works) - -
      +
      + src="https://framatube.org/videos/embed/9db9f3f1-9b54-44ed-9e91-461d262d2205">
      -

      PeerTube est actuellement en campagne de financement participatif. - Ensemble, participons à aller vers une version 1.

      -

      Soutenir Peertube

      +

      Aidez-nous à réaliser la v1 de PeerTube !
      + Plus que 45 jours pour participer à notre financement participatif !

      +

      Soutenir PeerTube

      -
      +
      +

      Pour commencer Comment ça fonctionne

      {{% /grid %}} diff --git a/themes/hugo-bootstrap-premium/static/css/style.css b/themes/hugo-bootstrap-premium/static/css/style.css index 50008ce..adfb28d 100644 --- a/themes/hugo-bootstrap-premium/static/css/style.css +++ b/themes/hugo-bootstrap-premium/static/css/style.css @@ -24,7 +24,7 @@ body > .container { padding: 0px; } @media screen and (max-width: 768px) { - a.navbar-brand-img>img { + a.navbar-brand-img > img { vertical-align: bottom; padding: 1em 0 0 15px; max-width: 80%; @@ -90,18 +90,6 @@ body .medias .container { margin-top: -70px; } -.intro .embed-responsive + p { - margin-bottom:0; - margin-top: 20px; -} - -.intro .col-md-push-7 .button { - margin-bottom:10px; -} -.intro .col-md-pull-5 { - margin-left:-15px; -} - .medias { background-image: url('../player-peertube-flou.jpg'); background-size: cover; @@ -303,14 +291,65 @@ footer { /* Hugo’s footer != JoinPT’s footer */ margin:0; } -.hof .list-inline li:nth-of-type(n+2):before { +/* 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 .list-inline li:nth-of-type(2n+2):before { +.hof li:nth-of-type(2n+2):before { color: #211F20; } -.hof .list-inline li:nth-of-type(3n+2):before { +.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; + } +} diff --git a/themes/hugo-bootstrap-premium/static/js/site.js b/themes/hugo-bootstrap-premium/static/js/site.js index e9a3f67..61e3866 100644 --- a/themes/hugo-bootstrap-premium/static/js/site.js +++ b/themes/hugo-bootstrap-premium/static/js/site.js @@ -8,3 +8,8 @@ $( scrollTop : 0 // Scroll to top of body }, 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; From bcdb964073cdbb513b3c02bc380a2368482d19f8 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 24 May 2018 16:01:35 +0200 Subject: [PATCH 5/6] Fix extra

      --- content/hall-of-fame.en.md | 3 --- content/hall-of-fame.fr.md | 2 -- 2 files changed, 5 deletions(-) diff --git a/content/hall-of-fame.en.md b/content/hall-of-fame.en.md index 5de8f2c..361c5c9 100644 --- a/content/hall-of-fame.en.md +++ b/content/hall-of-fame.en.md @@ -73,7 +73,6 @@ type = "page"

      -

      Become a sponsor

      Financial Contributors

      @@ -100,7 +99,6 @@ type = "page"
    • Winter Matsunaga
    • Carola Mcelravy
    -

    Add your name here

    Contributors

    @@ -136,7 +134,6 @@ type = "page"
  • Nautigsam
  • ewft
-

Contribute to the code

{{< /grid >}} diff --git a/content/hall-of-fame.fr.md b/content/hall-of-fame.fr.md index 569f691..3b58ba0 100644 --- a/content/hall-of-fame.fr.md +++ b/content/hall-of-fame.fr.md @@ -99,7 +99,6 @@ type = "page"
  • Winter Matsunaga
  • Carola Mcelravy
    • -

    Ajouter votre nom ici

    Contributeurs

    @@ -136,7 +135,6 @@ type = "page"
  • Nautigsam
  • ewft
    • -

    Contribuer au code

    {{< /grid >}} From 916f308e01d78cc228976c45177c970767a20670 Mon Sep 17 00:00:00 2001 From: JosephK Date: Thu, 24 May 2018 16:08:12 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Oups=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/hugo-bootstrap-premium/static/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/hugo-bootstrap-premium/static/css/style.css b/themes/hugo-bootstrap-premium/static/css/style.css index adfb28d..7166460 100644 --- a/themes/hugo-bootstrap-premium/static/css/style.css +++ b/themes/hugo-bootstrap-premium/static/css/style.css @@ -292,7 +292,7 @@ footer { /* Hugo’s footer != JoinPT’s footer */ } /* Hall of Fame */ -.hof ul { // = .list-inline.well +.hof ul { /* = .list-inline.well */ margin-left: -5px; list-style: none; padding: 19px;