litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 9966 to the trunk

Browse source
This commit is contained in:
tworrall 2012-07-11 16:40:14 +00:00
parent 732617f62f
commit 46d5b47e92
5 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
webapp/web/css/classHierarchy.css
View file

@ -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;

10
webapp/web/js/siteAdmin/classHierarchyUtils.js
View file

@ -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);

7
webapp/web/js/siteAdmin/objectPropertyHierarchyUtils.js
View file

@ -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'));

3
webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
View file

@ -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>

3
webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
View file

@ -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>