merging 4231 to the trunk

This commit is contained in:
tworrall 2012-07-11 16:42:05 +00:00
parent 5e79cca398
commit 5b37b99fe4
3 changed files with 12 additions and 0 deletions

View file

@ -1,5 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "lib-vivo-form.ftl" as lvf>
<#-- Custom form for managing web pages for individuals -->
<#if subjectName?contains(",") >
<#assign lastName = subjectName?substring(0,subjectName?index_of(",")) />
@ -14,6 +16,7 @@ Check those grants and projects you want to exclude from the profile page.
var grantData = [];
</script>
</p>
<@lvf.unsupportedBrowser urls.base />
<#list allSubclasses as sub>
<h4>${sub}</h4>

View file

@ -1,5 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#import "lib-vivo-form.ftl" as lvf>
<#-- Custom form for managing web pages for individuals -->
<#if subjectName?contains(",") >
<#assign lastName = subjectName?substring(0,subjectName?index_of(",")) />
@ -14,6 +16,9 @@ Check those publications you want to exclude from the profile page.
var publicationData = [];
</script>
</p>
<@lvf.unsupportedBrowser urls.base />
<#list allSubclasses as sub>
<h4>${sub}s</h4>

View file

@ -1659,18 +1659,22 @@ input.add-account:active {
span.headerSpanPlus {
width: 12px;
background: url(../images/green_plus_sign.gif) left center no-repeat;
cursor:default;
}
span.headerSpanMinus {
width: 12px;
background: url(../images/green_minus_sign.gif) left center no-repeat;
cursor:default;
}
span.subclassExpandPlus {
padding-right: 14px;
background: url(../images/green_plus_sign.gif) left center no-repeat;
cursor:default;
}
span.subclassExpandMinus {
padding-right: 14px;
background: url(../images/green_minus_sign.gif) left center no-repeat;
cursor:default;
}
/* -------------------------------------------------> */
/* PAGE MANAGEMENT --------------------------------> */