Item1208: add literal html submenu type to allow interesting variatio…

…ns - a menu containing text or even images.. git-svn-id: http://svn.foswiki.org/trunk/YuiMenuContrib@2894 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Mar 6, 2009 · 16e4efa · 16e4efa
1 parent f63e099
commit 16e4efa
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/data/System/YuiMenuContrib.txt b/data/System/YuiMenuContrib.txt
@@ -77,11 +77,12 @@ fall back to the default in this topic
        format="$percntINCLUDE{
                             $quot%WEB%.%TOPIC%$quot
                             MENUWEB=$quot%MENUWEB%$quot
-                            MENUTOPIC=$quot$pattern(\|\s*([^\|\s]*)\s*\|.*)$quot
-                            MENULABEL=$quot$pattern(\|\s*[^\|\s]*\s*\|\s*([^\|]*)\s*\|.*)$quot
-                            section=$quot$pattern(\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*([^\|\s]*)\s*\|.*)$quot
-                            SUBMENUWEB=$quot$pattern(\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*[^\|\s]*\s*\|\s*([^\|\s]*)\.[^.]*\s*\|.*)$quot
-                            SUBMENUTOPIC=$quot$pattern(\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*[^\|\s]*\s*\|\s*[^.]*\.([^\|\s]*)\s*\|.*)$quot
+                            MENUTOPIC=$quot$pattern(^\|\s*([^\|\s]*)\s*\|.*)$quot
+                            MENULABEL=$quot$pattern(^\|\s*[^\|\s]*\s*\|\s*([^\|]*)\s*\|.*)$quot
+                            section=$quot$pattern(^\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*([^\|\s]*)\s*\|.*)$quot
+                            EXTRA=$quot$pattern(^\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*[^\|\s]*\s*\|([^\|]*)\|.*)$quot
+                            SUBMENUWEB=$quot$pattern(^\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*[^\|\s]*\s*\|\s*([^\|\s]*)\.[^.]*\s*\|.*)$quot
+                            SUBMENUTOPIC=$quot$pattern(^\|\s*[^\|]*\s*\|\s*[^\|]*\s*\|\s*[^\|\s]*\s*\|\s*[^.]*\.([^\|\s]*)\s*\|.*)$quot
                         }$percnt"
 }% %IF{"'%MENUWEB%.%MENUTOPIC%' allows 'EDIT'" then="<li>[[%MENUWEB%.%MENUTOPIC%][edit menu]]</li>"}%
 </ul>%ENDSECTION{"webmenu-builder"}%
@@ -95,6 +96,9 @@ fall back to the default in this topic
             MENUTOPIC="%SUBMENUTOPIC%"
             }% </div></div>
 </li>%ENDSECTION{"submenu"}%
+%STARTSECTION{"html"}%<li>[[%MENUTOPIC%][%MENULABEL%]]
+            <div class='yuimenu'><div class='bd'> %EXTRA% </div></div>
+</li>%ENDSECTION{"html"}%
 
 ****TODO: edit link should be used to create custom menu if there is no WebMenu topic, using the default one as a template.
 %STARTSECTION{"webmenu-builder-default"}%<ul>