Changeset 2634

Timestamp:

02/10/10 11:50:03 (2 years ago)

Author:

erikroos

Message:

Fixed nesting of submenus in left menu bar: they're in the same column again.
To do: now works for only one layer deep. Fix for any number of nestings.

File:

• molgenis/3.3/src/org/molgenis/framework/ui/MenuView.ftl (modified) (4 diffs)

molgenis/3.3/src/org/molgenis/framework/ui/MenuView.ftl

@@ -5 +5 @@
 <#--nested menus are automatically merged-->
 <#--difficulty is nested menus, then the information should show the selection of subform-->
+
 <table class="leftNavigation">
         <td>
@@ -16 +17 @@
         </td>
         <td valign="top" width="100%">
-                        <@layout MenuScreenLeftSelectedItem(screen)/>
+                <#if screen.getSelected().getViewName() == "MenuView" && screen.getSelected().position == "TOP_LEFT" >
+                        <@layout screen.getSelected().getSelected() />
+                <#else>
+                        <@layout screen.getSelected() />
+                </#if>
         </td>
 </table>
+
 <#elseif screen.position == "TOP_LEFT" || screen.position == "TOP_RIGHT" || (screen.position == "DEFAULT" && hasParentForm(screen))>
 <#--tabs on top-->
+
 <div id="${screen.getName()}" class="menuscreen" <#if screen.position == "TOP_RIGHT">align="right"</#if>>
         <form name="${screen.getName()}" method="get">
@@ -58 +65 @@
         <@layout screen.getSelected() />
 </#if>
+
 </#if>
 </#macro>
@@ -85 +93 @@
                         <#if item.getChildren()?size &gt; 1>
 <div class="leftNavigationSubmenu">
-                                <#if selectedItem.getClass().getSuperclass().getSimpleName() == "MenuScreen" && (screen.position == "LEFT" || screen.position == "DEFAULT")>
                                 <@MenuScreenLeft name=name screen=item submenu="true" />
-                                </#if>
 </div>
                         </#if>