Niquarl/joinpeertube
1
0
Fork 0
forked from nutomic/joinpeertube
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Master

See merge request framasoft/peertube/joinpeertube!20
This commit is contained in:
JosephK 2018-05-22 14:09:50 +02:00
commit 0f54f2c59d
7 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.toml
View file

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

9
config/en.toml
View file

@ -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"
@ -32,4 +33,10 @@ url = "https://peertube.frama.wiki"
name = "Source code"
weight = 5
identifier = ""
url = "https://github.com/Chocobozzz/PeerTube"
url = "https://github.com/Chocobozzz/PeerTube"
[[Languages.en.menu.main]]
name = "Instances"
weight = 6
identifier = ""
url = "https://instances.joinpeertube.org"

9
config/fr.toml
View file

@ -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"
@ -32,4 +33,10 @@ url = "https://peertube.frama.wiki"
name = "Code source"
weight = 5
identifier = ""
url = "https://github.com/Chocobozzz/PeerTube"
url = "https://github.com/Chocobozzz/PeerTube"
[[Languages.fr.menu.main]]
name = "Instances"
weight = 6
identifier = ""
url = "https://instances.joinpeertube.org"

6
content/home.en.md
View file

@ -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)
@ -166,7 +166,7 @@ Every account has a globally unique identifier (e.g. @chocobozzz@framatube.org)
The administrators of a PeerTube instance can follow each other.
When your PeerTube instance follows another PeerTube instance, you receive
the videos preview informations from this instance. This way, you can display
the videos preview informations from this instance. This way, you can display
the videos available on your instance and on the instances you decided to follow.
So you keep control of the videos displayed on your PeerTube instance!

2
content/home.fr.md
View file

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

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

@ -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 "" }}

4
themes/hugo-bootstrap-premium/static/css/style.css
View file

@ -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 {