revision 3067 merged from trunk
This commit is contained in:
anupsawant
commit
e23b4043c8
15 changed files with 161 additions and 109 deletions
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="head of" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="membership" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="VCLASSGROUP" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="http://vivoweb.org/ontology#vitroClassGrouporganizations" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="organizer of" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
<jsp:param name="roleActivityTypeLabel" value="presentation" />
|
||||
<jsp:param name="buttonLabel" value="presentation role" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="numDateFields" value="1" />
|
||||
<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="research activity" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
|
|
|
|||
|
|
@ -68,12 +68,14 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
|
|||
|
||||
<%--
|
||||
These are the parameters that MUST be set of this form:
|
||||
role type
|
||||
predicate inverse
|
||||
role activity type label (should be singular)
|
||||
super type of role types for roleActivityType select list generation
|
||||
roleToActivityPredicate
|
||||
activityToRolePredicate
|
||||
role type
|
||||
predicate inverse
|
||||
role activity type label (should be singular)
|
||||
super type of role types for roleActivityType select list generation
|
||||
|
||||
These are optional parameters:
|
||||
roleToActivityPredicate (default value is http://vivoweb.org/ontology/core#roleIn)
|
||||
activityToRolePredicate (default value is http://vivoweb.org/ontology/core#relatedRole)
|
||||
--%>
|
||||
|
||||
<c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
|
||||
|
|
@ -83,8 +85,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
|
|||
<c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set>
|
||||
<c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
|
||||
<c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
|
||||
<c:set var="roleToActivityPredicate" scope="request">${param.roleToActivityPredicate}</c:set>
|
||||
<c:set var="activityToRolePredicate">${param.activityToRolePredicate}</c:set>
|
||||
<c:set var="roleToActivityPredicate" scope="request">${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"}</c:set>
|
||||
<c:set var="activityToRolePredicate">${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}</c:set>
|
||||
|
||||
<%
|
||||
VitroRequest vreq = new VitroRequest(request);
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
|
||||
<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
</section> <!-- #individual-info -->
|
||||
</section> <!-- #individual-intro -->
|
||||
</#assign>
|
||||
|
||||
<#include "individual-menu-vitro.ftl">
|
||||
|
||||
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />')}
|
||||
|
||||
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.js"></script>')}
|
||||
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>')}
|
||||
|
|
@ -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)>
|
||||
<section class="property-group" role="region">
|
||||
<nav class="scroll-up" role="navigation">
|
||||
<a href="#branding">
|
||||
<img src="${urls.images}/individual/scroll-up.gif" alt="scroll to property group menus" />
|
||||
</a>
|
||||
</nav>
|
||||
|
||||
<#-- Display the group heading -->
|
||||
<#if groupName?has_content>
|
||||
<h2 id="${groupName}">${groupName?capitalize}</h2>
|
||||
</#if>
|
||||
|
||||
<#-- List the properties in the group -->
|
||||
<#list group.properties as property>
|
||||
<article class="property" role="article">
|
||||
<#-- Property display name -->
|
||||
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /></h3>
|
||||
<#-- List the statements for each property -->
|
||||
<ul class="property-list" role="list">
|
||||
|
||||
<#-- data property -->
|
||||
<#if property.type == "data">
|
||||
<@p.dataPropertyList property editable />
|
||||
<#-- object property -->
|
||||
<#else>
|
||||
<@p.objectProperty property editable property.template />
|
||||
</#if>
|
||||
</ul>
|
||||
</article> <!-- end property -->
|
||||
</#list>
|
||||
</section> <!-- end property-group -->
|
||||
</#list>
|
||||
|
|
@ -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('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />')}
|
||||
|
||||
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/getURLParam.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/colorAnimations.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.form.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/controls.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/toggle.js"></script>')}
|
||||
|
||||
${scripts.add('<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
|
||||
|
|
@ -16,7 +16,11 @@
|
|||
<#macro showRole statement>
|
||||
<#local linkedIndividual>
|
||||
<#if statement.infoResource??>
|
||||
<a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a>
|
||||
<#if statement.activity??>
|
||||
<a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a> <a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
|
||||
<#else>
|
||||
<a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a>
|
||||
</#if>
|
||||
<#elseif statement.activity??>
|
||||
<a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
|
||||
<#else>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue