Browse Source

Version 0.9.7

pull/1/head
Fred Tempez 4 years ago
parent
commit
455e547c23
  1. 18
      .gitignore
  2. 2
      CHANGES-DEV.MD
  3. 2
      core/core.php
  4. 4
      core/layout/common.css
  5. 7
      core/layout/main.php
  6. 2
      core/module/page/page.php
  7. 9
      core/module/theme/theme.php
  8. 2
      core/module/theme/view/menu/menu.js.php
  9. 8
      core/module/theme/view/menu/menu.php
  10. 2
      site/data/theme.css
  11. 0
      site/tmp/.gitkeep

18
.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/

2
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.

2
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 = [

4
core/layout/common.css

@ -209,6 +209,10 @@ td > .col12 {
margin: auto;
}
.container-large {
width: 100%;
}
/* Barre de membre */
#bar {
background: #212223;

7
core/layout/main.php

@ -16,11 +16,14 @@
<?php $layout->showStyle(); ?>
<?php $layout->showBar(); ?>
<?php $layout->showNotification(); ?>
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first'): ?>
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'body-top' ): ?>
<!-- Menu dans le fond du site avant la bannière -->
<nav>
<div id="toggle"><?php echo template::ico('menu'); ?></div>
<div id="menu" class="container">
<div id="menu" class="
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-top'){echo 'container-large';}else{echo'container';}
?>">
<?php $layout->showMenu(); ?>
</div>
</nav>

2
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)) ? "<p></p>" : $this->getInput('pageEditContent', null)) ,
'hideTitle' => $this->getInput('pageEditHideTitle', helper::FILTER_BOOLEAN),
'metaDescription' => $this->getInput('pageEditMetaDescription', helper::FILTER_STRING_LONG),
'metaTitle' => $this->getInput('pageEditMetaTitle'),

9
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([

2
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() {

8
core/module/theme/view/menu/menu.php

@ -85,11 +85,11 @@
</div>
</div>
<div id="themeMenuPositionOptions" class="displayNone">
<?php echo template::checkbox('themeMenuMargin', true, 'Aligner le menu avec le contenu', [
'checked' => $this->getData(['theme', 'menu', 'margin'])
]); ?>
<?php echo template::checkbox('themeMenuMargin', true, 'Aligner le menu avec le contenu', [
'checked' => $this->getData(['theme', 'menu', 'margin'])
]); ?>
</div>
</div>
</div>
</div>
</div>
<div class="row">

2
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}
/*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}

0
site/tmp/.gitkeep

Loading…
Cancel
Save