From 4fedd2e47738080ebfbd2ce2ace04fb30221f579 Mon Sep 17 00:00:00 2001 From: stellamit Date: Fri, 17 Jun 2011 15:48:10 +0000 Subject: [PATCH 1/3] NIHVIVO-2682 - changed list view so that if both an activity (roleIn) and an information resource (forInformationResource) are associated with the role then both will be displayed in the list view. (if only one or the other is present then that one will be displayed). --- .../partials/individual/propStatement-hasEditReviewRole.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl index a5cf8650..c003fd20 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl @@ -16,7 +16,11 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.infoResource??> - ${statement.infoResourceLabel!statement.infoResourceName} + <#if statement.activity??> + ${statement.infoResourceLabel!statement.infoResourceName} ${statement.activityLabel!statement.activityName} + <#else> + ${statement.infoResourceLabel!statement.infoResourceName} + <#elseif statement.activity??> ${statement.activityLabel!statement.activityName} <#else> From e683208e959e18acdc13409b4cb9aa421eeaab22 Mon Sep 17 00:00:00 2001 From: stellamit Date: Fri, 17 Jun 2011 17:08:12 +0000 Subject: [PATCH 2/3] NIHVIVO-2683 (refactored addRoleToPersonTwoStage.jsp to have default values (of roleIn/relatedRole) for activityToRolePredicate and roleToActivityPredicate) --- .../edit/forms/addClinicalRoleToPerson.jsp | 2 -- .../edit/forms/addHeadOfRoleToPerson.jsp | 2 -- .../edit/forms/addMemberRoleToPerson.jsp | 2 -- .../edit/forms/addOrganizerRoleToPerson.jsp | 2 -- .../edit/forms/addOutreachRoleToPerson.jsp | 2 -- .../edit/forms/addPresenterRoleToPerson.jsp | 2 -- .../edit/forms/addResearcherRoleToPerson.jsp | 2 -- .../edit/forms/addRoleToPersonTwoStage.jsp | 18 ++++++++++-------- .../forms/addServiceProviderRoleToPerson.jsp | 2 -- .../edit/forms/addTeacherRoleToPerson.jsp | 2 -- 10 files changed, 10 insertions(+), 26 deletions(-) diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp index cee0dab0..2390270d 100644 --- a/productMods/edit/forms/addClinicalRoleToPerson.jsp +++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp @@ -3,8 +3,6 @@ - - - - diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp index 01ee33d3..e1e79e7f 100644 --- a/productMods/edit/forms/addMemberRoleToPerson.jsp +++ b/productMods/edit/forms/addMemberRoleToPerson.jsp @@ -3,8 +3,6 @@ - - diff --git a/productMods/edit/forms/addOrganizerRoleToPerson.jsp b/productMods/edit/forms/addOrganizerRoleToPerson.jsp index 5873b078..c9beec5c 100644 --- a/productMods/edit/forms/addOrganizerRoleToPerson.jsp +++ b/productMods/edit/forms/addOrganizerRoleToPerson.jsp @@ -3,8 +3,6 @@ - - - - - - diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp index 8102cb52..00096a0f 100644 --- a/productMods/edit/forms/addResearcherRoleToPerson.jsp +++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp @@ -3,8 +3,6 @@ - - ${param.roleActivityTypeLabel} @@ -83,8 +85,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. ${param.roleActivityType_objectClassUri} ${param.roleActivityType_literalOptions} ${! empty param.numDateFields ? param.numDateFields : 2 } -${param.roleToActivityPredicate} -${param.activityToRolePredicate} +${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"} +${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"} <% VitroRequest vreq = new VitroRequest(request); diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp index 844ae0c5..ccab85c6 100644 --- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp +++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp @@ -3,8 +3,6 @@ - - diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp index 7d1757d8..3ea87099 100644 --- a/productMods/edit/forms/addTeacherRoleToPerson.jsp +++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp @@ -3,8 +3,6 @@ - - From 22d103590b3d8eed2cc50607716fa107030265e4 Mon Sep 17 00:00:00 2001 From: manolobevia Date: Fri, 17 Jun 2011 17:35:57 +0000 Subject: [PATCH 3/3] NIHVIVO-2232. Worked on menu management main page. Deleted individual menu templates from VIVO and moved them to VITRO. Work in progress. --- .../body/individual/individual-menu.ftl | 21 ---------- .../individual/individual-menu-properties.ftl | 40 ------------------- .../individual/individual-menu-vitro.ftl | 21 ---------- 3 files changed, 82 deletions(-) delete mode 100644 productMods/templates/freemarker/body/individual/individual-menu.ftl delete mode 100644 productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl delete mode 100644 productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl diff --git a/productMods/templates/freemarker/body/individual/individual-menu.ftl b/productMods/templates/freemarker/body/individual/individual-menu.ftl deleted file mode 100644 index 3a08c665..00000000 --- a/productMods/templates/freemarker/body/individual/individual-menu.ftl +++ /dev/null @@ -1,21 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Default VIVO individual profile page template (extends individual.ftl in vitro) --> - -<#include "individual-setup.ftl"> - -<#assign individualProductExtension> - <#-- Include for any class specific template additions --> - ${classSpecificExtension!} - - <#include "individual-overview.ftl"> - - - - -<#include "individual-menu-vitro.ftl"> - -${stylesheets.add('')} - -${headScripts.add('')} -${scripts.add('')} diff --git a/productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl b/productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl deleted file mode 100644 index a6b9b6d2..00000000 --- a/productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl +++ /dev/null @@ -1,40 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Template for property listing on individual profile page --> - -<#import "lib-properties.ftl" as p> -<#list propertyGroups.all as group> - - <#assign groupName = group.getName(nameForOtherGroup)> -
- - - <#-- Display the group heading --> - <#if groupName?has_content> -

${groupName?capitalize}

- - - <#-- List the properties in the group --> - <#list group.properties as property> -
- <#-- Property display name --> -

${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />

- <#-- List the statements for each property --> -
    - - <#-- data property --> - <#if property.type == "data"> - <@p.dataPropertyList property editable /> - <#-- object property --> - <#else> - <@p.objectProperty property editable property.template /> - -
-
- -
- \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl b/productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl deleted file mode 100644 index 18f1a82b..00000000 --- a/productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl +++ /dev/null @@ -1,21 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Default individual profile page template --> -<#--@dumpAll /--> - -<#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> - -<#-- Menu Ontology properties --> -<#include "individual-menu-properties.ftl"> - -${stylesheets.add('')} - -${headScripts.add('', - '', - '', - '', - '', - '', - '')} - -${scripts.add('')}