lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' into dev10

Browse Source
This commit is contained in:
Fred Tempez 2020-03-23 16:27:36 +01:00
commit 89c5b3e535
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/layout/blank.php
View File

@ -13,8 +13,8 @@
<?php $layout->showStyle(); ?> <?php $layout->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); ?>site/data/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); ?>site/data/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 $layout->showContent(); ?>
<?php $layout->showScript(); ?> <?php $layout->showScript(); ?>

4
core/layout/light.php
View File

@ -13,8 +13,8 @@
<?php $layout->showStyle(); ?> <?php $layout->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); ?>site/data/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); ?>site/data/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 $layout->showNotification(); ?>

16
core/layout/main.php
View File

@ -12,11 +12,11 @@
<?php $layout->showVendor(); ?> <?php $layout->showVendor(); ?>
<?php $layout->showAnalytics(); ?> <?php $layout->showAnalytics(); ?>
<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); ?>site/data/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); ?>site/data/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'); ?>">
<?php $layout->showStyle(); ?> <?php $layout->showStyle(); ?>
<?php if (file_exists('site/data/head.inc.html')) { <?php if (file_exists(self::DATA_DIR .'head.inc.html')) {
include('site/data/head.inc.html'); include(self::DATA_DIR .'head.inc.html');
}?> }?>
</head> </head>
<body> <body>
@ -176,8 +176,8 @@
in_array($this->getUrl(1),$pattern) ) in_array($this->getUrl(1),$pattern) )
) { // Pleine page en mode configuration ) { // Pleine page en mode configuration
$layout->showContent(); $layout->showContent();
if (file_exists('site/data/body.inc.html')) { if (file_exists(self::DATA_DIR . 'body.inc.html')) {
include('site/data/body.inc.html'); include( self::DATA_DIR . 'body.inc.html');
} }
} else { } else {
?> ?>
@ -187,8 +187,8 @@
<div class="<?php echo $blockleft; ?>" id="contentLeft"><?php $layout->showBarContentLeft(); ?></div> <div class="<?php echo $blockleft; ?>" id="contentLeft"><?php $layout->showBarContentLeft(); ?></div>
<?php endif; ?> <?php endif; ?>
<div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent(); <div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent();
if (file_exists('site/data/body.inc.html')) { if (file_exists(self::DATA_DIR . 'body.inc.html')) {
include('site/data/body.inc.html'); include(self::DATA_DIR . 'body.inc.html');
} }
?> ?>
</div> </div>

16
core/layout/popup.php
View File

@ -12,11 +12,11 @@
<?php $layout->showVendor(); ?> <?php $layout->showVendor(); ?>
<?php $layout->showAnalytics(); ?> <?php $layout->showAnalytics(); ?>
<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); ?>site/data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false) . self::DATA_DIR; ?>data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/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'); ?>">
<?php $layout->showStyle(); ?> <?php $layout->showStyle(); ?>
<?php if (file_exists('site/data/head.inc.html')) { <?php if (file_exists(self::DATA_DIR . 'head.inc.html')) {
include('site/data/head.inc.html'); include( self::DATA_DIR . 'head.inc.html');
}?> }?>
</head> </head>
<body> <body>
@ -53,8 +53,8 @@
in_array($this->getUrl(1),$pattern) ) in_array($this->getUrl(1),$pattern) )
) { // Pleine page en mode configuration ) { // Pleine page en mode configuration
$layout->showContent(); $layout->showContent();
if (file_exists('site/data/body.inc.html')) { if (file_exists(self::DATA_DIR . 'body.inc.html')) {
include('site/data/body.inc.html'); include(self::DATA_DIR . 'body.inc.html');
} }
} else { } else {
?> ?>
@ -64,8 +64,8 @@
<div class="<?php echo $blockleft; ?>" id="contentLeft"><?php $layout->showBarContentLeft(); ?></div> <div class="<?php echo $blockleft; ?>" id="contentLeft"><?php $layout->showBarContentLeft(); ?></div>
<?php endif; ?> <?php endif; ?>
<div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent(); <div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent();
if (file_exists('site/data/body.inc.html')) { if (file_exists(self::DATA_DIR . 'body.inc.html')) {
include('site/data/body.inc.html'); include(self::DATA_DIR . 'body.inc.html');
} }
?> ?>
</div> </div>