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

Merge branch '12300' into 12400

This commit is contained in:
Fred Tempez 2023-03-11 18:49:40 +01:00
parent a3ceda9653 1c954b0e9e
commit 26ad49dd85
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/class/layout.class.php
View File

@ -1016,7 +1016,10 @@ class layout extends common
} }
} }
if ($this->getUser('group') >= self::GROUP_MODERATOR) { if ($this->getUser('group') >= self::GROUP_MODERATOR) {
$rightItems .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id') . '/' . $_SESSION['csrf'] . '" data-tippy-content="Configurer mon compte">' . template::ico('user', ['margin' => 'right']) . '<span id="displayUsername">' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') . '</span></a></li>'; $rightItems .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id') . '/' . $_SESSION['csrf'] .
'" data-tippy-content="'. helper::translate('Configurer mon compte') . '">' .
template::ico('user', ['margin' => 'right']) . '<span id="displayUsername">' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') .
'</span></a></li>';
} }
$rightItems .= '<li>' . template::ico('logout', [ $rightItems .= '<li>' . template::ico('logout', [
'help' => 'Déconnecter', 'help' => 'Déconnecter',

2
core/module/page/view/edit/edit.php
View File

@ -148,7 +148,7 @@
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::select('pageEditExtraPosition', $module::$extraPosition, [ <?php echo template::select('pageEditExtraPosition', $module::$extraPosition, [
'label' => 'Emplacement :', 'label' => 'Emplacement',
'selected' => $this->getData(['page', $this->getUrl(2), 'extraPosition']), 'selected' => $this->getData(['page', $this->getUrl(2), 'extraPosition']),
'help' => 'Le menu accessoire est aligné à droite de la barre de menu, c\'est un emplacement réservé aux drapeaux et au bouton de connexion.' 'help' => 'Le menu accessoire est aligné à droite de la barre de menu, c\'est un emplacement réservé aux drapeaux et au bouton de connexion.'
]); ?> ]); ?>

2
core/module/plugin/view/item/item.php
View File

@ -35,7 +35,7 @@
<div class="row"> <div class="row">
<div class="col12 textAlignCenter"> <div class="col12 textAlignCenter">
<span> <span>
<?php echo helper::translate('Licence :'); ?> <?php echo helper::translate('Licence'); ?>
&nbsp; &nbsp;
<?php echo $module::$storeItem['fileLicense']; ?> <?php echo $module::$storeItem['fileLicense']; ?>
</span> </span>

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

@ -167,7 +167,7 @@
- -
<?php echo helper::translate('Largeur de l\'image :'); ?> <span id="themeHeaderImageHeight"></span> <?php echo helper::translate('Largeur de l\'image :'); ?> <span id="themeHeaderImageHeight"></span>
- -
<?php echo helper::translate('Ratio :'); ?> <span id="themeHeaderImageRatio"></span> <?php echo helper::translate('Ratio'); ?> <span id="themeHeaderImageRatio"></span>
</span> </span>
</div> </div>
</div> </div>