From 1beb26c1a611fa64946e416fa41fcb799a92b6f2 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 17 Nov 2011 19:01:28 +0000
Subject: [PATCH] NIHVIVO-3335: Relocated RDF link for individual pages under
 popup for sharing URI profile

---
 productMods/js/individual/individualUtils.js  |  6 +++---
 .../individual/individual--foaf-person.ftl    | 19 ++++++++++++-------
 themes/wilma/css/wilma.css                    |  4 ++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/productMods/js/individual/individualUtils.js b/productMods/js/individual/individualUtils.js
index a1e5e566..5c2d9b8c 100644
--- a/productMods/js/individual/individualUtils.js
+++ b/productMods/js/individual/individualUtils.js
@@ -108,7 +108,7 @@ $(document).ready(function(){
         {
             content: {
                 prerender: true, // We need this for the .click() event listener on 'a.close'
-                text: '<h5>share the URI for this profile</h5> <input id="uriLink" type="text" value="' + $('#uriIcon').attr('title') + '" /> <a class="close" href="#">close</a>'
+                text: '<h5>share the URI for this profile</h5> <input id="uriLink" type="text" value="' + $('#uriIcon').attr('title') + '" /><h5><a class ="rdf-url" href="' + individualRdfUrl + '">view profile in RDF format</a></h5><a class="close" href="#">close</a>'
             },
             position: {
                 corner: {
@@ -127,8 +127,8 @@ $(document).ready(function(){
                 }
             },
             style: {
-                padding: '6px',
-                width: 380,
+                padding: '1em',
+                width: 400,
                 backgroundColor: '#f1f2ee'
             }
         });
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index 91cbf14c..be85d83d 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -29,11 +29,6 @@
         
             <ul id ="individual-tools-people" 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>
                 
                 <@qr.renderCode />
             </ul>
@@ -117,6 +112,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" />',
                   '<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
                   '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
@@ -125,5 +128,7 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/
                   '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>',
                   '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+              
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 64a1d5f1..843251e6 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -1251,6 +1251,10 @@ h2#mainImage, #share-contact h2 {
 img.individual-photo {
     border: 7px solid #ebebeb;
 }
+.rdf-url {
+    padding-top: .8em;
+    display: block;
+}
 ul#individual-tools-people {
     border-bottom: 1px solid #e8ece9;
     color: #b2d15a;