diff --git a/core/core.php b/core/core.php index d9bdebe4..f3f81b86 100644 --- a/core/core.php +++ b/core/core.php @@ -1922,6 +1922,15 @@ class layout extends common { } } + /** + * Affiche le texte du footer + */ + public function showFooterText() { + if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') { + echo '
' . nl2br($footerText) . '
'; + } + } + /** * Affiche le copyright */ @@ -1963,7 +1972,57 @@ class layout extends common { // Fermeture du bloc copyright $items .= ''; echo $items; - } + } + + + /** + * Affiche les réseaux sociaux + */ + public function showSocials() { + $socials = ''; + foreach($this->getData(['config', 'social']) as $socialName => $socialId) { + switch($socialName) { + case 'facebookId': + $socialUrl = 'https://www.facebook.com/'; + $title = 'Facebook'; + break; + case 'linkedinId': + $socialUrl = 'https://fr.linkedin.com/in/'; + $title = 'Linkedin'; + break; + case 'instagramId': + $socialUrl = 'https://www.instagram.com/'; + $title = 'Instagram'; + break; + case 'pinterestId': + $socialUrl = 'https://pinterest.com/'; + $title = 'Pinterest'; + break; + case 'twitterId': + $socialUrl = 'https://twitter.com/'; + $title = 'Twitter'; + break; + case 'youtubeId': + $socialUrl = 'https://www.youtube.com/channel/'; + $title = 'YouTube'; + break; + case 'githubId': + $socialUrl = 'https://www.github.com/'; + $title = 'Github'; + break; + default: + $socialUrl = ''; + } + if($socialId !== '') { + $socials .= '' . template::ico(substr($socialName, 0, -2)) . ''; + } + } + if($socials !== '') { + echo '
' . $socials . '
'; + } + } + + /** * Affiche le favicon @@ -1979,14 +2038,6 @@ class layout extends common { } } - /** - * Affiche le texte du footer - */ - public function showFooterText() { - if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') { - echo '
' . nl2br($footerText) . '
'; - } - } /** * Affiche le menu @@ -2387,53 +2438,6 @@ class layout extends common { } } - /** - * Affiche les réseaux sociaux - */ - public function showSocials() { - $socials = ''; - foreach($this->getData(['config', 'social']) as $socialName => $socialId) { - switch($socialName) { - case 'facebookId': - $socialUrl = 'https://www.facebook.com/'; - $title = 'Facebook'; - break; - case 'linkedinId': - $socialUrl = 'https://fr.linkedin.com/in/'; - $title = 'Linkedin'; - break; - case 'instagramId': - $socialUrl = 'https://www.instagram.com/'; - $title = 'Instagram'; - break; - case 'pinterestId': - $socialUrl = 'https://pinterest.com/'; - $title = 'Pinterest'; - break; - case 'twitterId': - $socialUrl = 'https://twitter.com/'; - $title = 'Twitter'; - break; - case 'youtubeId': - $socialUrl = 'https://www.youtube.com/channel/'; - $title = 'YouTube'; - break; - case 'githubId': - $socialUrl = 'https://www.github.com/'; - $title = 'Github'; - break; - default: - $socialUrl = ''; - } - if($socialId !== '') { - $socials .= '' . template::ico(substr($socialName, 0, -2)) . ''; - } - } - if($socials !== '') { - echo '
' . $socials . '
'; - } - } - /** * Affiche l'import des librairies */ diff --git a/core/layout/common.css b/core/layout/common.css index 7d5bf275..dfe612e4 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -565,14 +565,17 @@ section:after { } /* Pied de page */ +footer { + padding: 1px 20px; +} body > footer { margin: 0 -10px; } -footer { - padding: 1px 20px; +#footersiteLeft, #footersiteCenter, #footersiteRight { vertical-align: middle; } + #footerLoginLink, #footerDisplayCopyright, #footerDisplayVersion, diff --git a/core/layout/main.php b/core/layout/main.php index 8955d3b1..39c5cc4f 100755 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -196,117 +196,70 @@ ?> - getData(['theme', 'footer', 'position']) === 'site' // Affiche toujours le pied de page pour l'édition du thème OR ( $this->getData(['theme', 'footer', 'position']) === 'hide' AND $this->getUrl(0) === 'theme' ) - ): ?> - - -