remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Test nouvelle présentation du blog et des news

Browse Source
This commit is contained in:
fredtempez 2019-02-22 00:12:33 +01:00
parent dd06c00ee0
commit 009f5872e4
6 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/layout/blank.php
View File

@ -14,6 +14,7 @@
<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('site/data/theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file('site/data/theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>"></head> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>"></head>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
<body> <body>
<?php $layout->showStyle(); ?> <?php $layout->showStyle(); ?>
<?php $layout->showContent(); ?> <?php $layout->showContent(); ?>

16
core/layout/common.css
View File

@ -90,6 +90,22 @@ img[align='right'] {
Signature dans les articles blog et news Signature dans les articles blog et news
*/ */
#blogPicture {
text-align: center;
margin-right: -10px;
}
#blogTitle {
background-color: #ECEFF1;
padding: 3px;
margin-left: -10px;
}
#blogDate {
font-size:0.8em;
font-style: italic;
}
.signature { .signature {
font-size: 0.8em; font-size: 0.8em;
font-style: italic; font-style: italic;

1
core/layout/light.php
View File

@ -14,6 +14,7 @@
<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('site/data/theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file('site/data/theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
</head> </head>
<body> <body>
<?php $layout->showStyle(); ?> <?php $layout->showStyle(); ?>

1
core/layout/main.php
View File

@ -13,6 +13,7 @@
<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('site/data/theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file('site/data/theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
</head> </head>
<body> <body>
<?php $layout->showStyle(); ?> <?php $layout->showStyle(); ?>

2
core/vendor/filemanager/UploadHandler.php vendored
View File

@ -1437,7 +1437,7 @@ class UploadHandler
$magicianObj -> saveImage($targetFile); $magicianObj -> saveImage($targetFile);
} }
$thumbResult = create_img($targetFile, $targetFileThumb, 122, 91); $thumbResult = create_img($targetFile, $targetFileThumb, 200, 150);
if ( $thumbResult!==true) if ( $thumbResult!==true)
{ {

45
module/blog/view/index/index.php
View File

@ -1,35 +1,36 @@
<?php if($module::$articles): ?> <?php if($module::$articles): ?>
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php foreach($module::$articles as $articleId => $article): ?> <?php foreach($module::$articles as $articleId => $article): ?>
<div class="block"> <div class="row">
<h4> <div class="col3" id="blogPicture" >
<!-- Le <?php echo date('d M Y à H:i', $article['publishedOn']); ?> --> <a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">
Le <?php echo utf8_encode(strftime('%d %B %Y', $article['publishedOn'])); ?> <img src="<?php echo helper::baseUrl(false) . 'site/file/thumb/' . $article['picture']; ?>">
à <?php echo utf8_encode(strftime('%H:%M', $article['publishedOn'])); ?> </a>
</div>
<div class="col9">
<h1 id="blogTitle">
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">
<?php echo $article['title']; ?>
</a>
</h1>
<div id="blogDate">
<i class="far fa-calendar-alt"></i>
<?php echo utf8_encode(strftime('%d %B %Y', $article['publishedOn'])); ?>
</div>
<p class="blogContent">
<?php echo helper::subword(strip_tags($article['content']), 0, 300); ?>...
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">Lire la suite</a>
</p>
<div class="blogComment"> <div class="blogComment">
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>#comment"> <a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>#comment">
<?php echo count($article['comment']); ?> <?php echo count($article['comment']); ?>
</a> </a>
<?php echo template::ico('comment', 'left'); ?> <?php echo template::ico('comment', 'left'); ?>
</div> </div>
</h4> </div>
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>" class="blogPicture">
<img src="<?php echo helper::baseUrl(false) . 'site/file/thumb/' . $article['picture']; ?>">
</a>
<h2>
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">
<?php echo $article['title']; ?>
</a>
</h2>
<p class="blogContent">
<?php echo helper::subword(strip_tags($article['content']), 0, 150); ?>...
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>">Lire la suite</a>
</p>
<p class="signature">
<?php echo $this->getData(['user', $article['userId'], 'firstname']) . ' ' . $this->getData(['user', $article['userId'], 'lastname']); ?>
</p>
</div> </div>
<hr />
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</div> </div>