Changeset 2928:0471a74f04ed

Timestamp:

01/26/15 13:44:21 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add item description option, closes #2060

Files:

• locales/fr/plugins.po (modified) (1 diff)
• plugins/simpleMenu/_public.php (modified) (4 diffs)
• plugins/simpleMenu/_widgets.php (modified) (2 diffs)

locales/fr/plugins.po

@@ -1884 +1884 @@
 msgstr "Aucun item de menu pour l'instant."
 
+msgid "Item description"
+msgstr "Description des items de menu"
+
+msgid "Displayed in link"
+msgstr "Affichée dans le lien"
+
+msgid "Used as link title"
+msgstr "Utilisée comme titre du lien"
+
+msgid "Displayed in link and used as title"
+msgstr "Affichée dans le lien et utilisée comme titre"
+
+msgid "Not displayed nor used"
+msgstr "Ignorée"
+
 msgid "Add tags"
 msgstr "Ajouter des mots-clés"

plugins/simpleMenu/_public.php

@@ -31 +31 @@
           $description = isset($attr['description']) ? trim($attr['description']) : '';
 
-          if (!preg_match('#^(title|span)$#',$description)) {
+          if (!preg_match('#^(title|span|both|none)$#',$description)) {
                $description = '';
           }
@@ -47 +47 @@
           global $core, $_ctx;
 
+          $descr_type = array(0 => 'span',1 => 'title',2 => 'both',3 => 'none');
+
           if (!(boolean) $core->blog->settings->system->simpleMenu_active)
                return;
@@ -58 +60 @@
           }
 
-          $menu = tplSimpleMenu::displayMenu('','','title');
+          $description = 'title';
+          if (isset($descr_type[$w->description])) {
+               $description = $descr_type[$w->description];
+          }
+          $menu = tplSimpleMenu::displayMenu('','',$description);
           if ($menu == '') {
                return;
@@ -107 +113 @@
                     $title = $span = '';
                     if ($m['descr']) {
-                         if ($description == 'title') {
+                         if ($description == 'title' || $description == 'both') {
                               $title = ' title="'.html::escapeHTML(__($m['descr'])).'"';
-                         } else {
+                         }
+                         if ($description == 'span' || $description == 'both') {
                               $span = ' <span>'.html::escapeHTML(__($m['descr'])).'</span>';
                          }

plugins/simpleMenu/_widgets.php

@@ -20 +20 @@
           $w->create('simplemenu',__('Simple menu'),array('tplSimpleMenu','simpleMenuWidget'),null,'List of simple menu items');
           $w->simplemenu->setting('title',__('Title (optional)').' :',__('Menu'));
+          $w->simplemenu->setting('description',__('Item description'),0,'combo',
+               array(
+                    __('Displayed in link') => 0,                     // span
+                    __('Used as link title') => 1,                         // title
+                    __('Displayed in link and used as title') => 2,   // both
+                    __('Not displayed nor used') => 3                 // none
+                    )
+               );
           $w->simplemenu->setting('homeonly',__('Display on:'),0,'combo',
                array(
@@ -26 +34 @@
                     __('Except on home page') => 2
                     )
-          );
+               );
           $w->simplemenu->setting('content_only',__('Content only'),0,'check');
           $w->simplemenu->setting('class',__('CSS class:'),'');