menu burger mises au point
This commit is contained in:
parent
c2e51bd201
commit
0562c7d299
15
CHANGES.md
15
CHANGES.md
|
@ -4,12 +4,23 @@
|
|||
- Modifications :
|
||||
- Une troisième langue d'administration est disponible : espagnol / castillan,
|
||||
- Thème / Menu : le menu en petit écran (burger) dispose maintenant de ses propres paramètres,
|
||||
- Edition de page / emplacement dans le menu : une page désactivée est signalée par le curseur 'not-allowed' en grand écran et par son nom barré en petit écran,
|
||||
- Nouveaux gabarits pour l'éditeur Tinymce : accordéon à 3 et 4 paragraphes,
|
||||
- Statislite 4.7 : comptage des liens cliqués (ils doivent posséder la class="download-link" ).
|
||||
- Statislite 4.8 : comptage des liens cliqués (ils doivent posséder la class="download-link" ).
|
||||
- Corrections :
|
||||
- Thème / header : erreur qui permettait l'affichage de la banière sur toutes les pages même si 'Bannière visible uniquement sur la page d'accueil' était cochée
|
||||
- Statislite / configuration : erreur qui effaçait l'information 'configuration validée',
|
||||
- Slider 4.8 / Configuration : les liens sur les images étaient modifiés au changement de l'ordre des pages.
|
||||
|
||||
## Version 4.4.09 de Deltacms
|
||||
- Corrections :
|
||||
- Statislite / configuration : erreur qui effaçait l'information 'configuration validée',
|
||||
- Thème / bannière : bannière sur page d'accueil seulement, correction.
|
||||
|
||||
## Version 4.4.08 de Deltacms
|
||||
- Correction :
|
||||
- Thème / bannière : perte de contrôle du thème si la case 'Masquer la bannière en écran réduit' était décochée.
|
||||
|
||||
## Version 4.4.07 de Deltacms
|
||||
- Modifications :
|
||||
- Thème / Gestion : possibilité de saisir un nom lors de la sauvegarde ou de l'export d'un thème,
|
||||
|
@ -283,6 +294,6 @@
|
|||
- Export de théme, sauvegarde des images de la bannière personnalisée
|
||||
- Import de thème, modification du nom des fichiers importés pour éviter l'écrasement des fichiers de même nom.
|
||||
|
||||
Deltacms a été créé à partir de la version 11.2.00.24 de ZwiiCMS
|
||||
Deltacms a été créé à partir de la version 11.2.00.24 de ZwiiCMS, les versions 1.x.xx et 2.x.xx de Deltacms n'ont pas été distribuées.
|
||||
|
||||
|
||||
|
|
|
@ -598,14 +598,18 @@ $(document).ready(function(){
|
|||
});
|
||||
<?php } ?>
|
||||
|
||||
/* Affichage des items du sous-menu
|
||||
* après appui sur l'icône down
|
||||
/* Affichage / masquage des items du sous-menu
|
||||
* après appui sur l'icône plus / minus
|
||||
* substitution des icônes down, plus, minus
|
||||
*/
|
||||
if($(window).width() < 800) {
|
||||
if( $("nav #menu ul li span").hasClass('zwiico-down') ) {
|
||||
$("nav #menu ul li span").removeClass('zwiico-down').addClass('zwiico-plus');
|
||||
}
|
||||
$("nav #menu ul li span").click(function() {
|
||||
// id de la page parent
|
||||
var parentId = $(this).parents().attr("id");
|
||||
var select = "nav li ul#"+parentId;
|
||||
var select = "ul#_"+parentId+".navSub";
|
||||
if( $(select).css("z-index") === "-1" ) {
|
||||
$(select).css("z-index","1");
|
||||
$(select).css("opacity","1");
|
||||
|
@ -616,7 +620,34 @@ $(document).ready(function(){
|
|||
$(select).css("opacity","0");
|
||||
$(select).css("position","absolute");
|
||||
}
|
||||
// Modification de l'icône plus ou minus
|
||||
var select = "nav #menu ul li #" + parentId + " span";
|
||||
if ( $(select).hasClass('zwiico-plus') ) {
|
||||
$(select).removeClass('zwiico-plus').addClass('zwiico-minus');
|
||||
}
|
||||
else {
|
||||
$(select).removeClass('zwiico-minus').addClass('zwiico-plus');
|
||||
};
|
||||
});
|
||||
} else {
|
||||
if( $("nav #menu ul li span").hasClass('zwiico-plus') ) {
|
||||
$("nav #menu ul li span").removeClass('zwiico-plus').addClass('zwiico-down');
|
||||
}
|
||||
}
|
||||
|
||||
/* Suppression du décalage vertical de la bannière en petit écran
|
||||
* si menu burger fixe et bannière dans le site et bannière visible
|
||||
*/
|
||||
if($(window).width() < 800) {
|
||||
<?php if( $this->getData(['theme','menu', 'burgerFixed'])=== true && $this->getData(['theme','header', 'position'])=== 'site' && $this->getData(['theme','header', 'tinyHidden'])=== false && ( $this->getData(['theme','header', 'homePageOnly'])=== false || $this->getUrl(0) === $this->getData(['locale','homePageId']) ) ){ ?>
|
||||
$("#site.container").css("padding-top","0");
|
||||
<?php } ?>
|
||||
}
|
||||
|
||||
/*
|
||||
* Lien vers une page ou une sous-page désactivée en petit écran
|
||||
*/
|
||||
if($(window).width() < 800) {
|
||||
$("a.disabled-link").css('text-decoration', 'line-through');
|
||||
}
|
||||
});
|
||||
|
|
117
core/core.php
117
core/core.php
|
@ -1219,7 +1219,7 @@ class common {
|
|||
$item .= $this->getInput('DELTA_COOKIE_CONSENT') !== 'true' ? '>' : ' class="displayNone">';
|
||||
// Image titre et bouton de fermeture
|
||||
$item .= '<div class="cookieTop">';
|
||||
$item .= '<div class="cookieImage"><img src="site/file/source/icones/cookie.gif"/></div>';
|
||||
$item .= '<div class="cookieImage"><img src="site/file/source/icones/cookie.gif" alt=""></div>';
|
||||
$item .= '<div class="cookieTitle">'.$this->getData(['locale', 'cookies', 'cookiesTitleText']) . '</div>';
|
||||
$item .= '<div class="cookieClose">'. template::ico('cancel') .'</div>';
|
||||
$item .= '</div>';
|
||||
|
@ -1385,7 +1385,7 @@ class common {
|
|||
)
|
||||
)
|
||||
{
|
||||
echo '<div id="googTransLogo"><a href="//policies.google.com/terms#toc-content" data-lity><img src="core/module/translate/ressource/googtrans.png" /></a></div>';
|
||||
echo '<div id="googTransLogo"><a href="//policies.google.com/terms#toc-content" data-lity><img src="core/module/translate/ressource/googtrans.png" ></a></div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1755,12 +1755,12 @@ class common {
|
|||
echo '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>';
|
||||
break;
|
||||
case 'oneIcon' :
|
||||
echo '<div id="burgerIcon1"><a href="'.$iconLink1.'"><img src="'. $fileIcon1 .'" style="height:'.$heightLogoBurger.'px; width:auto;"></a></div>';
|
||||
echo '<div id="burgerIcon1"><a href="'.$iconLink1.'"><img src="'. $fileIcon1 .'" style="height:'.$heightLogoBurger.'px; width:auto;" alt=""></a></div>';
|
||||
echo '<div id="burgerIcon2"></div>';
|
||||
break;
|
||||
case 'twoIcon' :
|
||||
echo '<div id="burgerIcon1"><a href="'.$iconLink1.'"><img src="'. $fileIcon1 .'" style="height:'.$heightLogoBurger.'px; width:auto;"></a></div>';
|
||||
echo '<div id="burgerIcon2"><a href="'.$iconLink2.'"><img src="'. $fileIcon2 .'" style="height:'.$heightLogoBurger.'px; width:auto;"></a></div>';
|
||||
echo '<div id="burgerIcon1"><a href="'.$iconLink1.'"><img src="'. $fileIcon1 .'" style="height:'.$heightLogoBurger.'px; width:auto;" alt=""></a></div>';
|
||||
echo '<div id="burgerIcon2"><a href="'.$iconLink2.'"><img src="'. $fileIcon2 .'" style="height:'.$heightLogoBurger.'px; width:auto;" alt=""></a></div>';
|
||||
break;
|
||||
}?>
|
||||
<div id="burgerIcon"><?php echo template::ico('menu',null,null,'2em'); ?></div>
|
||||
|
@ -1781,44 +1781,41 @@ class common {
|
|||
$targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : '';
|
||||
// Mise en page de l'item
|
||||
$itemsLeft .= '<li>';
|
||||
if ( ( $this->getData(['page',$parentPageId,'disable']) === true
|
||||
AND $this->getUser('password') !== $this->getInput('DELTA_USER_PASSWORD')
|
||||
) OR (
|
||||
$this->getData(['page',$parentPageId,'disable']) === true
|
||||
AND $this->getUser('password') === $this->getInput('DELTA_USER_PASSWORD')
|
||||
AND $this->getUser('group') < self::GROUP_EDITOR
|
||||
)
|
||||
){
|
||||
if ( ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') !== $this->getInput('DELTA_USER_PASSWORD'))
|
||||
OR ( $this->getData(['page',$parentPageId,'disable']) === true AND $this->getUser('password') === $this->getInput('DELTA_USER_PASSWORD')AND $this->getUser('group') < self::GROUP_EDITOR ))
|
||||
{
|
||||
$pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false) : helper::baseUrl() . $this->getUrl(0);
|
||||
$itemsLeft .= '<div class="box" style="display:flex; align-items:center;"><div><a class="A ' . $parentPageId . '" href="' . $pageUrl . '">';
|
||||
$itemsLeft .= '<div id="'.$parentPageId.'" class="box" style="display:flex; align-items:center;"><div><a class="A ' . $active . ' disabled-link">';
|
||||
} else {
|
||||
$pageUrl = ($this->getData(['locale', 'homePageId']) === $parentPageId) ? helper::baseUrl(false) : helper::baseUrl() . $parentPageId;
|
||||
$itemsLeft .= '<div class="box '.$active.'" style="display:flex; align-items:center;"><div><a class="B ' . $active . $parentPageId . '" href="' . $pageUrl . '"' . $targetBlank . '>';
|
||||
$itemsLeft .= '<div id="'.$parentPageId.'" class="box '.$active.'" style="display:flex; align-items:center;"><div><a class="B ' . $active . $parentPageId . '" href="' . $pageUrl . '"' . $targetBlank . '>';
|
||||
}
|
||||
$fileLogo = './site/file/source/'. $this->getData(['page', $parentPageId, 'iconUrl']);
|
||||
switch ($this->getData(['page', $parentPageId, 'typeMenu'])) {
|
||||
case '' :
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
break;
|
||||
case 'text' :
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
break;
|
||||
case 'icon' :
|
||||
if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. $fileLogo.'" style="height:'.$heightLogo.'px; width:auto;">';
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
}
|
||||
break;
|
||||
case 'icontitle' :
|
||||
if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'titlshortTitlee']).'" src="'. $fileLogo.'" style="height:'.$heightLogo.'px; width:auto;" data-tippy-content="';
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']).'"/>';
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
}
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
break;
|
||||
}
|
||||
case 'text' :
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
break;
|
||||
case 'icon' :
|
||||
if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. $fileLogo.'" style="height:'.$heightLogo.'px; width:auto;">';
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
}
|
||||
break;
|
||||
case 'icontitle' :
|
||||
if ($this->getData(['page', $parentPageId, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'titlshortTitlee']).'" src="'. $fileLogo.'" style="height:'.$heightLogo.'px; width:auto;" data-tippy-content="';
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']).'">';
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
}
|
||||
break;
|
||||
}
|
||||
$itemsLeft .= '</a>';
|
||||
$itemsLeft .= '</div>';
|
||||
// Cas où les pages enfants enfant sont toutes masquées dans le menu
|
||||
// ne pas afficher de symbole lorsqu'il n'y a rien à afficher
|
||||
$totalChild = 0;
|
||||
|
@ -1826,13 +1823,8 @@ class common {
|
|||
foreach($childrenPageIds as $childKey) {
|
||||
$totalChild += 1;
|
||||
}
|
||||
$itemsLeft .= '</a>';
|
||||
$itemsLeft .= '</div>';
|
||||
if($childrenPageIds && $disableChild !== $totalChild &&
|
||||
$this->getdata(['page',$parentPageId,'hideMenuChildren']) === false) {
|
||||
$itemsLeft .= '<div id="'.$parentPageId.'" class="spacexpx">';
|
||||
if($childrenPageIds && $disableChild !== $totalChild && $this->getdata(['page',$parentPageId,'hideMenuChildren']) === false) {
|
||||
$itemsLeft .= template::ico('down', 'left');
|
||||
$itemsLeft .= '</div>';
|
||||
}
|
||||
// ------------------------------------------------
|
||||
$itemsLeft .= '</div>';
|
||||
|
@ -1841,7 +1833,7 @@ class common {
|
|||
empty($childrenPageIds)) {
|
||||
continue;
|
||||
}
|
||||
$itemsLeft .= '<ul id="'.$parentPageId.'" class="navSub">';
|
||||
$itemsLeft .= '<ul id="_'.$parentPageId.'" class="navSub">';
|
||||
foreach($childrenPageIds as $childKey) {
|
||||
// Propriétés de l'item
|
||||
$active = ($childKey === $currentPageId) ? 'active ' : '';
|
||||
|
@ -1857,12 +1849,11 @@ class common {
|
|||
)
|
||||
){
|
||||
$pageUrl = ($this->getData(['locale', 'homePageId']) === $this->getUrl(0)) ? helper::baseUrl(false) : helper::baseUrl() . $this->getUrl(0);
|
||||
$itemsLeft .= '<a class="' . $parentPageId . '" href="'. $pageUrl .'">';
|
||||
$itemsLeft .= '<a class="disabled-link">';
|
||||
} else {
|
||||
$pageUrl = ($this->getData(['locale', 'homePageId']) === $childKey) ? helper::baseUrl(false) : helper::baseUrl() . $childKey;
|
||||
$itemsLeft .= '<a class="' . $active . $parentPageId . '" href="' . $pageUrl . '"' . $targetBlank . '>';
|
||||
}
|
||||
|
||||
switch ($this->getData(['page', $childKey, 'typeMenu'])) {
|
||||
case '' :
|
||||
$itemsLeft .= $this->getData(['page', $childKey, 'shortTitle']);
|
||||
|
@ -1872,7 +1863,7 @@ class common {
|
|||
break;
|
||||
case 'icon' :
|
||||
if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" style="height:'.$heightLogo.'px; width:auto;" />';
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" style="height:'.$heightLogo.'px; width:auto;">';
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $parentPageId, 'shortTitle']);
|
||||
}
|
||||
|
@ -1880,14 +1871,14 @@ class common {
|
|||
case 'icontitle' :
|
||||
if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" style="height:'.$heightLogo.'px; width:auto;" data-tippy-content="';
|
||||
$itemsLeft .= $this->getData(['page', $childKey, 'shortTitle']).'"/>';
|
||||
$itemsLeft .= $this->getData(['page', $childKey, 'shortTitle']).'">';
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $childKey, 'shortTitle']);
|
||||
}
|
||||
break;
|
||||
case 'icontext' :
|
||||
if ($this->getData(['page', $childKey, 'iconUrl']) != "") {
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" style="height:'.$heightLogo.'px; width:auto;" />';
|
||||
$itemsLeft .= '<img alt="'.$this->getData(['page', $parentPageId, 'shortTitle']).'" src="'. helper::baseUrl(false) .self::FILE_DIR.'source/'.$this->getData(['page', $childKey, 'iconUrl']).'" style="height:'.$heightLogo.'px; width:auto;">';
|
||||
$itemsLeft .= $this->getData(['page', $childKey, 'shortTitle']);
|
||||
} else {
|
||||
$itemsLeft .= $this->getData(['page', $childKey, 'shortTitle']);
|
||||
|
@ -1900,8 +1891,7 @@ class common {
|
|||
}
|
||||
// Lien de connexion
|
||||
$itemsRight = '';
|
||||
$space1Menu = '<li id="menuSpace"> </li>';
|
||||
$space2Menu = '<li id="menuSpace"> </li>';
|
||||
$spaceMenu = '<li id="menuSpace"> </li>';
|
||||
if(
|
||||
(
|
||||
$this->getData(['theme', 'menu', 'loginLink'])
|
||||
|
@ -1909,7 +1899,7 @@ class common {
|
|||
)
|
||||
OR $this->getUrl(0) === 'theme'
|
||||
) {
|
||||
$itemsRight .= '<li id="menuLoginLink" ' .
|
||||
$itemsRight .= '<li ' .
|
||||
($this->getUrl(0) === 'theme' ? 'class="displayNone"' : 'class="smallScreenInline"') .
|
||||
'><a href="' . helper::baseUrl() . 'user/login/' .
|
||||
strip_tags(str_replace('/', '_', $this->getUrl())) .
|
||||
|
@ -1933,8 +1923,8 @@ class common {
|
|||
echo $this->showi18n();
|
||||
}
|
||||
echo '</ul>';
|
||||
if( $itemsRight === '') $space1Menu ='';
|
||||
echo '<ul class="navMain" id="menuLeft">' . $itemsLeft . $space1Menu . $itemsRight ;
|
||||
if( $itemsRight === '') $spaceMenu ='';
|
||||
echo '<ul class="navMain" id="menuLeft">' . $itemsLeft . $spaceMenu . $itemsRight ;
|
||||
if($this->getData(['config', 'i18n', 'enable']) === true) {
|
||||
$flagVisible = false;
|
||||
foreach (self::$i18nList as $key => $value) {
|
||||
|
@ -1943,7 +1933,7 @@ class common {
|
|||
continue;
|
||||
}
|
||||
}
|
||||
if( $itemsRight === '' && $flagVisible === true ) echo $space2Menu;
|
||||
if( $itemsRight === '' && $flagVisible === true ) echo $spaceMenu;
|
||||
if( $flagVisible === true) echo $this->showi18n();
|
||||
}
|
||||
echo '</ul></div></nav>';
|
||||
|
@ -2044,18 +2034,18 @@ class common {
|
|||
*/
|
||||
public function showMetaTitle() {
|
||||
echo '<title>' . $this->output['metaTitle'] . '</title>' . PHP_EOL;
|
||||
echo '<meta name="description" content="' . $this->output['metaDescription'] . '" />' . PHP_EOL;
|
||||
echo '<link rel="canonical" href="'. helper::baseUrl(true).$this->getUrl() .'" />' . PHP_EOL;
|
||||
echo '<meta name="description" content="' . $this->output['metaDescription'] . '">' . PHP_EOL;
|
||||
echo '<link rel="canonical" href="'. helper::baseUrl(true).$this->getUrl() .'">' . PHP_EOL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Affiche les balises meta property propres à Facebook
|
||||
*/
|
||||
public function showMetaPropertyFacebook() {
|
||||
echo '<meta property="og:title" content="' . $this->output['metaTitle'] . '" />' . PHP_EOL;
|
||||
echo '<meta property="og:description" content="' . $this->output['metaDescription'] . '" />' . PHP_EOL;
|
||||
echo '<meta property="og:type" content="website" />' . PHP_EOL;
|
||||
echo '<meta property="og:image" content="' . helper::baseUrl() .self::FILE_DIR.'source/screenshot.jpg" />' . PHP_EOL;
|
||||
echo '<meta property="og:title" content="' . $this->output['metaTitle'] . '">' . PHP_EOL;
|
||||
echo '<meta property="og:description" content="' . $this->output['metaDescription'] . '">' . PHP_EOL;
|
||||
echo '<meta property="og:type" content="website">' . PHP_EOL;
|
||||
echo '<meta property="og:image" content="' . helper::baseUrl() .self::FILE_DIR.'source/screenshot.jpg">' . PHP_EOL;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2235,7 +2225,7 @@ class common {
|
|||
if( $this->getUrl(0) !== 'theme' ){
|
||||
if( $this->getUrl(0) !== $this->getData(['locale', 'homePageId' ]) && $this->getData(['theme','header','homePageOnly']) === true) $homePageOnly = true;
|
||||
}
|
||||
$headerClass = ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone' : '';
|
||||
$headerClass = ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone ' : '';
|
||||
$headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : '';
|
||||
switch ($position){
|
||||
case 'body' :
|
||||
|
@ -2302,7 +2292,7 @@ class common {
|
|||
} else {
|
||||
$heightMod = $size[1] * ( $wclient / $size[0]);
|
||||
$replace = '<div class="swiper mySwiper" style="width: 100%; height:'.(int)$heightMod.'px">';
|
||||
}
|
||||
}
|
||||
$string = $this->getData(['theme','header','swiperContent']);
|
||||
$start = strpos( $string, '<div class="swiper mySwiper" style="');
|
||||
$end = strpos($string,'>', $start);
|
||||
|
@ -2450,7 +2440,7 @@ class common {
|
|||
}
|
||||
|
||||
echo '<li class="smallScreenInline">';
|
||||
echo '<a href="' . helper::baseUrl() . 'translate/i18n/' . $key . '/' . $this->getData(['config', 'i18n',$key]) . '/' . $this->getUrl(0) . '"><img ' . $select . ' alt="' . $value . '" src="' . helper::baseUrl(false) . 'core/vendor/i18n/png/' . $key . '.png"/></a>';
|
||||
echo '<a href="' . helper::baseUrl() . 'translate/i18n/' . $key . '/' . $this->getData(['config', 'i18n',$key]) . '/' . $this->getUrl(0) . '"><img ' . $select . ' alt="' . $value . '" src="' . helper::baseUrl(false) . 'core/vendor/i18n/png/' . $key . '.png"></a>';
|
||||
echo '</li>';
|
||||
}
|
||||
}
|
||||
|
@ -2621,6 +2611,9 @@ class core extends common {
|
|||
$css .= $this->getData(['theme', 'site', 'width']) === '75vw'
|
||||
? '.button, button{font-size:0.8em;}'
|
||||
: '';
|
||||
if( $this->getData([ 'theme', 'menu', 'burgerFixed']) === true) {
|
||||
$css .= '@media screen and (max-width: 799px) { #site.container { padding-top: 60px; } }';
|
||||
}
|
||||
$css .= '#site{background-color:' . $this->getData(['theme', 'site', 'backgroundColor']) . ';border-radius:' . $this->getData(['theme', 'site', 'radius']) . ';box-shadow:' . $this->getData(['theme', 'site', 'shadow']) . ' #212223;}';
|
||||
$colors = helper::colorVariants($this->getData(['theme', 'button', 'backgroundColor']));
|
||||
$css .= '.speechBubble,.button,.button:hover,button[type=\'submit\'],.pagination a,.pagination a:hover,input[type=\'checkbox\']:checked + label:before,input[type=\'radio\']:checked + label:before,.helpContent{background-color:' . $colors['normal'] . ';color:' . $colors['text'] . '}';
|
||||
|
|
|
@ -126,6 +126,24 @@ if ($this->getData(['core', 'dataVersion']) < 4407) {
|
|||
}
|
||||
if ($this->getData(['core', 'dataVersion']) < 4501) {
|
||||
// Mise à jour
|
||||
if( $this->getData(['theme', 'menu', 'burgerContent' ]) === 'logo') $this->setData(['theme', 'menu', 'burgerContent', 'oneIcon' ]);
|
||||
$this->setData(['theme', 'menu', 'burgerFixed', $this->getData(['theme', 'menu', 'fixed' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerBannerColor', $this->getData(['theme', 'menu', 'backgroundColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerIconBgColor', $this->getData(['theme', 'menu', 'backgroundColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerIconColor', $this->getData(['theme', 'menu', 'textColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerTextMenuColor', $this->getData(['theme', 'menu', 'textColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerActiveTextColor', $this->getData(['theme', 'menu', 'activeTextColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerBackgroundColor', $this->getData(['theme', 'menu', 'backgroundColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerBackgroundColorSub', $this->getData(['theme', 'menu', 'backgroundColorSub' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerActiveColorAuto', $this->getData(['theme', 'menu', 'activeColorAuto' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerActiveColor', $this->getData(['theme', 'menu', 'activeColor' ]) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerIconLink1', '' ]);
|
||||
$this->setData(['theme', 'menu', 'burgerIconLink2', '' ]);
|
||||
$this->setData(['theme', 'menu', 'burgerIcon1', $this->getData(['theme', 'menu','burgerLogo']) ]);
|
||||
$this->setData(['theme', 'menu', 'burgerIcon2', '' ]);
|
||||
$this->deleteData(['theme', 'menu', 'burgerLogo']);
|
||||
$this->deleteData(['theme', 'menu', 'heightLogo']);
|
||||
$this->deleteData(['theme', 'menu', 'widthLogo']);
|
||||
$this->setData(['core', 'dataVersion', 4501]);
|
||||
}
|
||||
?>
|
||||
|
|
|
@ -24,6 +24,10 @@ a:active {
|
|||
a.headertitle {
|
||||
display: block;
|
||||
}
|
||||
/* lien vers une page désactivée*/
|
||||
a.disabled-link{
|
||||
cursor:not-allowed;
|
||||
}
|
||||
/* Titres */
|
||||
h1 {
|
||||
font-size: 1.8em;
|
||||
|
@ -325,10 +329,6 @@ nav li ul li {
|
|||
nav .navSub a {
|
||||
text-align: left;
|
||||
}
|
||||
nav li:hover ul {
|
||||
z-index: 8;
|
||||
opacity: 1;
|
||||
}
|
||||
nav a {
|
||||
display: inherit;
|
||||
transition: background 0.3s ease-out;
|
||||
|
|
|
@ -87,7 +87,7 @@ else { echo '<html lang="'.$lang.'">'; }
|
|||
|
||||
// fin de la div main_screenshot et bouton screenshot
|
||||
if( isset($_SESSION['screenshot'] ) && $_SESSION['screenshot'] === 'on' ){ ?> </div><div><button id="screenshot" class="buttonScreenshot" type="button" >
|
||||
<img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"/></button></div> <?php }
|
||||
<img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"></button></div> <?php }
|
||||
|
||||
// Lien remonter en haut ?>
|
||||
<div id="backToTop"><?php echo template::ico('up'); ?></div>
|
||||
|
|
|
@ -24,6 +24,10 @@
|
|||
nav #menu {
|
||||
display: block;
|
||||
}
|
||||
nav li:hover ul {
|
||||
z-index: 8;
|
||||
opacity: 1;
|
||||
}
|
||||
/* Barre de navigation fixe quand le menu est en-dehors du site et fixe*/
|
||||
#navfixedlogout {
|
||||
position: sticky;
|
||||
|
@ -214,7 +218,8 @@
|
|||
display: none;
|
||||
text-align: left;
|
||||
width: 100%;
|
||||
height: 80vh;
|
||||
height: auto;
|
||||
max-height: 80vh;
|
||||
float: left;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
|
@ -239,7 +244,8 @@
|
|||
width:100%;
|
||||
}
|
||||
.navfixedburgerconnected #menu, .navburgerconnected #menu{
|
||||
height: 60vh;
|
||||
height: auto;
|
||||
max-height: 60vh;
|
||||
}
|
||||
.navfixedburgerconnected #menu a, .navfixedburgerlogout #menu a{
|
||||
padding: 10px 10px;
|
||||
|
@ -252,6 +258,9 @@
|
|||
font-size: 1.5em;
|
||||
}
|
||||
/* Position du bloc dans le site sur les petits écrans */
|
||||
nav ul li span.zwiico-margin-left{
|
||||
padding-left: 30px;
|
||||
}
|
||||
.smallScreenFlags {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
|
|
|
@ -1068,7 +1068,7 @@ class theme extends common {
|
|||
$swiperContent .= '<div id="headerSwiper"><div class="swiper mySwiper"><div class="swiper-wrapper">';
|
||||
}
|
||||
foreach($imageFile as $value ) {
|
||||
$swiperContent .= '<div class="swiper-slide"><img src="'.$value.'" /></div>';
|
||||
$swiperContent .= '<div class="swiper-slide"><img src="'.$value.'" ></div>';
|
||||
}
|
||||
$swiperContent .= '</div></div></div>';
|
||||
$swiperContent .= '<script> var swiperBanner = new Swiper(".mySwiper", { ';
|
||||
|
|
Loading…
Reference in New Issue