From cb2a7f49970a9774569a9b63f990a362e25b4f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Sat, 27 Aug 2022 10:17:43 +0200 Subject: [PATCH] dev004 template ico --- core/class/template.class.php | 17 ++++++++++++----- core/core.php | 12 ++++++------ core/layout/main.php | 8 ++++---- core/module/config/view/connect/connect.php | 4 ++-- core/module/config/view/locale/locale.php | 8 ++++---- core/module/config/view/network/network.php | 4 ++-- core/module/config/view/setup/setup.php | 8 ++++---- core/module/config/view/social/social.php | 4 ++-- core/module/install/view/update/update.php | 6 +++--- core/module/page/view/edit/edit.php | 10 +++++----- 10 files changed, 44 insertions(+), 37 deletions(-) diff --git a/core/class/template.class.php b/core/class/template.class.php index a629247b..d18b2d62 100644 --- a/core/class/template.class.php +++ b/core/class/template.class.php @@ -30,7 +30,7 @@ class template { $attributes['class'], $attributes['uniqueSubmission'] ? 'uniqueSubmission' : '', $attributes['help'] ? ' title="' . $attributes['help'] . '" ': '', - ($attributes['ico'] ? template::ico($attributes['ico'], 'right') : '') . $attributes['value'] + ($attributes['ico'] ? template::ico($attributes['ico'], ['margin' => 'right']) : '') . $attributes['value'] ); } @@ -334,7 +334,7 @@ class template { %s data-lity > - ' . self::ico('upload', 'right') . ' + ' . self::ico('upload', ['margin' => 'right']) . ' ', $attributes['class'], @@ -423,7 +423,14 @@ class template { * @param string $fontSize Taille de la police * @return string */ - public static function ico($ico, $margin = '', $animate = false, $fontSize = '1em') { + // public static function ico($ico, $margin = '', $animate = false, $fontSize = '1em') { + public static function ico($ico, array $attributes = []) { + // Attributs par défaut + $attributes = array_merge([ + 'margin' => '', + 'animate' => false, + 'fontSize' => '1em' + ], $attributes); return ''; } @@ -674,7 +681,7 @@ class template { * @return string */ public static function speech($text) { - return '
' . $text . '
' . template::ico('mimi speechMimi', '', false, '7em') . '
'; + return '
' . $text . '
' . template::ico('mimi speechMimi', ['fontSize'=> '7em']) . '
'; } /** @@ -700,7 +707,7 @@ class template { $attributes['class'], $attributes['uniqueSubmission'] ? 'uniqueSubmission' : '', helper::sprintAttributes($attributes, ['class', 'ico', 'value']), - ($attributes['ico'] ? template::ico($attributes['ico'], 'right') : '') . $attributes['value'] + ($attributes['ico'] ? template::ico($attributes['ico'], ['margin' => 'right']) : '') . $attributes['value'] ); } diff --git a/core/core.php b/core/core.php index 68c93535..7cd68115 100644 --- a/core/core.php +++ b/core/core.php @@ -47,7 +47,7 @@ class common { // Numéro de version const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; - const ZWII_VERSION = '11.6.00-dev003'; + const ZWII_VERSION = '11.6.00-dev004'; const ZWII_UPDATE_CHANNEL = "test"; public static $actions = []; @@ -1532,9 +1532,9 @@ class common { ) { $items .= 'getData(['theme','footer','displaymemberAccount']) === false ? ' class="displayNone"' : ''; - $items .= '> | ' . template::ico('user', 'all') . ''; + $items .= '> | ' . template::ico('user', ['margin' => 'all']) . ''; if( $this->getData(['user', $this->getUser('id') , 'files']) === true) $items .= '' . template::ico('folder') . ''; - $items .= '' . template::ico('logout','left') . ''; + $items .= '' . template::ico('logout',['margin' => 'left']) . ''; $items .= ''; } // Fermeture du bloc copyright @@ -1649,7 +1649,7 @@ class common { && $this->getData(['theme','menu','memberBar']) === true ) { if( $this->getData(['user', $this->getUser('id') , 'files']) === true) $itemsRight .= '
  • ' . template::ico('folder') . '
    • '; - $itemsRight .= '
  • ' . template::ico('user', 'right') . '
    • '; + $itemsRight .= '
  • ' . template::ico('user', ['margin' => 'right']) . '
    • '; $itemsRight .= '
  • ' . template::ico('logout') . '
    • '; } // Retourne les items du menu @@ -1731,7 +1731,7 @@ class common { } if($childrenPageIds && $disableChild !== $totalChild && $this->getdata(['page',$parentPageId,'hideMenuChildren']) === false) { - $items .= template::ico('down', 'left'); + $items .= template::ico('down', ['margin' => 'left']); } // ------------------------------------------------ $items .= ''; @@ -2071,7 +2071,7 @@ class common { } } if($this->getUser('group') >= self::GROUP_MODERATOR) { - $rightItems .= '
  • ' . template::ico('user', 'right') . '' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') . '
    • '; + $rightItems .= '
  • ' . template::ico('user', ['margin' => 'right']) . '' . $this->getUser('firstname') . ' ' . $this->getUser('lastname') . '
    • '; } $rightItems .= '
  • ' . template::ico('logout') . '
    • '; // Barre de membre diff --git a/core/layout/main.php b/core/layout/main.php index a56471a6..181bb7d0 100644 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -51,7 +51,7 @@
    getData(['theme','menu','burgerContent']) === 'title' ? '
    ' . $this->getData(['locale', 'title']) . '
    ' : '' ;?> getData(['theme','menu','burgerContent']) === 'logo' ? '' : '' ;?> -
    + '2em']); ?> getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"' : 'class="container"'; @@ -98,7 +98,7 @@
    getData(['theme','menu','burgerContent']) === 'title' ? '
    ' . $this->getData(['locale', 'title']) . '
    ' : '' ;?> getData(['theme','menu','burgerContent']) === 'logo' ? '' : '' ;?> -
    + '2em']); ?> getData(['theme', 'menu', 'wide']) === 'none' ? 'class="container-large"' : 'class="container"'; @@ -116,7 +116,7 @@
    getData(['theme','menu','burgerContent']) === 'title' ? '
    ' . $this->getData(['locale', 'title']) . '
    ' : '' ;?> getData(['theme','menu','burgerContent']) === 'logo' ? '' : '' ;?> -
    + '2em']); ?> @@ -167,7 +167,7 @@
    getData(['theme','menu','burgerContent']) === 'title' ? '
    ' . $this->getData(['locale', 'title']) . '
    ' : '' ;?> getData(['theme','menu','burgerContent']) === 'logo' ? '' : '' ;?> -
    + '2em']); ?> diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php index 7ce76e76..31794ba7 100644 --- a/core/module/config/view/connect/connect.php +++ b/core/module/config/view/connect/connect.php @@ -5,7 +5,7 @@

    Sécurité de la connexion - + 'left']);?>

    @@ -93,7 +93,7 @@

    Journalisation - + 'left']);?>

    diff --git a/core/module/config/view/locale/locale.php b/core/module/config/view/locale/locale.php index a1f1bf46..d95ea1a7 100644 --- a/core/module/config/view/locale/locale.php +++ b/core/module/config/view/locale/locale.php @@ -20,7 +20,7 @@

    Identité du site - + 'left']);?>

    @@ -51,7 +51,7 @@

    Assignation des pages spéciales - + 'left']);?>

    @@ -111,7 +111,7 @@

    Etiquettes des pages spéciales - + 'left']);?>

    @@ -156,7 +156,7 @@

    Message d'acceptation des Cookies - + 'left']);?>

    diff --git a/core/module/config/view/network/network.php b/core/module/config/view/network/network.php index dc29f568..ec4015e7 100644 --- a/core/module/config/view/network/network.php +++ b/core/module/config/view/network/network.php @@ -5,7 +5,7 @@

    Paramètres - + 'left']);?>

    @@ -40,7 +40,7 @@

    SMTP - + 'left']);?>

    diff --git a/core/module/config/view/setup/setup.php b/core/module/config/view/setup/setup.php index 4da0db3b..1d6445c2 100644 --- a/core/module/config/view/setup/setup.php +++ b/core/module/config/view/setup/setup.php @@ -5,7 +5,7 @@

    Paramètres - + 'left']);?>

    @@ -58,7 +58,7 @@

    Mise à jour automatisée - + 'left']);?>

    @@ -102,7 +102,7 @@

    Maintenance - + 'left']);?>

    @@ -161,7 +161,7 @@

    Scripts externes - + 'left']);?>

    diff --git a/core/module/config/view/social/social.php b/core/module/config/view/social/social.php index d09b2b51..72364d08 100644 --- a/core/module/config/view/social/social.php +++ b/core/module/config/view/social/social.php @@ -5,7 +5,7 @@

    Paramètres - + 'left']);?>

    @@ -54,7 +54,7 @@

    Réseaux sociaux - + 'left']);?>

    diff --git a/core/module/install/view/update/update.php b/core/module/install/view/update/update.php index b5f1771b..42463067 100644 --- a/core/module/install/view/update/update.php +++ b/core/module/install/view/update/update.php @@ -3,18 +3,18 @@
    - + true]); ?> 1/4 : Préparation... 2/4 : Téléchargement... 3/4 : Installation... 4/4 : Configuration...
    - + Une erreur est survenue lors de l'étape : .
    - + Mise à jour terminée avec succès.
    diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index 12bbfce0..04bca720 100644 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -70,7 +70,7 @@

    Titres - + 'left']);?>

    @@ -122,7 +122,7 @@

    Emplacement dans le menu - + 'left']);?>

    @@ -177,7 +177,7 @@

    Options avancées - + 'left']);?>

    @@ -287,7 +287,7 @@

    Mise en page - + 'left']);?>

    @@ -346,7 +346,7 @@

    Permission et référencement - + 'left']);?>