ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch '11200' into 11200-header

This commit is contained in:
Fred Tempez 2021-11-10 14:49:47 +01:00
parent f5ea37e3b5 af0f00744a
commit 2695a0a6d5
9 changed files with 122 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/module/theme/view/body/body.php
View File

@ -8,7 +8,16 @@
'value' => 'Retour'
]); ?>
</div>
<div class="col2 offset8">
<div class="col2">
<?php echo template::button('themeSiteHelp', [
'href' => 'https://doc.zwiicms.fr/arriere-plan',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2 offset6">
<?php echo template::submit('themeBodySubmit'); ?>
</div>
</div>
@ -96,4 +105,4 @@
</div>
</div>
</div>
<?php echo template::formClose(); ?>
<?php echo template::formClose(); ?>

11
core/module/theme/view/footer/footer.php
View File

@ -8,7 +8,16 @@
'value' => 'Retour'
]); ?>
</div>
<div class="col2 offset8">
<div class="col2">
<?php echo template::button('themeSiteHelp', [
'href' => 'https://doc.zwiicms.fr/pied-de-page',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2 offset6">
<?php echo template::submit('themeFooterSubmit'); ?>
</div>
</div>

13
core/module/theme/view/header/header.php
View File

@ -8,7 +8,16 @@
'value' => 'Retour'
]); ?>
</div>
<div class="col2 offset8">
<div class="col2">
<?php echo template::button('themeSiteHelp', [
'href' => 'https://doc.zwiicms.fr/banniere',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2 offset6">
<?php echo template::submit('themeHeaderSubmit'); ?>
</div>
</div>
@ -49,7 +58,7 @@
<?php echo template::checkbox('themeHeaderTinyHidden', true, 'Masquer la bannière en écran réduit', [
'checked' => $this->getData(['theme', 'header', 'tinyHidden'])
]); ?>
</div>
</div>
</div>
<div class="col4">
<div id="themeHeaderPositionOptions" class="displayNone">

3
core/module/theme/view/index/index.css
View File

@ -36,7 +36,8 @@ nav li ul {
}
#themeShowAll,
#themeBack,
#themeHelp,
#themeBack,
#themeManage,
#themeAdmin,
#themeAdvanced {

74
core/module/theme/view/index/index.php
View File

@ -5,7 +5,7 @@
): ?>
<?php echo template::speech('Cliquez sur une zone afin d\'accéder à ses options de personnalisation. Vous pouvez également afficher les zones cachées à l\'aide du bouton ci-dessous.'); ?>
<div class="row">
<div class="col3 offset3">
<div class="col2 offset3">
<?php echo template::button('themeBack', [
'class' => 'buttonGrey',
'href' => helper::baseUrl(false),
@ -13,23 +13,39 @@
'value' => 'Accueil'
]); ?>
</div>
<div class="col3">
<?php echo template::button('themeAdmin', [
'ico' => 'brush',
'href' => helper::baseUrl() . $this->getUrl(0) . '/admin',
'value' => 'Administration'
<div class="col2">
<?php echo template::button('themeHelp', [
'href' => 'https://doc.zwiicms.fr/theme-2',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2">
<?php echo template::button('themeShowAll', [
'ico' => 'eye',
'value' => 'Zones cachées'
]); ?>
</div>
</div>
<div class="row">
<div class="col3 offset3">
<div class="col2 offset3">
<?php echo template::button('themeManage', [
'ico' => 'cogs',
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'value' => 'Gestion'
]); ?>
</div>
<div class="col3">
<div class="col2">
<?php echo template::button('themeAdmin', [
'ico' => 'brush',
'href' => helper::baseUrl() . $this->getUrl(0) . '/admin',
'value' => 'Administration'
]); ?>
</div>
<div class="col2">
<?php echo template::button('themeAdvanced', [
'ico' => 'code',
'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced',
@ -37,18 +53,10 @@
]); ?>
</div>
</div>
<div class="row">
<div class="col4 offset4">
<?php echo template::button('themeShowAll', [
'ico' => 'eye',
'value' => 'Zones cachées'
]); ?>
</div>
</div>
<?php else: ?>
<?php echo template::speech('Cliquez sur une zone afin d\'accéder à ses options de personnalisation.'); ?>
<div class="row">
<div class="col3 offset3">
<div class="col2 offset4">
<?php echo template::button('themeBack', [
'class' => 'buttonGrey',
'href' => helper::baseUrl(false),
@ -56,28 +64,38 @@
'value' => 'Accueil'
]); ?>
</div>
<div class="col3">
<?php echo template::button('themeAdmin', [
'ico' => 'brush',
'href' => helper::baseUrl() . $this->getUrl(0) . '/admin',
'value' => 'Administration'
<div class="col2">
<?php echo template::button('themeHelp', [
'href' => 'https://doc.zwiicms.fr/theme-2',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
</div>
<div class="row">
<div class="col3 offset3">
<div class="col2 offset3">
<?php echo template::button('themeManage', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'ico' => 'cogs',
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'value' => 'Gestion'
]); ?>
</div>
<div class="col3">
<div class="col2">
<?php echo template::button('themeAdmin', [
'ico' => 'brush',
'href' => helper::baseUrl() . $this->getUrl(0) . '/admin',
'value' => 'Administration'
]); ?>
</div>
<div class="col2">
<?php echo template::button('themeAdvanced', [
'ico' => 'code',
'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced',
'value' => 'Éditeur CSS',
'ico' => 'code'
'value' => 'Éditeur CSS'
]); ?>
</div>
</div>
<?php endif; ?>
<?php endif; ?>

11
core/module/theme/view/menu/menu.php
View File

@ -8,7 +8,16 @@
'value' => 'Retour'
]); ?>
</div>
<div class="col2 offset8">
<div class="col2">
<?php echo template::button('themeSiteHelp', [
'href' => 'https://doc.zwiicms.fr/menu',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2 offset6">
<?php echo template::submit('themeMenuSubmit'); ?>
</div>
</div>

37
core/module/theme/view/site/site.js.php
View File

@ -11,35 +11,23 @@
* @link http://zwiicms.fr/
*/
/*
* Chargement de l'aperçu
*/
$(document).ready(function() {
/**
* Option de marge si la taille n'est pas fluide
*/
if ($('#themeSiteWidth').val() === '100%') {
$("#themeSiteMargin").prop("checked", true);
$("#themeSiteMargin").addClass("disabled");
} else {
$("#themeSiteMargin").addClass("enabled");
}
// Charger l'aperçu initial
previewDOM();
});
/**
* Aperçu en direct
*/
$("input, select").on("change",function() {
previewDOM();
});
$("input, select").on("change",function() {
function previewDOM() {
/**
* Option de marge si la taille n'est pas fluide
*/
if ($('#themeSiteWidth').val() === '100%') {
console.log ("pop");
$("#themeSiteMarginWrapper").prop("checked", true);
$("#themeSiteMarginWrapper").hide();
} else {
$("#themeSiteMarginWrapper").show();
}
/**
* Aperçu dans la boîte
@ -96,7 +84,6 @@ function previewDOM() {
// Couleur ou image de fond
var backgroundImage = <?php echo json_encode(helper::baseUrl(false) . self::FILE_DIR . 'source/' . $this->getData(['theme','body','image'])); ?>;
console.log(backgroundImage);
var backgroundcolor = <?php echo json_encode($this->getdata(['theme','body','backgroundColor'])); ?>;
if(backgroundImage) {
css += "div.bodybackground{background-image:url(" + backgroundImage + ");background-repeat:" + $("#themeBodyImageRepeat").val() + ";background-position:" + $("#themeBodyImagePosition").val() + ";background-attachment:" + $("#themeBodyImageAttachment").val() + ";background-size:" + $("#themeBodyImageSize").val() + "}";
@ -125,4 +112,4 @@ function previewDOM() {
.text(css)
.appendTo("head");
};
}).trigger("change");

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

@ -8,7 +8,16 @@
'value' => 'Retour'
]); ?>
</div>
<div class="col2 offset8">
<div class="col2">
<?php echo template::button('themeSiteHelp', [
'href' => 'https://doc.zwiicms.fr/site61863d315ffe0',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2 offset6">
<?php echo template::submit('themeSiteSubmit'); ?>
</div>
</div>
@ -194,4 +203,4 @@
</div>
</div>
</div>
<?php echo template::formClose(); ?>
<?php echo template::formClose(); ?>

20
core/module/user/view/import/import.php
View File

@ -8,23 +8,21 @@
'value' => 'Retour'
]); ?>
</div>
<div class="col2">
<?php echo template::button('translateIndexHelp', [
'class' => 'buttonHelp',
'ico' => 'help',
'value' => 'Aide'
]); ?>
</div>
<div class="col2">
<?php echo template::button('userHelp', [
'href' => 'https://doc.zwiicms.fr/importation-d-une-liste-d-utilisateurs',
'target' => '_blank',
'ico' => 'help',
'value' => 'Aide',
'class' => 'buttonHelp'
]); ?>
</div>
<div class="col2 offset6">
<?php echo template::submit('userImportSubmit', [
'value' => 'Importer'
]); ?>
</div>
</div>
<!-- Aide à propos de la gestion des utilisateurs, view import -->
<div class="helpDisplayContent">
<?php echo file_get_contents( 'core/module/user/view/import/import.help.html') ;?>
</div>
<div class="row">
<div class="col12">
<div class="block">