remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

merge master

Browse Source
This commit is contained in:
fredtempez 2018-12-30 18:51:31 +01:00
parent 3b5621492f
commit 39ae37dc29
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES.MD
View File

@ -5,10 +5,6 @@
- Stockage distinct du thème et des autres données (core, config, page, module et users ) avec import des données d'une version 8
## Verison 8.5.3
=======
## Version 8.5.3
>>>>>>> master
* Modification :
- Config bouton de génération de la capture de l'écran OpenGraph
* Correction :
@ -23,11 +19,6 @@
## Verison 8.5.2
=======
- #footersiteRight, #footerbodyRight
## Version 8.5.2
>>>>>>> master
* Correction :
- Thème menu : aperçu quand le menu est au-dessus et en-dehors du site

2
core/core.php
View File

@ -25,8 +25,6 @@ class common {
const GROUP_MODERATOR = 2;
const GROUP_ADMIN = 3;
const ZWII_VERSION = '9.0.0';
const ZWII_VERSION = '8.5.3';
>>>>>>> master
public static $actions = [];
public static $coreModuleIds = [

18
core/module/theme/view/footer/footer.js.php
View File

@ -65,10 +65,16 @@ $("#themeFooterForm").on("change",function() {
$("#footerText").hide();
break;
case 'left':
$("#footerText").show().appendTo("#footerbodyLeft");
$("#footerText").show().appendTo("#footersiteLeft");
break;
case 'center':
$("#footerText").show().appendTo("#footerbodyCenter");
$("#footerText").show().appendTo("#footersiteCenter");
break;
case 'right':
$("#footerText").show().appendTo("#footerbodyRight");
$("#footerText").show().appendTo("#footersiteRight");
break;
}
switch($("#themeFooterSocialsPosition").val()) {
@ -76,10 +82,16 @@ $("#themeFooterForm").on("change",function() {
$("#footerSocials").hide();
break;
case 'left':
$("#footerSocials").show().appendTo("#footerbodyLeft");
$("#footerSocials").show().appendTo("#footersiteLeft");
break;
case 'center':
$("#footerSocials").show().appendTo("#footerbodyCenter");
$("#footerSocials").show().appendTo("#footersiteCenter");
break;
case 'right':
$("#footerSocials").show().appendTo("#footerbodyRight");
$("#footerSocials").show().appendTo("#footersiteRight");
break;
}
switch($("#themeFooterCopyrightPosition").val()) {
@ -87,10 +99,16 @@ $("#themeFooterForm").on("change",function() {
$("#footerCopyright").hide();
break;
case 'left':
$("#footerCopyright").show().appendTo("#footerbodyLeft");
$("#footerCopyright").show().appendTo("#footersiteLeft");
break;
case 'center':
$("#footerCopyright").show().appendTo("#footerbodyCenter");
$("#footerCopyright").show().appendTo("#footersiteCenter");
break;
case 'right':
$("#footerCopyright").show().appendTo("#footerbodyRight");
$("#footerCopyright").show().appendTo("#footersiteRight");
break;
}
}).trigger("change");