From 85346e2548549657175c5594c6a8d7b60e3a2e37 Mon Sep 17 00:00:00 2001
From: cappadona <cappadona@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 26 Jul 2011 18:44:05 +0000
Subject: [PATCH] NIHVIVO-3058 Merged r8848 and r8849 from maint-rel-vivo-1.3
 branch.

---
 .../body/individual/individual-menu.ftl       | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
index ae45c03d7..deb6c38dc 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
@@ -4,42 +4,46 @@
 
 <#include "individual-setup.ftl">
 
-<script type="text/javascript">
-    var menuItemData = [];
-</script>
-
-<h3>Menu management</h3>
-
 <#assign hasElement = propertyGroups.pullProperty("${namespaces.display}hasElement")!>
 
-<#-- List the menu items -->
-<ul class="menuItems">
-    <#list hasElement.statements as statement>
-        <li class="menuItem"><#include "${hasElement.template}"> <span class="controls"><@p.editingLinks "hasElement" statement editable /></span></li>
-    </#list>
-</ul>
-
-<#-- Link to add a new menu item -->
-<#if editable>
-    <#assign addUrl = hasElement.addUrl>
-    <#if addUrl?has_content>
-        <a class="add-hasElement green button" href="${addUrl}" title="Add new menu item">Add menu item</a>
+<#if hasElement?has_content>
+    <script type="text/javascript">
+        var menuItemData = [];
+    </script>
+    
+    <h3>Menu management</h3>
+    
+    <#-- List the menu items -->
+    <ul class="menuItems">
+        <#list hasElement.statements as statement>
+            <li class="menuItem"><#include "${hasElement.template}"> <span class="controls"><@p.editingLinks "hasElement" statement editable /></span></li>
+        </#list>
+    </ul>
+    
+    <#-- Link to add a new menu item -->
+    <#if editable>
+        <#assign addUrl = hasElement.addUrl>
+        <#if addUrl?has_content>
+            <a class="add-hasElement green button" href="${addUrl}" title="Add new menu item">Add menu item</a>
+        </#if>
     </#if>
-</#if>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
-                  '<link rel="stylesheet" href="${urls.base}/css/individual/menuManagement.css" />')}
-
-${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
-
-<#assign positionPredicate = "${namespaces.display}menuPosition" />
-
-<script type="text/javascript">
-    // <#-- We need the controller to provide ${reorderUrl}. This is where ajax request will be sent on drag-n-drop events. -->
-    var menuManagementData = {
-        reorderUrl: '${reorderUrl}',
-        positionPredicate: '${positionPredicate}'
-    };
-</script>
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/menuManagement.js"></script>')}
\ No newline at end of file
+    
+    ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
+                      '<link rel="stylesheet" href="${urls.base}/css/individual/menuManagement.css" />')}
+                      
+    ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
+    
+    <#assign positionPredicate = "${namespaces.display}menuPosition" />
+    
+    <script type="text/javascript">
+        // <#-- We need the controller to provide ${reorderUrl}. This is where ajax request will be sent on drag-n-drop events. -->
+        var menuManagementData = {
+            reorderUrl: '${reorderUrl}',
+            positionPredicate: '${positionPredicate}'
+        };
+    </script>
+    
+    ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/menuManagement.js"></script>')}
+<#else>
+    <p id="error-alert">There was an error in the system. The display:hasElement property could not be retrieved.</p>
+</#if>
\ No newline at end of file