ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Merge branch 'layout' into 11000

Browse Source
This commit is contained in:
Fred Tempez 2021-07-22 21:56:51 +02:00
commit b23ed7e94b
4 changed files with 843 additions and 853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1595
core/core.php
View File

File diff suppressed because it is too large Load Diff

19
core/layout/blank.php
View File

@ -1,22 +1,21 @@
<?php $layout = new layout($this); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="<?php echo self::$i18n;?>"> <html prefix="og: http://ogp.me/ns#" lang="<?php echo self::$i18n;?>">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?> <?php $this->showMetaTitle(); ?>
<?php $layout->showMetaDescription(); ?> <?php $this->showMetaDescription(); ?>
<?php $layout->showMetaType(); ?> <?php $this->showMetaType(); ?>
<?php $layout->showMetaImage(); ?> <?php $this->showMetaImage(); ?>
<?php $layout->showFavicon(); ?> <?php $this->showFavicon(); ?>
<?php $layout->showVendor(); ?> <?php $this->showVendor(); ?>
<?php $layout->showStyle(); ?> <?php $this->showStyle(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/blank.css"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/blank.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"></head> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"></head>
<body> <body>
<?php $layout->showContent(); ?> <?php $this->showContent(); ?>
<?php $layout->showScript(); ?> <?php $this->showScript(); ?>
</body> </body>
</html> </html>

21
core/layout/light.php
View File

@ -1,26 +1,25 @@
<?php $layout = new layout($this); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="<?php echo self::$i18n;?>"> <html prefix="og: http://ogp.me/ns#" lang="<?php echo self::$i18n;?>">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?> <?php $this->showMetaTitle(); ?>
<?php $layout->showMetaDescription(); ?> <?php $this->showMetaDescription(); ?>
<?php $layout->showMetaType(); ?> <?php $this->showMetaType(); ?>
<?php $layout->showMetaImage(); ?> <?php $this->showMetaImage(); ?>
<?php $layout->showFavicon(); ?> <?php $this->showFavicon(); ?>
<?php $layout->showVendor(); ?> <?php $this->showVendor(); ?>
<?php $layout->showStyle(); ?> <?php $this->showStyle(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/light.css"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/light.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
</head> </head>
<body> <body>
<?php $layout->showNotification(); ?> <?php $this->showNotification(); ?>
<div id="site" class="container light"> <div id="site" class="container light">
<section><?php $layout->showContent(); ?></section> <section><?php $this->showContent(); ?></section>
</div> </div>
<?php $layout->showScript(); ?> <?php $this->showScript(); ?>
</body> </body>
</html> </html>

61
core/layout/main.php
View File

@ -1,16 +1,15 @@
<?php $layout = new layout($this); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="<?php echo self::$i18n;?>"> <html prefix="og: http://ogp.me/ns#" lang="<?php echo self::$i18n;?>">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?> <?php $this->showMetaTitle(); ?>
<?php $layout->showMetaDescription(); ?> <?php $this->showMetaDescription(); ?>
<?php $layout->showMetaType(); ?> <?php $this->showMetaType(); ?>
<?php $layout->showMetaImage(); ?> <?php $this->showMetaImage(); ?>
<?php $layout->showFavicon(); ?> <?php $this->showFavicon(); ?>
<?php $layout->showVendor(); ?> <?php $this->showVendor(); ?>
<?php $layout->showAnalytics(); ?> <?php $this->showAnalytics(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css?<?php echo md5_file('core/layout/common.css');?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css?<?php echo md5_file('core/layout/common.css');?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
@ -20,16 +19,16 @@
AND $this->getData(['module', $this->getUrl(0), 'config', 'feeds']) === TRUE ): ?> AND $this->getData(['module', $this->getUrl(0), 'config', 'feeds']) === TRUE ): ?>
<link rel="alternate" type="application/rss+xml" href="'<?php echo helper::baseUrl(). $this->getUrl(0) . '/rss';?>" title="fLUX rss"> <link rel="alternate" type="application/rss+xml" href="'<?php echo helper::baseUrl(). $this->getUrl(0) . '/rss';?>" title="fLUX rss">
<?php endif; ?> <?php endif; ?>
<?php $layout->showStyle(); ?> <?php $this->showStyle(); ?>
<?php if (file_exists(self::DATA_DIR .'head.inc.html')) { <?php if (file_exists(self::DATA_DIR .'head.inc.html')) {
include(self::DATA_DIR .'head.inc.html'); include(self::DATA_DIR .'head.inc.html');
}?> }?>
</head> </head>
<body> <body>
<?php if($this->getUser('group') > self::GROUP_MEMBER): ?> <?php if($this->getUser('group') > self::GROUP_MEMBER): ?>
<?php $layout->showBar(); ?> <?php $this->showBar(); ?>
<?php endif;?> <?php endif;?>
<?php $layout->showNotification(); ?> <?php $this->showNotification(); ?>
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
<!-- Menu dans le fond du site avant la bannière --> <!-- Menu dans le fond du site avant la bannière -->
<!-- Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté --> <!-- Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté -->
@ -52,14 +51,14 @@
<div id="menu" class=" <div id="menu" class="
<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';} <?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}
?>"> ?>">
<?php $layout->showMenu(); ?> <?php $this->showMenu(); ?>
</div> <!--fin menu --> </div> <!--fin menu -->
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?> <?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?>
<!-- Bannière dans le fond du site --> <!-- Bannière dans le fond du site -->
<header> <header>
<?php //$layout->showi18n();?> <?php //$this->showi18n();?>
<?php <?php
if ($this->getData(['theme','header','linkHomePage'])){ if ($this->getData(['theme','header','linkHomePage'])){
echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?> echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?>
@ -88,7 +87,7 @@
<div id="burgerText"><?php echo $this->getData(['locale','title']);?></div> <div id="burgerText"><?php echo $this->getData(['locale','title']);?></div>
<?php endif; ?> <?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div> <?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div> <div id="menu" class="container"><?php $this->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<!-- Site --> <!-- Site -->
@ -101,7 +100,7 @@
<div id="burgerText"><?php echo $this->getData(['locale','title']);?></div> <div id="burgerText"><?php echo $this->getData(['locale','title']);?></div>
<?php endif; ?> <?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div> <?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div> <div id="menu" class="container"><?php $this->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<?php if( <?php if(
@ -148,12 +147,12 @@
<div id="burgerText"><?php echo $this->getData(['locale','title']);?></div> <div id="burgerText"><?php echo $this->getData(['locale','title']);?></div>
<?php endif; ?> <?php endif; ?>
<?php echo template::ico('menu',null,null,'2em'); ?></div> <?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"><?php $layout->showMenu(); ?></div> <div id="menu" class="container"><?php $this->showMenu(); ?></div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<!-- Corps de page --> <!-- Corps de page -->
<section> <section>
<?php //$layout->showi18n();?> <?php //$this->showi18n();?>
<?php <?php
// Gabarit : // Gabarit :
// Récupérer la config de la page courante // Récupérer la config de la page courante
@ -183,7 +182,7 @@
if ((sizeof($blocks) === 1 || if ((sizeof($blocks) === 1 ||
in_array($this->getUrl(1),$pattern) ) in_array($this->getUrl(1),$pattern) )
) { // Pleine page en mode configuration ) { // Pleine page en mode configuration
$layout->showContent(); $this->showContent();
if (file_exists(self::DATA_DIR . 'body.inc.html')) { if (file_exists(self::DATA_DIR . 'body.inc.html')) {
include( self::DATA_DIR . 'body.inc.html'); include( self::DATA_DIR . 'body.inc.html');
} }
@ -192,10 +191,10 @@
<div class="row siteContainer"> <div class="row siteContainer">
<?php <?php
if ($blockleft !== "") :?> if ($blockleft !== "") :?>
<div class="<?php echo $blockleft; ?>" id="contentLeft"><aside><?php $layout->showBarContentLeft(); ?></aside></div> <div class="<?php echo $blockleft; ?>" id="contentLeft"><aside><?php $this->showBarContentLeft(); ?></aside></div>
<?php endif; ?> <?php endif; ?>
<div class="<?php echo $content; ?>" id="contentSite"> <div class="<?php echo $content; ?>" id="contentSite">
<?php $layout->showContent(); <?php $this->showContent();
if (file_exists(self::DATA_DIR . 'body.inc.html')) { if (file_exists(self::DATA_DIR . 'body.inc.html')) {
include(self::DATA_DIR . 'body.inc.html'); include(self::DATA_DIR . 'body.inc.html');
} }
@ -203,7 +202,7 @@
</div> </div>
<?php <?php
if ($blockright !== "") :?> if ($blockright !== "") :?>
<div class="<?php echo $blockright; ?>" id="contentRight"><aside><?php $layout->showBarContentRight(); ?></aside></div> <div class="<?php echo $blockright; ?>" id="contentRight"><aside><?php $this->showBarContentRight(); ?></aside></div>
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php } <?php }
@ -261,21 +260,21 @@
break; break;
}?> }?>
<div class="<?php echo $class['left'];?>" id="footer<?php echo $position;?>Left"> <div class="<?php echo $class['left'];?>" id="footer<?php echo $position;?>Left">
<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); } <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'left') { $this->showFooterText(); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') { $this->showSocials(); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$layout->showCopyright(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$this->showCopyright(); }
?> ?>
</div> </div>
<div class="<?php echo $class['center'];?>" id="footer<?php echo $position;?>Center"> <div class="<?php echo $class['center'];?>" id="footer<?php echo $position;?>Center">
<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'center') { $layout->showFooterText(); } <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'center') { $this->showFooterText(); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $this->showSocials(); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $layout->showCopyright(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $this->showCopyright(); }
?> ?>
</div> </div>
<div class="<?php echo $class['right'];?>" id="footer<?php echo $position;?>Right"> <div class="<?php echo $class['right'];?>" id="footer<?php echo $position;?>Right">
<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'right') { $layout->showFooterText(); } <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'right') { $this->showFooterText(); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $this->showSocials(); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $layout->showCopyright(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $this->showCopyright(); }
?> ?>
</div> </div>
</div> </div>
@ -287,6 +286,6 @@
} ?> } ?>
<!-- Lien remonter en haut --> <!-- Lien remonter en haut -->
<div id="backToTop"><?php echo template::ico('up'); ?></div> <div id="backToTop"><?php echo template::ico('up'); ?></div>
<?php $layout->showScript();?> <?php $this->showScript();?>
</body> </body>
</html> </html>