- based on test_menu by grum (thanks to you) - integration of dynamic menu bar to pwg

- the menubar is composed now of dynamic blocks that can be ordered/hidden
- plugins can add their own blocks 


git-svn-id: http://piwigo.org/svn/trunk@2488 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 14 insertions, 16 deletions

diff --git a/plugins/AMenuManager/menu_templates/menubar_links.tpl b/plugins/AMenuManager/menu_templates/menubar_links.tpl
index 927a0f2cd..205e3b66e 100644
--- a/plugins/AMenuManager/menu_templates/menubar_links.tpl
+++ b/plugins/AMenuManager/menu_templates/menubar_links.tpl
@@ -1,13 +1,13 @@
 
 <!-- links menu bar -->
-{if $section.NAME!=""}
-  <dt>{$section.NAME|@translate}</dt>
+{if $block->get_title() !="" }
+  <dt>{$block->get_title()}</dt>
 {/if}
 <dd>
-  <ul {if $section.ITEMS.icons=='y'}style="padding-left:4px;list-style:none;"{/if}>
-    {foreach from=$section.ITEMS.LINKS item=link}
+  <ul {if $block->data.icons=='y'}style="padding-left:4px;list-style:none;"{/if}>
+    {foreach from=$block->data.LINKS item=link}
       <li>
-        {if $section.ITEMS.icons=='y'}<img src='{$link.icon}' style="position:relative;top:3px;"/>{/if}
+        {if $block->data.icons=='y'}<img src='{$link.icon}' style="position:relative;top:3px;"/>{/if}
         <a href="{$link.url}"
           {if $link.mode == 0} target = '_blank' {/if}>{$link.label}</a>
       </li>
diff --git a/plugins/AMenuManager/menu_templates/menubar_personalised.tpl b/plugins/AMenuManager/menu_templates/menubar_personalised.tpl
index 93c3b860b..9fada74a2 100644
--- a/plugins/AMenuManager/menu_templates/menubar_personalised.tpl
+++ b/plugins/AMenuManager/menu_templates/menubar_personalised.tpl
@@ -1,8 +1,8 @@
 
 <!-- personalised menu bar -->
-{if $section.NAME!=""}
-  <dt>{$section.NAME|@translate}</dt>
+{if $block->get_title() !="" }
+  <dt>{$block->get_title()}</dt>
 {/if}
 <dd>
-    {if $section.ITEMS.CONTENT!=""}{$section.ITEMS.CONTENT}{/if}
+    {$block->data}
 </dd>
\ No newline at end of file
diff --git a/plugins/AMenuManager/menu_templates/menubar_randompic.tpl b/plugins/AMenuManager/menu_templates/menubar_randompic.tpl
index a79206103..20d7a0bf8 100644
--- a/plugins/AMenuManager/menu_templates/menubar_randompic.tpl
+++ b/plugins/AMenuManager/menu_templates/menubar_randompic.tpl
@@ -1,14 +1,12 @@
 
 <!-- random picture menu bar -->
-{if $section.NAME!=""}
-  <dt>{$section.NAME|@translate}</dt>
-{/if}
+<dt>{$block->get_title()}</dt>
 <dd>
   <div class="illustration" style="text-align:center;padding:5px;font-size:85%;">
-    {if $section.ITEMS.IMGNAME!="" and $section.ITEMS.SHOWNAME=="o"}{$section.ITEMS.IMGNAME}<br/>{/if}
-    {if $section.ITEMS.IMGCOMMENT!="" and $section.ITEMS.SHOWCOMMENT=="o"}{$section.ITEMS.IMGCOMMENT}<br/>{/if}
-    <a href="{$section.ITEMS.LINK}"><img src="{$section.ITEMS.IMG}"/></a>
-    {if $section.ITEMS.IMGNAME!="" and $section.ITEMS.SHOWNAME=="u"}<br/>{$section.ITEMS.IMGNAME}{/if}
-    {if $section.ITEMS.IMGCOMMENT!="" and $section.ITEMS.SHOWCOMMENT=="u"}<br/>{$section.ITEMS.IMGCOMMENT}{/if}
+    {if $block->data.IMGNAME!="" and $block->data.SHOWNAME=="o"}{$block->data.IMGNAME}<br/>{/if}
+    {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="o"}{$block->data.IMGCOMMENT}<br/>{/if}
+    <a href="{$block->data.LINK}"><img src="{$block->data.IMG}"/></a>
+    {if $block->data.IMGNAME!="" and $block->data.SHOWNAME=="u"}<br/>{$block->data.IMGNAME}{/if}
+    {if $block->data.IMGCOMMENT!="" and $block->data.SHOWCOMMENT=="u"}<br/>{$block->data.IMGCOMMENT}{/if}
   </div>
 </dd>
\ No newline at end of file