From 0c68a75483b45f115da69010e2f8dcf8545694c0 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 10 Jun 2011 21:04:50 +0000
Subject: [PATCH 1/3] NIHVIVO-2692:minor style changes to the temporal graph
 page

---
 .../css/visualization/entitycomparison/layout.css |  8 +++++++-
 .../entitycomparison/entityComparisonBody.ftl     | 15 ++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css
index 21d8b6cf..caeb08c4 100644
--- a/productMods/css/visualization/entitycomparison/layout.css
+++ b/productMods/css/visualization/entitycomparison/layout.css
@@ -15,8 +15,14 @@
 
 #subject-parent-entity {
     display: none;
+    font-size:.7em;
+    color:#aaa;
+    margin-left:10px;
+}
+#subject-parent-entity-spacer {
+    color:#aaa;
+    margin-left:-18px;
 }
-
 #error-container {
     display: none;
 }
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
index 2da6f0e9..28f58f48 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
@@ -2,13 +2,13 @@
 
 <div id="body">
 
-        <div id="subject-parent-entity">
-            <a id="subject-parent-entity-profile-url" href="#"></a>&nbsp;
-            <a id="subject-parent-entity-temporal-url" href="#"><img src="${temporalGraphSmallIcon}" width="15px" height="15px"/></a>
-        </div>
+
         
-        <h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a>&nbsp;
-        <img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system" /></span></h2>
+        <h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a></span>
+        <span id="subject-parent-entity"><span>|&nbsp;&nbsp;</span>
+            <a id="subject-parent-entity-profile-url" href="#" title="Parent organization of ${organizationLabel}"></a>&nbsp;
+            <a id="subject-parent-entity-temporal-url" href="#"><img src="${temporalGraphSmallIcon}" width="15px" height="15px"/></a>
+        </span></h2><br>
         
         <div id="leftblock">
             <div id="leftUpper">
@@ -94,7 +94,8 @@
             </div>
         
             <div id="bottom">
-                <h3><span id="comparisonParameter"></span></h3>
+                <h3><span id="comparisonParameter"></span>&nbsp;
+                <img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system"  width="15px" height="15px"/></h3>
             <p class="displayCounter">You have selected <span id="counter">0</span> of a maximum 
             <span id="total">10</span> <span id="entityleveltext"> schools</span>. 
             <span id="legend-row-header"> 

From 0b81817d07a86cef60750caeb72fff4270c7330d Mon Sep 17 00:00:00 2001
From: cappadona <cappadona@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 10 Jun 2011 21:14:30 +0000
Subject: [PATCH 2/3] Corrected reference to default database name.

---
 example.deploy.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.deploy.properties b/example.deploy.properties
index d65a8557..dff5f5cf 100644
--- a/example.deploy.properties
+++ b/example.deploy.properties
@@ -63,7 +63,7 @@ email.replyTo = vivoAdmin@my.domain.edu
 
 #
 # The basic parameters for a database connection. Change the end of the 
-# URL to reflect your database name (if it is not "vitro"). Change the username 
+# URL to reflect your database name (if it is not "vitrodb"). Change the username 
 # and password to match the authorized database user you created.
 #
 VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb

From aeeaf22fab182fe89ba230f39a7326335fd45e4f Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 13 Jun 2011 13:26:38 +0000
Subject: [PATCH 3/3] NIHVIVO-2280:  Removed javascript code for
 userAccounts-list.ftl to accountUtils.js

---
 themes/wilma/css/wilma.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index c9a04e6a..dfaf98fc 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -1497,7 +1497,7 @@ table#account td {
     padding: .5em;
     border: 1px solid #F7F9F9; 
     font-size: .9em;
-}    
+}  
 table#account tr {
     background-color: #fff;
 }
@@ -1550,7 +1550,7 @@ form.customForm #reset-password {
 #add-account .note {
      padding-bottom: 20px;
      padding-top: 0;
-     margin-top: 5px;
+     margin-top: 25px;
 }
 /* ------------------------------------------------->  */
 /* DROP DOWN USER MENU  ---------------------------->  */
@@ -1612,7 +1612,6 @@ ul.dropdown ul.sub_menu li {
 }
 ul.dropdown ul.sub_menu li:last-child { 
     width: 96px;
-
 }
 /* IE 6 & 7 Needs Inline Block */
 /* ADD IN IE6.css and IE7.css*/