diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 4b33afe4..3d1e5937 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -100,16 +100,7 @@ <#-- Overview --> - <#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> - <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> - <@p.addLinkWithLabel overview editing /> - <#list overview.statements as statement> -

- ${statement.value} - <@p.editingLinks statement editing /> -

- - + <#include "individual-overview.ftl"> <#-- Research Areas --> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl new file mode 100644 index 00000000..8e5fc8e2 --- /dev/null +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -0,0 +1,99 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Default individual profile page template --> + +<#include "individual-setup.ftl"> + +<#if individual.showAdminPanel> + <#include "individual-adminPanel.ftl"> + + +
+
+ <#-- Thumbnail --> + <#if individual.thumbUrl??> + ${individual.name} + <#--<#elseif individual.person> + placeholder image--> + +
+ +
+
+ <#if relatedSubject??> +

${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}

+

← return to ${relatedSubject.name}

+ <#else> +

+ <#-- Label --> + <#assign label = individual.nameStatement> + ${label.value} + <@p.editingLinks label editing /> + + <#-- Moniker --> + <#if individual.moniker?has_content> + ${individual.moniker} + +

+ +
+ + <#-- Overview --> + <#include "individual-overview.ftl"> + + + + <#-- Links --> + <#include "individual-links.ftl"> +
+
+ +
+
+ <#include "individual-sparklineVisualization.ftl"> + + <#-- RY Will we have an individual--foaf-organization.ftl template? If so, move this there and remove from here. + Also remove the method IndividualTemplateModel.isOrganization(). --> + <#if individual.organization > +
+

Temporal Graph

+
+ <#--
VISMODE: ${individual.moniker}
--> + +
+
+ +<#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> + +<#-- Property group menu --> +<#include "individual-propertyGroupMenu.ftl"> + +<#-- Ontology properties --> +<#include "individual-properties.ftl"> + +<#-- Keywords --> +<#if individual.keywords?has_content> +

Keywords: ${individual.keywordString}

+ + +${stylesheets.add("/css/individual/individual.css")} + +<#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> +${headScripts.add("/js/jquery_plugins/getURLParam.js", + "/js/jquery_plugins/colorAnimations.js", + "/js/jquery_plugins/jquery.form.js", + "/js/tiny_mce/tiny_mce.js", + "/js/controls.js", + "/js/toggle.js")} + +${scripts.add("/js/imageUpload/imageUploadUtils.js")} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl new file mode 100644 index 00000000..45a3c5f5 --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl @@ -0,0 +1,14 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Overview on individual profile page --> + +<#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> +<#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> + <@p.addLinkWithLabel overview editing /> + <#list overview.statements as statement> +

+ ${statement.value} + <@p.editingLinks statement editing /> +

+ + \ No newline at end of file