From 5b37b99fe47b47c60601541bbe6b93b72f192550 Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 11 Jul 2012 16:42:05 +0000 Subject: [PATCH] merging 4231 to the trunk --- .../freemarker/edit/forms/manageGrantsForIndividual.ftl | 3 +++ .../edit/forms/managePublicationsForIndividual.ftl | 5 +++++ themes/wilma/css/wilma.css | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl index 0127bf09..6559a483 100644 --- a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl @@ -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 = [];

+<@lvf.unsupportedBrowser urls.base /> <#list allSubclasses as sub>

${sub}

diff --git a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl b/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl index 0268de81..6aac7365 100644 --- a/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl @@ -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 = [];

+ +<@lvf.unsupportedBrowser urls.base /> + <#list allSubclasses as sub>

${sub}s

diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 6c1e77cf..e7360f6e 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -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 --------------------------------> */