From f0657b42ea570a1e3afa5f9f95fcc474e6292a90 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Fri, 16 Nov 2012 16:00:56 -0500
Subject: [PATCH] Changes to support collapsible/expandable property groups on
 the profile pages.

---
 doc/3rd-party-licenses.txt                    |  1 +
 .../css/individual/individual-vivo.css        | 15 +++------
 productMods/js/individual/individualUtils.js  | 11 +++++--
 .../individual/individual--foaf-person.ftl    | 31 ++++++++-----------
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/doc/3rd-party-licenses.txt b/doc/3rd-party-licenses.txt
index 948ab026..ebbd4720 100644
--- a/doc/3rd-party-licenses.txt
+++ b/doc/3rd-party-licenses.txt
@@ -137,6 +137,7 @@ jai_core
 
 MIT
 ---
+amplify (licenses/mit.LICENSE.txt)
 BeanToJsonSerializer.java (licenses/mit.LICENSE.txt)
 blueprintcss (licenses/blueprintcss.LICENSE.txt)
 html5js (licenses/mit.LICENSE.txt)
diff --git a/productMods/css/individual/individual-vivo.css b/productMods/css/individual/individual-vivo.css
index fcca1964..10a243c6 100644
--- a/productMods/css/individual/individual-vivo.css
+++ b/productMods/css/individual/individual-vivo.css
@@ -62,7 +62,7 @@ ul#additional-emails li {
     width: 78%;
 }
 #individual-intro .individual-overview {
-    margin-bottom: 30px;
+    margin-bottom: 10px;
     margin-top: 10px;
     display: inline;
     clear: both;
@@ -70,7 +70,7 @@ ul#additional-emails li {
 }
 /* <------ INDIVIDUAL INTRO FOR PERSON*/
 #individual-intro.person {
-    margin-bottom: 30px;
+    margin-bottom: 0;
     position: relative;
     width: 100%;
 }
@@ -101,7 +101,7 @@ ul#individual-tools-people li {
 ul.individual-urls-people {
     clear: both;
     list-style-type: circle;
-    padding-left: 24px;
+    padding-left: 15px;
 }
 ul.individual-urls-people li {
     font-size: .875em;
@@ -109,7 +109,7 @@ ul.individual-urls-people li {
 }
 /* <------ INDIVIDUAL CORE:OVERVIEW */
 #overview {
-    clear: left;
+    clear: both;
 }
 .overview-value {
     display: inline;
@@ -128,7 +128,6 @@ div.overview-value :last-child {
 /* <------ INDIVIDUAL VISUALIZATION */
 #visualization {
     padding: 0 0 0 20px;
-    padding-top: 0;
     float: right;
     background-color: #fff;
 }
@@ -207,13 +206,9 @@ ul#individual-hasResearchArea {
 ul#individual-hasResearchArea li {
     float: left;
     padding-right: 10px;
-    padding-left: 10px;
+    margin-right: 10px;
     border-right: 1px solid #5e6363;
 }
-ul#individual-hasResearchArea li:first-child {
-    padding-left: 0;
-}
-
 /* <------ QR Code */
 h5.qrCode {
     margin-top: 1em;
diff --git a/productMods/js/individual/individualUtils.js b/productMods/js/individual/individualUtils.js
index fe8485f0..8cfcc787 100644
--- a/productMods/js/individual/individualUtils.js
+++ b/productMods/js/individual/individualUtils.js
@@ -1,7 +1,9 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
 $(document).ready(function(){
-    
+        
+    $.extend(this, individualLocalName);
+
     // "more"/"less" HTML truncator for showing more or less content in data property core:overview
     $('.overview-value').truncate({max_length: 500});
     
@@ -127,5 +129,10 @@ $(document).ready(function(){
     if ( $('ul#organizationForPositionList').children('li').length < 1 && $('h3#organizationForPosition').attr('class') != "hiddenPeople" ) {
         $('a#managePeopleLink').hide();
     }
-
+   
+    // if there are webpages but no contacts (email/phone), extend
+    // the webpage border the full width. Used with "standard" profile view.
+    if ( $('h2#contactHeading').length < 1 ) {
+        $('div#webpagesContainer').css('width', '100%').css('clear','both');
+    }
 });
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index c567c688..e2af21fa 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -40,23 +40,8 @@
         <@vp.webpages propertyGroups editable "individual-urls-people" />
     </section>
 
-    <section id="individual-info" ${infoClass!} role="region">
+    <section id="individual-info" ${infoClass!} role="region"> 
         <#include "individual-visualizationFoafPerson.ftl">    
-        <#-- Disable for now until controller sends data -->
-        <#--
-        <section id="co-authors" role="region">
-            <header>
-                <h3><span class="grey">10 </span>Co-Authors</h3>
-            </header>
-
-            <ul role="list">
-                <li role="listitem"><a href="#" title="co-author image"><img class="co-author" src="" /></a></li>
-                <li role="listitem"><a href="#" title="co-author image"><img class="co-author" src="" /></a></li>
-            </ul>
-
-            <p class="view-all-coauthors"><a class="view-all-style" href="#" title="view all">View All <img src="${urls.images}/arrowIcon.gif" alt="arrow icon" /></a></p>
-        </section>
-        -->
         
         <#include "individual-adminPanel.ftl">
         
@@ -123,8 +108,12 @@
 <#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl -->
 
 <#-- Property group menu -->
-<#include "individual-propertyGroupMenu.ftl">
-
+<#-- With release 1.6 the property group is no longer used. The include statement
+     remains in the event a particular VIVO site still wants to use it with the new
+     collapsible groups.
+     
+     <#include "individual-propertyGroupMenu.ftl">
+-->
 <#-- Ontology properties -->
 <#if !editable>
 	<#-- We don't want to see the first name and last name unless we might edit them. -->
@@ -141,16 +130,22 @@
         var individualRdfUrl = '${rdfUrl}';
     </script>
 </#if>
+<script>
+    var individualLocalName = "${individual.localName}";
+</script>
 
 ${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}/css/individual/individual-property-groups.css" />',
                   '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
 
 ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
                   '<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/amplify/amplify.store.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/individual/individualUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/individual/propertyGroupControls.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.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>')}