From 40a089ef318aa5b010a806f692fd90476c3103d4 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 10 Feb 2011 16:19:48 +0000
Subject: [PATCH] NIHVIVO-2098 Do not show the link for temporal visualization
 unless deploy.properties specifies "visualization.temporal = enabled"

---
 doc/install.html                              | 23 +++++++++++++++++++
 doc/upgrade-1.2.html                          | 23 +++++++++++++++++++
 .../individual--foaf-organization.ftl         |  6 +++--
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index 7cbb3d72..0ec114bd 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -562,6 +562,29 @@
                             http://vivo.mydomain.edu/ns#networkId 
                         </td>
                     </tr>
+                    <tr>
+                        <td colspan="2">
+                            The temporal graph visualization can require extensive machine resources.
+                            This can have a particularly noticable impact on memory usage if
+                            <ul>
+                            <li> VIVO is configured to use Jena SDB, </li>
+                            <li> The organization tree is deep, </li>
+                            <li> The number of grants and publications is large. </li>
+                            </ul>
+                            The VIVO developers are working to make this visualization more efficient.
+                            In the meantime, VIVO release 1.2 guards against this impact by disabling 
+                            temporal graph visualization unless the "visualization.temporal" flag is 
+                            set to "enabled". 
+                        </td>
+                    </tr>
+                    <tr class="odd_row">
+                        <td>
+                            visualization.temporal 
+                        </td>
+                        <td>
+                            enabled 
+                        </td>
+                    </tr>
                     <tr>
                         <td colspan="2">
                             The temporal graph visualization is used to
diff --git a/doc/upgrade-1.2.html b/doc/upgrade-1.2.html
index cda1c1c8..24b30fbd 100644
--- a/doc/upgrade-1.2.html
+++ b/doc/upgrade-1.2.html
@@ -538,6 +538,29 @@
                             http://vivo.mydomain.edu/ns#networkId 
                         </td>
                     </tr>
+                    <tr>
+                        <td colspan="2">
+                            The temporal graph visualization can require extensive machine resources.
+                            This can have a particularly noticable impact on memory usage if
+                            <ul>
+                            <li> VIVO is configured to use Jena SDB, </li>
+                            <li> The organization tree is deep, </li>
+                            <li> The number of grants and publications is large. </li>
+                            </ul>
+                            The VIVO developers are working to make this visualization more efficient.
+                            In the meantime, VIVO release 1.2 guards against this impact by disabling 
+                            temporal graph visualization unless the "visualization.temporal" flag is 
+                            set to "enabled". 
+                        </td>
+                    </tr>
+                    <tr class="odd_row blue">
+                        <td>
+                            visualization.temporal 
+                        </td>
+                        <td>
+                            enabled 
+                        </td>
+                    </tr>
                     <tr>
                         <td colspan="2">
                             The temporal graph visualization is used to
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl
index 98963e2a..1ec31144 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl
@@ -3,7 +3,9 @@
 <#-- Individual profile page template for foaf:Organization individuals (extends individual.ftl in vivo)-->
 
 <#assign classSpecificExtension>
-    <#include "individual-visualizationTemporalGraph.ftl">
+    <#if temporalVisualizationEnabled??>
+        <#include "individual-visualizationTemporalGraph.ftl">
+    </#if>
 </#assign>
 
-<#include "individual.ftl">
\ No newline at end of file
+<#include "individual.ftl">