Merge branch 'master' into 'master'

Master

See merge request framasoft/peertube/joinpeertube!20

config.toml

@@ -56,6 +56,7 @@ name = "paper"
 switchlang = true
 # You can use markdown here.
 BrandImage = "/brand.png"
+OpenGraphImage = "notebook.jpg"
 brand = "Peertube"
 topline = ""
 footline = ""

config/en.toml

@@ -8,6 +8,7 @@
 languageCode = "en"
 weight = 1
 title = "PeerTube"
+description = "A decentralized video hosting network, based on free/libre software"
 
 [[Languages.en.menu.main]]
 name = "FAQ"
@@ -33,3 +34,9 @@ name = "Source code"
 weight = 5
 identifier = ""
 url = "https://github.com/Chocobozzz/PeerTube"
+
+[[Languages.en.menu.main]]
+name = "Instances"
+weight = 6
+identifier = ""
+url = "https://instances.joinpeertube.org"

config/fr.toml

@@ -8,6 +8,7 @@
 languageCode = "fr"
 weight = 1
 title = "PeerTube"
+description = "L'hébergement de vidéos décentralisé, en réseau, basé sur du logiciel libre"
 
 [[Languages.fr.menu.main]]
 name = "FAQ"
@@ -33,3 +34,9 @@ name = "Code source"
 weight = 5
 identifier = ""
 url = "https://github.com/Chocobozzz/PeerTube"
+
+[[Languages.fr.menu.main]]
+name = "Instances"
+weight = 6
+identifier = ""
+url = "https://instances.joinpeertube.org"

content/home.en.md

@@ -1,7 +1,7 @@
 +++
 
 date = "2018-02-28T14:41:00+01:00"
-title = "Home"
+title = "PeerTube"
 author = "Framasoft"
 draft = false
 type = "page"
@@ -115,7 +115,7 @@ Moreover, the federation protocol (ActivityPub) allows to publish the videos and
 ### Watch
 
 <div class="embed-responsive embed-responsive-16by9">
-  <iframe class="embed-responsive-item" src="https://framatube.org/videos/embed/0900bd2e-7306-4c39-b48b-2d0cd611742e" allowfullscreen></iframe>
+  <iframe class="embed-responsive-item" src="https://framatube.org/videos/embed/a8ea95b8-0396-49a6-8f30-e25e25fb2828" allowfullscreen></iframe>
 </div>
 
 [Watch videos on Framatube](https://framatube.org)

content/home.fr.md

@@ -1,7 +1,7 @@
 +++
 
 date = "2018-02-28T14:41:00+01:00"
-title = "Accueil"
+title = "PeerTube"
 author = "Framasoft"
 draft = false
 type = "page"

themes/hugo-bootstrap-premium/layouts/partials/base/metas.html

@@ -13,6 +13,8 @@
 <link rel="author" href="http://plus.google.com/+{{ . }}">
 {{ end }}
 
+<meta property="image" content="{{ .Site.BaseURL }}{{ .Site.Params.OpenGraphImage }}"/>
+
 <meta property="og:title" content="{{ .Title }} {{ if ne .Title .Site.Title }} &middot; {{ .Site.Title }} {{ end }}">
 <meta property="og:site_name" content="{{ .Site.Title }}"/>
 <meta property="og:url" content="{{ .Permalink }}" />
@@ -23,6 +25,7 @@
 {{ else }}
 <meta property="og:type" content="article" />
 <meta property="og:description" content="{{ .Description }}"/>
+<meta property="og:image" content="{{ .Site.BaseURL }}{{ .Site.Params.OpenGraphImage }}"/>
 <meta property="og:article:published_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}" />
 <meta property="og:article:modified_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}" />
 
@@ -44,6 +47,8 @@
 <meta name="twitter:description" content="{{ .Description }}" />
 <meta name="twitter:url" content="{{ .Permalink }}" />
 <meta name="twitter:domain" content="{{ .Site.BaseURL }}">
+<meta name="twitter:image" content="{{ .Site.BaseURL }}{{ .Site.Params.OpenGraphImage }}"/>
+
   {{ end }}
 
   {{ if ne .Site.Params.googleplus "" }}

themes/hugo-bootstrap-premium/static/css/style.css

@@ -224,14 +224,14 @@ body .medias .container {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    width: calc(100% - 140px); /* 100% - .right-div width */
+    width: calc(100% - 160px); /* 100% - .right-div width */
 }
 
 #instances-list .list-group-item .right-div {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    width: 140px;
+    width: 160px;
 }
 
 #instances-list .list-group-item .right-div li {