[9.2.17] Petites corrections

2 years ago · 35e8542d6e
10 changed files with 12 additions and 12 deletions
--- a/core/core.php
+++ b/core/core.php
@ -10,7 +10,7 @@
 * @copyright Copyright (C) 2008-2018, Rémi Jean
 * @license GNU General Public License, version 3
 * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @link http://zwiicms.com/
 */

--- a/core/layout/blank.php
+++ b/core/layout/blank.php
@ -10,12 +10,12 @@
 	<?php $layout->showMetaImage(); ?>		
 	<?php $layout->showFavicon(); ?>
 	<?php $layout->showVendor(); ?>
+	<?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/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); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"></head>
 <body>
-<?php $layout->showStyle(); ?>
 <?php $layout->showContent(); ?>
 <?php $layout->showScript(); ?>
 </body>
--- a/core/layout/light.php
+++ b/core/layout/light.php
@ -10,13 +10,13 @@
 	<?php $layout->showMetaImage(); ?>		
 	<?php $layout->showFavicon(); ?>
 	<?php $layout->showVendor(); ?>
+	<?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/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); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
 </head>
 <body>
-<?php $layout->showStyle(); ?>
 <?php $layout->showNotification(); ?>
 <div id="site" class="container">
 	<section><?php $layout->showContent(); ?></section>
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@ -9,7 +9,7 @@
 * @author Rémi Jean <remi.jean@outlook.com>
 * @copyright Copyright (C) 2008-2018, Rémi Jean
 * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @license GNU General Public License, version 3
 * @link http://zwiicms.com/
 */
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@ -7,7 +7,7 @@
 * @author Rémi Jean <remi.jean@outlook.com>
 * @copyright Copyright (C) 2008-2018, Rémi Jean
 * @authorFrédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @license GNU General Public License, version 3
 * @link http://zwiicms.com/
 */
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@ -11,7 +11,7 @@
 * @license GNU General Public License, version 3
 * @link http://zwiicms.com/  
 * @copyright  :  Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 */

 class theme extends common {
--- a/core/module/theme/view/footer/footer.js.php
+++ b/core/module/theme/view/footer/footer.js.php
@ -8,7 +8,7 @@
 * @copyright Copyright (C) 2008-2018, Rémi Jean
 * @license GNU General Public License, version 3
 * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @link http://zwiicms.com/
 */

--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
@ -8,7 +8,7 @@
 * @copyright Copyright (C) 2008-2018, Rémi Jean
 * @license GNU General Public License, version 3
 * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @link http://zwiicms.com/
 */

--- a/core/module/user/view/login/login.js.php
+++ b/core/module/user/view/login/login.js.php
@ -5,7 +5,7 @@
 * file that was distributed with this source code.
 *
 * @authorFrédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @license GNU General Public License, version 3
 * @link http://zwiicms.com/
 */
--- a/module/form/form.php
+++ b/module/form/form.php
@ -9,7 +9,7 @@
 * @author Rémi Jean <remi.jean@outlook.com>
 * @copyright Copyright (C) 2008-2018, Rémi Jean
 * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 * @license GNU General Public License, version 3
 * @link http://zwiicms.com/
 */
@ -51,7 +51,7 @@ class form extends common {
 		self::TYPE_MAIL => 'Champ mail',
 		self::TYPE_SELECT => 'Sélection',
 		self::TYPE_CHECKBOX => 'Case à cocher',		
-		self::TYPE_DATETIME => 'Date',
+		self::TYPE_DATETIME => 'Date'
 	];

 	public static $listUsers = [
@ -169,7 +169,7 @@ class form extends common {
 	/**
 	 * Export CSV
 	 * @author Frédéric Tempez <frederic.tempez@outlook.com>
- 	 * @copyright Copyright (C) 2018-2019, Frédéric Tempez
+ 	 * @copyright Copyright (C) 2018-2020, Frédéric Tempez
 	 */
 	public function export2csv() {
 		// Jeton incorrect