From 46d5b47e926f29aa18986d7828506bcc31c2df0b Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 11 Jul 2012 16:40:14 +0000
Subject: [PATCH] merging 9966 to the trunk

---
 webapp/web/css/classHierarchy.css                      |  9 +++++++++
 webapp/web/js/siteAdmin/classHierarchyUtils.js         | 10 ++++++++--
 .../web/js/siteAdmin/objectPropertyHierarchyUtils.js   |  7 ++++++-
 .../freemarker/body/accounts/userAccounts-add.ftl      |  3 +++
 .../freemarker/body/accounts/userAccounts-edit.ftl     |  3 +++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/webapp/web/css/classHierarchy.css b/webapp/web/css/classHierarchy.css
index 618c4d28d..a4b012bfa 100644
--- a/webapp/web/css/classHierarchy.css
+++ b/webapp/web/css/classHierarchy.css
@@ -20,6 +20,11 @@ table.classHierarchy .classDetail {
     color:#064D68;
     white-space: nowrap;
 }
+td.classDetail {
+    width:90px;
+    color:#064D68;
+    white-space: nowrap;
+}
 table.subclassTable {
     margin-left:15px;
     margin-bottom:4px;
@@ -47,18 +52,22 @@ section#container div span {
 span.headerSpanPlus {
     width: 12px;
     background: url(../images/vitro_plus_sign.gif) left center no-repeat;
+    cursor:default;
 }
 span.headerSpanMinus {
     width: 12px;
     background: url(../images/vitro_minus_sign.gif) left center no-repeat;
+    cursor:default;
 }
 span.subclassExpandPlus {
     padding-right: 14px;
     background: url(../images/vitro_plus_sign.gif) left center no-repeat;
+    cursor:default;
 }
 span.subclassExpandMinus {
     padding-right: 14px;
     background: url(../images/vitro_minus_sign.gif) left center no-repeat;
+    cursor:default;
 }
 span#expandAll {
     margin-right: 10px;
diff --git a/webapp/web/js/siteAdmin/classHierarchyUtils.js b/webapp/web/js/siteAdmin/classHierarchyUtils.js
index b33f7b666..def6828d6 100644
--- a/webapp/web/js/siteAdmin/classHierarchyUtils.js
+++ b/webapp/web/js/siteAdmin/classHierarchyUtils.js
@@ -81,9 +81,11 @@
             });
             var descendants = "";
             var headerSpan = "";
+            var closingTable = "</table>";
             
             if ( this.children.length ) {
                 descendants = classHierarchyUtils.getTheChildren(this);
+                closingTable = "";
                 headerSpan = "<span class='headerSpanPlus' id='headerSpan" + classHierarchyUtils.classCounter 
                               + "' view='less'>&nbsp;</span>";
             }
@@ -102,10 +104,14 @@
             classHierarchyUtils.classHtml += "<tr><td class='classDetail'>Ontology:</td><td>" + this.data.ontology + "</td></tr>";
 
  
+            if ( descendants.length > 1 ) {
+                descendants = descendants.substring(0, descendants.length - 10);
+            }
+            
             classHierarchyUtils.classHtml += descendants;
 
-            classHierarchyUtils.classHtml += "</table>";
-       //     alert(classHierarchyUtils.classHtml);
+            classHierarchyUtils.classHtml += closingTable;
+//            alert(classHierarchyUtils.classHtml);
             $newClassSection.html(classHierarchyUtils.classHtml);
             $newClassSection.appendTo($('section#container'));
             classHierarchyUtils.makeHeaderSpansClickable(classHierarchyUtils.classCounter);
diff --git a/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js b/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
index 413dc548c..71b09397c 100644
--- a/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
+++ b/webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
@@ -126,9 +126,11 @@
             });
             var descendants = "";
             var headerSpan = "";
+            var closingTable = "</table>";
             
             if ( this.children.length ) {
                 descendants = objectPropHierarchyUtils.getTheChildren(this);
+                closingTable = "";
                 headerSpan = "<span class='headerSpanPlus' id='headerSpan" + objectPropHierarchyUtils.classCounter 
                               + "' view='less'>&nbsp;</span>";
             }
@@ -148,10 +150,13 @@
             objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>Range Class:</span>" 
                                                + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
+            if ( descendants.length > 1 ) {
+               descendants = descendants.substring(0, descendants.length - 10);
+            }
  
             objectPropHierarchyUtils.classHtml += descendants;
 
-            objectPropHierarchyUtils.classHtml += "</table>";
+            objectPropHierarchyUtils.classHtml += closingTable;
        //     alert(objectPropHierarchyUtils.classHtml);
             $newClassSection.html(objectPropHierarchyUtils.classHtml);
             $newClassSection.appendTo($('section#container'));
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index bd425ab88..59a4cd7de 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -1,9 +1,12 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <#-- Template for adding a user account -->
+<#import "lib-vivo-form.ftl" as lvf>
 
 <h3><a class="account-menu" href="accountsAdmin" title="add new account">User accounts</a> > Add new account</h3>
 
+<@lvf.unsupportedBrowser urls.base /> 
+
     <#if errorEmailIsEmpty??>
         <#assign errorMessage = "You must supply an email address." />
     </#if>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index f2dce4cab..763855df4 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -1,9 +1,12 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <#-- Template for editing a user account -->
+<#import "lib-vivo-form.ftl" as lvf>
 
 <h3><a class="account-menu" href="accountsAdmin" title="edit account">User accounts</a> > Edit account</h3>
 
+<@lvf.unsupportedBrowser urls.base /> 
+
     <#if errorEmailIsEmpty??>
         <#assign errorMessage = "You must supply an email address." />
     </#if>