Merge branch 'correct-meta-tags' into 'master'

correct meta tags

Correct https://gitlab.com/mmk2410/rangitaki/merge_requests/2 

See merge request !3
This commit is contained in:
Marcel Kapfer 2016-07-17 09:58:13 +00:00
commit 34e9dd31e4
4 changed files with 9 additions and 2 deletions

View file

@ -49,6 +49,9 @@ $yaml["rcc"]["api"] = "off";
$langs = getDir('./lang'); $langs = getDir('./lang');
$yaml["language"] = get("Choose a language (" . $langs . ")", $yaml["language"], "en"); $yaml["language"] = get("Choose a language (" . $langs . ")", $yaml["language"], "en");
// social media
$yaml["social"]["twitter"] = get("Your Twitter username:", $yaml["social"]["twitter"], "");
$config->writeConfig($yaml); $config->writeConfig($yaml);
function get($question, $value, $default) function get($question, $value, $default)

View file

@ -61,6 +61,9 @@ $yaml["rcc"]["api"] = "off";
$langs = getDir('./lang'); $langs = getDir('./lang');
$yaml["language"] = get("Choose a language (" . $langs . ")", $yaml["language"], "en"); $yaml["language"] = get("Choose a language (" . $langs . ")", $yaml["language"], "en");
// social media
$yaml["social"]["twitter"] = get("Your Twitter username:", $yaml["social"]["twitter"], "");
echo "64\n"; echo "64\n";
$config->writeConfig($yaml); $config->writeConfig($yaml);

View file

@ -21,3 +21,5 @@ rcc:
rcc: 'on' rcc: 'on'
api: 'on' api: 'on'
language: en language: en
social:
twitter: ''

View file

@ -114,10 +114,9 @@ $feedurl = $config["blog"]["url"] . "/feed/" . $blog . ".atom";
<meta property="og:url" content="<?php echo $url; ?>"/> <meta property="og:url" content="<?php echo $url; ?>"/>
<meta property="og:image" content="<?php echo $config['design']['favicon']; ?>"/> <meta property="og:image" content="<?php echo $config['design']['favicon']; ?>"/>
<meta property="og:description" content="<?php echo $config['blog']['description']; ?>"/> <meta property="og:description" content="<?php echo $config['blog']['description']; ?>"/>
<meta property="og:locale:alternate" content="<?php echo $lang; ?>"/>
<!-- Twitter meta tags --> <!-- Twitter meta tags -->
<meta name="twitter:card" content="summary"/> <meta name="twitter:card" content="summary"/>
<meta name="twitter:site" content="<?php echo $twitter; ?>"/> <meta name="twitter:site" content="<?php echo $config['social']['twitter']; ?>"/>
<meta name="twitter:title" content="<?php echo $hd_subblog_title; ?>"/> <meta name="twitter:title" content="<?php echo $hd_subblog_title; ?>"/>
<meta name="twitter:description" content="<?php echo $config['blog']['description']; ?>"/> <meta name="twitter:description" content="<?php echo $config['blog']['description']; ?>"/>
<meta name="twitter:image" content="<?php echo $config['design']['favicon']; ?>"/> <meta name="twitter:image" content="<?php echo $config['design']['favicon']; ?>"/>