From cb99134a1deae88ae6accc09368a0b13db36c48b Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 17 Nov 2011 19:01:04 +0000
Subject: [PATCH] NIHVIVO-3335: Relocated RDF link for individual pages under
 popup for sharing URI profile

---
 webapp/web/js/individual/menuManagement.js    | 18 ++++++++++++++--
 .../body/individual/individual-vitro.ftl      | 21 ++++++++-----------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/webapp/web/js/individual/menuManagement.js b/webapp/web/js/individual/menuManagement.js
index ba513a301..5572ef7ce 100644
--- a/webapp/web/js/individual/menuManagement.js
+++ b/webapp/web/js/individual/menuManagement.js
@@ -32,8 +32,18 @@ var menuManagement = {
         
         menuItems.attr('title', 'Drag and drop to reorder menu items');
         
+        
+        
+           /*$("#loading").ajaxStart(function(){
+               $(this).show();
+             });
+             $("#loading").ajaxStop(function(){
+                $(this).hide();
+              });*/
+
+        
         this.menuItemsList.sortable({
-            cursor: 'move',
+            cursor: 'move',				
             update: function(event, ui) {
                 menuManagement.reorderMenuItems(event, ui);
             }
@@ -45,6 +55,9 @@ var menuManagement = {
         var menuItems = $('li.menuItem').map(function(index, el) {
             return $(this).data('menuItemUri');
         }).get();
+        
+        
+     
 
         $.ajax({
             url: menuManagement.reorderUrl,
@@ -61,7 +74,8 @@ var menuManagement = {
                     pos = index + 1;
                     // Set the new position for this element. The only function of this value 
                     // is so we can reset an element to its original position in case reordering fails.
-                    menuManagement.setPosition(this, pos);                
+                    menuManagement.setPosition(this, pos);  
+          
                 });      
             },
             error: function(request, status, error) {
diff --git a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
index 9196684fd..fa2ae5655 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
@@ -32,21 +32,10 @@
                     <@p.label individual editable />
                         
                     <#--  Most-specific types -->
-                    <@p.mostSpecificTypes individual />
+                    <@p.mostSpecificTypes individual /><img id="uriIcon" title="${individual.uri}" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon"/>
                 </h1>
             </#if>
         </header>
-        
-        <nav role="navigation">
-            <ul id ="individual-tools" role="list">
-                <li role="listitem"><img id="uriIcon" title="${individual.uri}" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon"/></li>
-                
-                <#assign rdfUrl = individual.rdfUrl>
-                <#if rdfUrl??>
-                    <li role="listitem"><a title="View this individual in RDF format" class="icon-rdf" href="${rdfUrl}">RDF</a></li>
-                </#if>
-            </ul>
-        </nav>
                 
     <#if individualProductExtension??>
         ${individualProductExtension}
@@ -63,6 +52,14 @@
 <#-- Ontology properties -->
 <#include "individual-properties.ftl">
 
+<#assign rdfUrl = individual.rdfUrl>
+
+<#if rdfUrl??>
+    <script>
+        var individualRdfUrl = '${rdfUrl}';
+    </script>
+</#if>
+
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />')}
 
 ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>',