Changeset 2635

Timestamp:

02/10/10 14:35:01 (2 years ago)

Author:

erikroos

Message:

Removed check on menu position, as this brought back the extra submenu column again...

File:

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

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

@@ -17 +17 @@
         </td>
         <td valign="top" width="100%">
-                <#if screen.getSelected().getViewName() == "MenuView" && screen.getSelected().position == "TOP_LEFT" >
+                <#if screen.getSelected().getViewName() == "MenuView" >
                         <@layout screen.getSelected().getSelected() />
                 <#else>
@@ -45 +45 @@
 <#--fixme multiple nestings-->
 <#assign subscreen = screen.getSelected()/>
-<#if subscreen.getViewName()  == "MenuScreen"  && (subscreen.position == "TOP_LEFT" || subscreen.position == "TOP_RIGHT" || subscreen.position == "DEFAULT")>
+<#if subscreen.getViewName() == "MenuView"  && (subscreen.position == "TOP_LEFT" || subscreen.position == "TOP_RIGHT" || subscreen.position == "DEFAULT")>
 <div class="formscreen">
 <div class="form_header" id="${screen.getName()}">
@@ -72 +72 @@
 <#function MenuScreenLeftSelectedItem screen>
         <#assign selectedItem = screen.getSelected()/>
-        <#if selectedItem.getClass().getSuperclass().getSimpleName() == "MenuScreen">
+        <#if selectedItem.getClass().getSuperclass().getSimpleName() == "MenuView">
                 <#return selectedItem.getSelected()>
         <#else>
@@ -84 +84 @@
                 <#assign __target = screen.getName() />
                 <#assign select = item.getName() />
-                <#if submenu == "true" && item.getParent().getClass().getSuperclass().getSimpleName() == "FormScreen" && item.getClass().getSuperclass().getSimpleName() == "MenuScreen">
+                <#if submenu == "true" && item.getParent().getClass().getSuperclass().getSimpleName() == "FormView" && item.getClass().getSuperclass().getSimpleName() == "MenuView">
                         <#--if the item is a menu but the parent is a form then do not render as submenu-->
                 <#elseif item == selectedItem>
@@ -104 +104 @@
 <#function hasParentForm screen>
         <#if screen.getParent()?exists>
-                <#if screen.getParent().getClass().getSuperclass().getSimpleName() != "MenuScreen">
+                <#if screen.getParent().getClass().getSuperclass().getSimpleName() != "MenuView">
                         <#return true/>
                 <#else>