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

ajustement des messages

Browse Source
This commit is contained in:
fredtempez 2019-01-03 20:47:00 +01:00
parent 617bf3b9f6
commit 0e73bf3cfe
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/layout/main.php
View File

@ -131,11 +131,11 @@
break;
case 2 : // 2 blocks
if ($blocks[0] < $blocks[1]) { // détermine la position de la colonne
$blockright = 'col'. $blocks[0];
$blockleft = 'col'. $blocks[0];
$content = 'col'. $blocks[1] ;
} else {
$content = 'col' . $blocks[0];
$blockleft = 'col' . $blocks[1];
$blockright = 'col' . $blocks[1];
}
break;
case 3 : // 3 blocks

12
core/module/theme/theme.php
View File

@ -204,12 +204,12 @@ class theme extends common {
];
public static $siteBlocks = [
'12' => 'Une colonne',
'4-8' => 'Deux colonnes : 1/3 - 2/3',
'8-4' => 'Deux colonnes : 2/3 - 1/3',
'3-9' => 'Deux colonnes : 1/4 - 3/4',
'9-3' => 'Deux colonnes : 3/4 - 1/2',
'3-6-3' => 'Trois colonnes : 1/4 - 1/2 - 1/4'
'12' => 'Un seul bloc, uniquement le site',
'4-8' => 'Deux blocs : 1/3 - 2/3',
'8-4' => 'Deux blocs : 2/3 - 1/3',
'3-9' => 'Deux blocs : 1/4 - 3/4',
'9-3' => 'Deux blocs : 3/4 - 1/2',
'3-6-3' => 'Trois blocs : 1/4 - 1/2 - 1/4'
];

5
core/module/theme/view/site/site.php
View File

@ -137,7 +137,8 @@
<div class='row'>
<div class="col3">
<?php echo template::select('themeSiteBlocks', $module::$siteBlocks, [
'label' => 'Colonnes',
'label' => 'Répartition des blocs :',
'help' => 'Le bloc la plus large abrite le contenu du site',
'selected' => $this->getData(['theme', 'site', 'blocks'])
]); ?>
</div>
@ -145,12 +146,14 @@
<div class='row'>
<div class="col6">
<?php echo template::textarea('themeBlockContentLeft', [
'label' => 'Contenu du bloc à gauche :',
'class' => 'editorWysiwyg',
'value' => $this->getData(['theme','block', 'contentLeft'])
]); ?>
</div>
<div class="col6">
<?php echo template::textarea('themeBlockContentRight', [
'label' => 'Contenu du bloc à droite :',
'class' => 'editorWysiwyg',
'value' => $this->getData(['theme','block', 'contentRight'])
]); ?>