diff --git a/core/core.php b/core/core.php
index b97c34bb..a81d0b74 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1058,11 +1058,18 @@ class common {
$this->setData(['core', 'baseUrl', helper::baseUrl(true,false) ]);
$this->setData(['core', 'dataVersion', 9216]);
}
+ // Version 9.2.21
+ if($this->getData(['core', 'dataVersion']) < 9221) {
+ // Utile pour l'installation d'un backup sur un autre serveur
+ // mais avec la réécriture d'URM
+ $this->setData(['theme', 'body', 'toTopbackgroundColor', 'rgba(33, 34, 35, .8)' ]);
+ $this->setData(['theme', 'body', 'toTopColor', 'rgba(255, 255, 255, 1)' ]);
+ $this->setData(['core', 'dataVersion', 9221]);
+ }
// Version 10.0.00
if($this->getData(['core', 'dataVersion']) < 10000) {
$this->setData(['config', 'faviconDark','faviconDark.ico']);
- $this->setData(['core', 'dataVersion', 10000]);
- }
+ $this->setData(['core', 'dataVersion', 10000]);
}
}
@@ -1146,6 +1153,8 @@ class core extends common {
if($themeBodyImage = $this->getData(['theme', 'body', 'image'])) {
$css .= 'body{background-image:url("../file/source/' . $themeBodyImage . '");background-position:' . $this->getData(['theme', 'body', 'imagePosition']) . ';background-attachment:' . $this->getData(['theme', 'body', 'imageAttachment']) . ';background-size:' . $this->getData(['theme', 'body', 'imageSize']) . ';background-repeat:' . $this->getData(['theme', 'body', 'imageRepeat']) . '}';
}
+ // Icône BacktoTop
+ $css .= '#backToTop {background-color:' .$this->getData(['theme', 'body', 'toTopbackgroundColor']). ';color:'.$this->getData(['theme', 'body', 'toTopColor']).';}';
// Site
$colors = helper::colorVariants($this->getData(['theme', 'link', 'textColor']));
$css .= 'a{color:' . $colors['normal'] . '}';
@@ -1709,7 +1718,7 @@ class layout extends common {
*/
public function showFooterText() {
if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') {
- echo '
';
+ echo '';
}
}
diff --git a/core/layout/common.css b/core/layout/common.css
index 2eef2168..0fa2919b 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -643,12 +643,6 @@ footer #footerbody > div {
font-size: inherit;
}
-/* Corrige le problème des
dans les col du texte personnalisé */
-#footerText div {
- display: inline-flex;
- float: left;
-}
-
/* Conserve le pied de page sur une ligne */
@media (max-width: 768px) {
body > footer {
@@ -752,8 +746,10 @@ footer #footerSocials .zwiico-github:hover {
right: 30px;
bottom: 50px;
padding: 13px 16px 16px;
+ /*
+ Paramétré dans le thème (9.2.21)
background: rgba(33, 34, 35, .8);
- color: #FFF;
+ color: #FFF;*/
cursor: pointer;
display: none;
border-radius: 50%;
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index fe446a09..36e33fe4 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -67,7 +67,9 @@ class init extends common {
'imageAttachment' => 'scroll',
'imageRepeat' => 'no-repeat',
'imagePosition' => 'top center',
- 'imageSize' => 'auto'
+ 'imageSize' => 'auto',
+ 'toTopbackgroundColor' => 'rgba(33, 34, 35, .8)',
+ 'toTopColor' => 'rgba(255, 255, 255, 1)'
],
'button' => [
'backgroundColor' => 'rgba(32, 59, 82, 1)'
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 67f5594b..79f01070 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -275,7 +275,9 @@ class theme extends common {
'imageAttachment' => $this->getInput('themeBodyImageAttachment'),
'imagePosition' => $this->getInput('themeBodyImagePosition'),
'imageRepeat' => $this->getInput('themeBodyImageRepeat'),
- 'imageSize' => $this->getInput('themeBodyImageSize')
+ 'imageSize' => $this->getInput('themeBodyImageSize'),
+ 'toTopbackgroundColor' => $this->getInput('themeBodyToTopBackground'),
+ 'toTopColor' => $this->getInput('themeBodyToTopColor')
]]);
// Valeurs en sortie
$this->addOutput([
diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css
new file mode 100644
index 00000000..f4e66975
--- /dev/null
+++ b/core/module/theme/view/body/body.css
@@ -0,0 +1,16 @@
+/**
+ * This file is part of Zwii. *
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Rémi Jean
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @license GNU General Public License, version 3
+ * @author Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
+ * @link http://zwiicms.com/
+ */
+
+#backToTop {
+ display: block;
+}
\ No newline at end of file
diff --git a/core/module/theme/view/body/body.js.php b/core/module/theme/view/body/body.js.php
index b6429b7e..e051b873 100755
--- a/core/module/theme/view/body/body.js.php
+++ b/core/module/theme/view/body/body.js.php
@@ -24,6 +24,8 @@ $("input, select").on("change", function() {
else {
css += "body{background-image:none}";
}
+ css += '#backToTop {background-color:' + $("#themeBodyToTopBackground").val() + ';color:' + $("#themeBodyToTopColor").val() + ';}';
+
// Ajout du css au DOM
$("#themePreview").remove();
$("