diff --git a/core/core.php b/core/core.php
index 53a05f38..f44d3a38 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2030,13 +2030,13 @@ class layout extends common {
$active = ($childKey === $currentPageId) ? ' class="active"' : '';
$targetBlank = $this->getData(['page', $childKey, 'targetBlank']) ? ' target="_blank"' : '';
// Mise en page du sous-item
-
+ $items .= '
';
if ( $this->getData(['page',$childKey,'disable']) === true
- AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') )
-
- {$items .= ' ';}
- else {
- $items .= ''; }
+ AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) {
+ $items .= ' ';
+ } else {
+ $items .= ' ';
+ }
switch ($this->getData(['page', $childKey, 'typeMenu'])) {
case '' :
@@ -2069,11 +2069,9 @@ class layout extends common {
}
break;
}
- $items .= ' ';
- }
+ $items .= ' ';
+ }
$items .= '';
-
-
}
// Lien de connexion
if(
@@ -2114,16 +2112,13 @@ class layout extends common {
} else {
$filterCurrentPageId = $currentParentPageId;
}
- //if ($this->getData(['page',$filterCurrentPageId,'hideTitle']) == false) {
- // echo '';
- //}
- }
-
+ } else {
+ $items .= '';
+ }
// Retourne les items du menu
- echo '';
+ echo $items;
}
@@ -2299,6 +2282,7 @@ class layout extends common {
}
}
}
+ $leftItems .= '
// Afficher les barres
$leftItems .= '';
foreach($this->getHierarchy(null, false,true) as $parentPageId => $childrenPageIds) {
@@ -2306,7 +2290,8 @@ class layout extends common {
foreach($childrenPageIds as $childKey) {
$leftItems .= ' ' . $this->getData(['page', $childKey, 'title']) . ' ';
}
- }
+ }
+ $leftItems .= ' ';
$leftItems .= '';
$leftItems .= '' . template::ico('plus') . ' ';
if(
@@ -2324,7 +2309,6 @@ class layout extends common {
// Items de droite
$rightItems = '';
if($this->getUser('group') >= self::GROUP_MODERATOR) {
-
$rightItems .= '' . template::ico('folder') . ' ';
}
if($this->getUser('group') >= self::GROUP_ADMIN) {
@@ -2359,7 +2343,7 @@ class layout extends common {
*/
public function showStyle() {
if($this->core->output['style']) {
- echo '';
+ echo '';
}
}
@@ -3027,12 +3011,12 @@ class template {
'ico' => 'check',
'id' => $nameId,
'name' => $nameId,
- 'uniqueSubmission' => true,
+ 'uniqueSubmission' => false, //true avant 9.1.08
'value' => 'Enregistrer'
], $attributes);
// Retourne le html
return sprintf(
- '%s ',
+ '%s ',
$attributes['class'],
$attributes['uniqueSubmission'] ? 'uniqueSubmission' : '',
helper::sprintAttributes($attributes, ['class', 'ico', 'value']),
diff --git a/core/layout/common.css b/core/layout/common.css
index 945fe580..b9e08d4c 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -520,13 +520,13 @@ nav a:hover {
/* Menu vertical */
-#menuSide, #menuSideChild {
+.menuSide, .menuSideChild {
padding-left: 10px;
margin: 0px;
list-style: none;
}
-ul #menuSideChild, li #menuSideChild {
+ul .menuSideChild, li .menuSideChild {
padding-left:10px;
}
diff --git a/core/layout/main.php b/core/layout/main.php
index 83be4838..91117d0b 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -14,9 +14,9 @@
+ showStyle(); ?>
-showStyle(); ?>
showBar(); ?>
showNotification(); ?>
getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 5c6af67d..9b7a51bf 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -264,7 +264,7 @@ class install extends common {
'typeMenu' => 'text',
'iconUrl' => '',
'disable' => false,
- 'content' => '
ZwiiCMS Le CMS sans base de données à l\'installation simple et rapide ',
+ 'content' => '
ZwiiCMS Le CMS sans base de données à l\'installation simple et rapide ',
'hideTitle' => false,
'breadCrumb' => false,
'metaDescription' => '',
@@ -288,7 +288,7 @@ class install extends common {
'typeMenu' => 'text',
'iconUrl' => '',
'disable' => false,
- 'content' => '
',
+ 'content' => '
',
'hideTitle' => false,
'breadCrumb' => false,
'metaDescription' => '',
diff --git a/core/module/page/page.php b/core/module/page/page.php
index 500f236d..26cd4d63 100755
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -245,7 +245,7 @@ class page extends common {
'typeMenu' => $this->getinput('pageTypeMenu'),
'iconUrl' => $this->getinput('pageIconUrl'),
'disable'=> $this->getinput('pageEditDisable', helper::FILTER_BOOLEAN),
- 'content' => (empty($this->getInput('pageEditContent', null)) ? "
" : $this->getInput('pageEditContent', null)) ,
+ 'content' => (empty($this->getInput('pageEditContent', null)) ? '
' : $this->getInput('pageEditContent', null)) ,
'hideTitle' => $hideTitle,
'breadCrumb' => $this->getInput('pageEditbreadCrumb', helper::FILTER_BOOLEAN),
'metaDescription' => $this->getInput('pageEditMetaDescription', helper::FILTER_STRING_LONG),
diff --git a/module/blog/view/article/article.css b/module/blog/view/article/article.css
index 1e9564ad..a56f6054 100644
--- a/module/blog/view/article/article.css
+++ b/module/blog/view/article/article.css
@@ -1,4 +1,4 @@
-#blogArticlePicture {
+.blogArticlePicture {
height: auto;
width: 100%;
background-size: cover;
@@ -19,7 +19,7 @@
margin-left: 10px;
}
@media (max-width: 767px) {
- #blogArticlePicture {
+ .blogArticlePicture {
height:auto;
max-width: 100%;}
}
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index c6f03501..715a394a 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -5,8 +5,7 @@
getData(['module', $this->getUrl(0), $this->getUrl(1), 'hidePicture']) == false) {
- // echo '
';
- echo '';
+ echo '';
} ?>
getData(['module', $this->getUrl(0), $this->getUrl(1), 'content']); ?>
diff --git a/module/blog/view/index/index.css b/module/blog/view/index/index.css
index af5485df..b43eecdd 100644
--- a/module/blog/view/index/index.css
+++ b/module/blog/view/index/index.css
@@ -1,5 +1,5 @@
.blogPicture {
- float: center;
+ float: none;
}
.blogPicture img {
width: 100%;
diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php
index 9670adb2..e5861540 100644
--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@@ -5,7 +5,7 @@