From 455e547c2383204ffec13a3398b4d17d40a36c94 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 7 Apr 2018 23:31:15 +0200 Subject: [PATCH] Version 0.9.7 --- .gitignore | 18 ++++++++++++++++++ CHANGES-DEV.MD | 2 ++ core/core.php | 2 +- core/layout/common.css | 4 ++++ core/layout/main.php | 7 +++++-- core/module/page/page.php | 2 +- core/module/theme/theme.php | 9 ++++++++- core/module/theme/view/menu/menu.js.php | 2 +- core/module/theme/view/menu/menu.php | 8 ++++---- site/data/theme.css | 2 +- site/tmp/.gitkeep | 0 11 files changed, 45 insertions(+), 11 deletions(-) create mode 100755 .gitignore create mode 100755 site/tmp/.gitkeep diff --git a/.gitignore b/.gitignore new file mode 100755 index 00000000..2c174f18 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +# Fichiers temporaires +site/tmp/* + +# Sauvegardes +site/backup/* + +# Fichiers de données +site/data/* + +# Fichiers uploadés +site/file/source/* +site/file/thumb/* + +# Dossiers vides dans GitHub +!.gitkeep + +# PHPStorm +.idea/ \ No newline at end of file diff --git a/CHANGES-DEV.MD b/CHANGES-DEV.MD index 36b2f22e..9d7fc922 100755 --- a/CHANGES-DEV.MD +++ b/CHANGES-DEV.MD @@ -1,4 +1,6 @@ ChangeLog version bêta 8.3 : +- 0.9.7 Permet au menu de sortir de la largeur du site quand il est au-dessus de la bannière +- 0.9.6 Corrige l'affichage d'une erreur 404 si le contenu d'une page est supprimé - 0.9.5 Corrige une erreur deans le filemanger si une seule extension demandée - 0.9.4 Corrige les droits sur la rédaction des commentaires - 0.9.3 Corrige un bug présent depuis au moins la version 8.1 et qui fait boucler l'édition d'une page avec un module de redirection; Après édition, un clic sur retour ou enregistrer renvoie vers la page d'accueil en édition. diff --git a/core/core.php b/core/core.php index b42077e2..f07ed67f 100755 --- a/core/core.php +++ b/core/core.php @@ -24,7 +24,7 @@ class common { const GROUP_MEMBER = 1; const GROUP_MODERATOR = 2; const GROUP_ADMIN = 3; - const ZWII_VERSION = '8.2.6'; + const ZWII_VERSION = '8.3.0'; public static $actions = []; public static $coreModuleIds = [ diff --git a/core/layout/common.css b/core/layout/common.css index 740ffdf7..b5d11e97 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -209,6 +209,10 @@ td > .col12 { margin: auto; } +.container-large { + width: 100%; +} + /* Barre de membre */ #bar { background: #212223; diff --git a/core/layout/main.php b/core/layout/main.php index c65057b7..c8930289 100755 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -16,11 +16,14 @@ showStyle(); ?> showBar(); ?> showNotification(); ?> -getData(['theme', 'menu', 'position']) === 'body-first'): ?> +getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'body-top' ): ?> diff --git a/core/module/page/page.php b/core/module/page/page.php index 1fb35d31..454dc549 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -178,7 +178,7 @@ class page extends common { 'iconUrl' => $this->getinput('pageIconUrl'), 'disable'=> $this->getinput('pageDisable', helper::FILTER_BOOLEAN), // Menu image - 'content' => $this->getInput('pageEditContent', null), + 'content' => (empty($this->getInput('pageEditContent', null)) ? "

" : $this->getInput('pageEditContent', null)) , 'hideTitle' => $this->getInput('pageEditHideTitle', helper::FILTER_BOOLEAN), 'metaDescription' => $this->getInput('pageEditMetaDescription', helper::FILTER_STRING_LONG), 'metaTitle' => $this->getInput('pageEditMetaTitle'), diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 06ebd491..7b64a6d1 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -127,8 +127,10 @@ class theme extends common { 'hide' => 'Caché', 'site-first' => 'Dans le site avant la bannière', 'site-second' => 'Dans le site après la bannière', + 'body-top' => 'Au-dessus et en-dehors du site', 'body-first' => 'Au dessus du site avant la bannière', 'body-second' => 'Au dessus du site après la bannière' + ]; public static $radius = [ '0' => 'Aucun', @@ -174,6 +176,11 @@ class theme extends common { '100%' => 'Fluide (100%)' ]; + public static $menuWide = [ + 'container' => 'sur la largeur du site', + 'container-large' => 'sur la largeur de la page' + ]; + /** * Mode avancé */ @@ -334,7 +341,7 @@ class theme extends common { 'position' => $this->getInput('themeMenuPosition'), 'textAlign' => $this->getInput('themeMenuTextAlign'), 'textColor' => $this->getInput('themeMenuTextColor'), - 'textTransform' => $this->getInput('themeMenuTextTransform') + 'textTransform' => $this->getInput('themeMenuTextTransform'), ]]); // Valeurs en sortie $this->addOutput([ diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php index 3b8090cc..b171e55b 100755 --- a/core/module/theme/view/menu/menu.js.php +++ b/core/module/theme/view/menu/menu.js.php @@ -87,7 +87,7 @@ $("#themeMenuLoginLink").on("change", function() { // Affiche / Cache les options de la position $("#themeMenuPosition").on("change", function() { if($(this).val() === 'site-first' || $(this).val() === 'site-second') { - $("#themeMenuPositionOptions").slideDown(); + $("#themeMenuPositionOptions").slideDown(); } else { $("#themeMenuPositionOptions").slideUp(function() { diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php index f0ddf5ae..100c640c 100755 --- a/core/module/theme/view/menu/menu.php +++ b/core/module/theme/view/menu/menu.php @@ -85,11 +85,11 @@
- $this->getData(['theme', 'menu', 'margin']) - ]); ?> + $this->getData(['theme', 'menu', 'margin']) + ]); ?>
- +
diff --git a/site/data/theme.css b/site/data/theme.css index 15424bd0..14b8f2f4 100755 --- a/site/data/theme.css +++ b/site/data/theme.css @@ -1 +1 @@ -/*24f26faf78e91150824a598d67afc54b*/@import url("https://fonts.googleapis.com/css?family=Open+Sans|Oswald|Oswald");body{background-color:rgba(236,239,241,1);font-family:"Open Sans",sans-serif}a{color:rgba(74,105,189,1)}a:hover{color:rgba(59,90,174,1)}body,.row > div{font-size:14px}body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:rgba(33, 34, 35, 1)}.container{max-width:1170px}#site{background-color:rgba(255, 255, 255, 1);border-radius:0;box-shadow:0 #212223}.speechBubble,.button,.button:hover,button[type='submit'],.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,input[type='radio']:checked + label:before,.helpContent{background-color:rgba(74,105,189,1);color:white}.helpButton span{color:rgba(74,105,189,1)}input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:rgba(74,105,189,1)}.speechBubble:before{border-color:rgba(74,105,189,1) transparent transparent transparent}.button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before,input[type='radio']:checked:hover + label:before,input[type='radio']:not(:checked):active + label:before{background-color:rgba(59,90,174,1)}.helpButton span:hover{color:rgba(59,90,174,1)}.button:active,button[type='submit']:active,.pagination a:active{background-color:rgba(54,85,169,1)}h1,h2,h3,h4,h5,h6{color:rgba(74,105,189,1);font-family:"Oswald",sans-serif;font-weight:normal;text-transform:none}header{background-color:rgba(255,255,255,1);height:150px;line-height:150px;text-align:center}header span{color:rgba(33,34,35,1);font-family:"Oswald",sans-serif;font-weight:normal;font-size:2em;text-transform:none}nav,nav a{background-color:rgba(74,105,189,1)}nav a,#toggle span,nav a:hover{color:rgba(255, 255, 255, 1)}nav a:hover{background-color:rgba(59,90,174,1)}nav a.active{background-color:rgba(54,85,169,1)}#menu{text-align:left}#toggle span,#menu a{padding:15px 10px;font-weight:normal;font-size:1em;text-transform:none}footer{background-color:rgba(255,255,255,1);color:rgba(33, 34, 35, 1)}footer a{color:rgba(33, 34, 35, 1)}footer .container > div{margin:10px 0}#footerSocials{text-align:center}#footerText{text-align:center}#footerCopyright{text-align:center} \ No newline at end of file +/*03ab18789a6b2948d605bb1b0e11c981*/@import url("https://fonts.googleapis.com/css?family=Open+Sans|Oswald|Oswald");body{background-color:rgba(236,239,241,1);font-family:"Open Sans",sans-serif}a{color:rgba(74,105,189,1)}a:hover{color:rgba(59,90,174,1)}body,.row > div{font-size:14px}body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:rgba(33, 34, 35, 1)}.container{max-width:1170px}#site{background-color:rgba(255, 255, 255, 1);border-radius:0;box-shadow:0 #212223}.speechBubble,.button,.button:hover,button[type='submit'],.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,input[type='radio']:checked + label:before,.helpContent{background-color:rgba(74,105,189,1);color:white}.helpButton span{color:rgba(74,105,189,1)}input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:rgba(74,105,189,1)}.speechBubble:before{border-color:rgba(74,105,189,1) transparent transparent transparent}.button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before,input[type='radio']:checked:hover + label:before,input[type='radio']:not(:checked):active + label:before{background-color:rgba(59,90,174,1)}.helpButton span:hover{color:rgba(59,90,174,1)}.button:active,button[type='submit']:active,.pagination a:active{background-color:rgba(54,85,169,1)}h1,h2,h3,h4,h5,h6{color:rgba(74,105,189,1);font-family:"Oswald",sans-serif;font-weight:normal;text-transform:none}header{background-color:rgba(255,255,255,1);height:150px;line-height:150px;text-align:center}header span{color:rgba(33,34,35,1);font-family:"Oswald",sans-serif;font-weight:normal;font-size:2em;text-transform:none}nav,nav a{background-color:rgba(74,105,189,1)}nav a,#toggle span,nav a:hover{color:rgba(255, 255, 255, 1)}nav a:hover{background-color:rgba(59,90,174,1)}nav a.active{background-color:rgba(54,85,169,1)}#menu{text-align:left}#toggle span,#menu a{padding:15px 10px;font-weight:normal;font-size:1em;text-transform:none}footer{background-color:rgba(255,255,255,1);color:rgba(33, 34, 35, 1)}footer a{color:rgba(33, 34, 35, 1)}footer .container > div{margin:10px 0}#footerSocials{text-align:center}#footerText{text-align:center}#footerCopyright{text-align:center} \ No newline at end of file diff --git a/site/tmp/.gitkeep b/site/tmp/.gitkeep new file mode 100755 index 00000000..e69de29b