Merge branch 'improve-social-links' of max.mehl/pmpc-website into master

lektura
Max Mehl 2017-09-13 12:02:55 +02:00 committed by Gogs
commit a0096ed79c
4 changed files with 11 additions and 11 deletions

View File

@ -1,7 +1,7 @@
<form action="https://fsfe.org/share" method="GET" class="share-buttons {{.type}}" target="_blank">
<input name="popup" id="no-share-popup-{{.type}}" type="radio" />
<input name="ref" value="pmpc-{{.type}}" type="hidden" />
<input name="url" value="{{ .url }}" type="hidden" />
<input name="url" value="{{ .url }}{{ .lang }}" type="hidden" />
<input id="sharetitle-{{.type}}" name="title" value="{{ .defaultSocialText }}" type="hidden" />
<input class="n" name="website" placeholder="Please do not put anything here" />

View File

@ -15,7 +15,7 @@
{{ "<!-- Open Graph meta-data (e.g. Facebook) -->" | safeHTML }}
<meta property="og:type" content="website"/>
<meta property="og:title" content="{{ .Site.Title }}"/>
<meta property="og:url" content="{{ .Site.Params.static.url }}"/>
<meta property="og:url" content="{{ .Site.Params.static.url }}{{ "/" | relLangURL }}"/>
<meta property="og:image" content="{{ .Site.Params.static.url }}/{{ .Site.Params.static.meta.previewImage }}"/>
<meta property="og:description" content="{{ .Site.Params.description }}"/>
<meta property="og:locale" content="{{ .Lang }}"/>
@ -23,13 +23,13 @@
<meta property="fb:page_id" content="{{ .Site.Params.static.meta.fbPageID }}"/>
{{ "<!-- Twitter meta-data -->" | safeHTML }}
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="{{ .Site.Params.static.meta.twitterUser }}">
<meta name="twitter:title" content="{{ .Site.Title }}">
<meta name="twitter:description" content="{{ .Site.Params.description }}">
<meta name="twitter:image" content="{{ .Site.Params.static.url }}/{{ .Site.Params.static.meta.previewImage }}">
<meta name="twitter:url" content="{{ .Site.Params.static.url }}">
<meta name="twitter:creator" content="{{ .Site.Params.static.meta.twitterUser }}">
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="{{ .Site.Params.static.meta.twitterUser }}"/>
<meta name="twitter:title" content="{{ .Site.Title }}"/>
<meta name="twitter:description" content="{{ .Site.Params.description }}"/>
<meta name="twitter:image" content="{{ .Site.Params.static.url }}/{{ .Site.Params.static.meta.previewImage }}"/>
<meta name="twitter:url" content="{{ .Site.Params.static.url }}{{ "/" | relLangURL }}"/>
<meta name="twitter:creator" content="{{ .Site.Params.static.meta.twitterUser }}"/>
{{ "<!-- Favicon -->" | safeHTML }}
<link rel="icon" type="image/png" href="{{ "favicon.png" | absURL }}" sizes="128x128">

View File

@ -2,6 +2,6 @@
<div class="sharecolumn">
{{ $data := index .Site.Data.share .Site.Language.Lang }}
{{ partial "functions/share_buttons.html" (dict "type" "side" "defaultSocialText" .Site.Params.spread.defaultSocialText "url" .Site.Params.static.url "data" $data) }}
{{ partial "functions/share_buttons.html" (dict "type" "side" "defaultSocialText" .Site.Params.spread.defaultSocialText "url" .Site.Params.static.url "lang" ("/" | relLangURL) "data" $data) }}
</div>

View File

@ -19,7 +19,7 @@
{{ .Site.Params.spread.shareTitle }}
{{ $data := index .Site.Data.share .Site.Language.Lang }}
{{ partial "functions/share_buttons.html" (dict "type" "spread" "defaultSocialText" .Site.Params.spread.defaultSocialText "url" .Site.Params.static.url "data" $data) }}
{{ partial "functions/share_buttons.html" (dict "type" "spread" "defaultSocialText" .Site.Params.spread.defaultSocialText "url" .Site.Params.static.url "lang" ("/" | relLangURL) "data" $data) }}
</div>
</div>
</div>