From d4cb20d9241e4ba34fc168c1098cf4320179412e Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 25 Feb 2013 10:18:04 -0500 Subject: [PATCH] mistakenly moved template to incorrect directory. --- .../freemarker/body/individual/individual.ftl | 12 +++------ .../body/partials/individual/individual.ftl | 26 ------------------- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 productMods/templates/freemarker/body/partials/individual/individual.ftl diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index ce433c9c..f5eb094f 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -13,20 +13,14 @@ <#include "individual-webpage.ftl"> <#include "individual-overview.ftl"> ${departmentalResearchAreas!} - ${departmentalMemberships!} - - + <#include "individual-vitro.ftl"> - + ${stylesheets.add('')} -${headScripts.add('', - '')} - +${headScripts.add('')} ${scripts.add('')} diff --git a/productMods/templates/freemarker/body/partials/individual/individual.ftl b/productMods/templates/freemarker/body/partials/individual/individual.ftl deleted file mode 100644 index f5eb094f..00000000 --- a/productMods/templates/freemarker/body/partials/individual/individual.ftl +++ /dev/null @@ -1,26 +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"> -<#import "lib-vivo-properties.ftl" as vp> - -<#assign individualProductExtension> - <#-- Include for any class specific template additions --> - ${classSpecificExtension!} - ${departmentalGrantsExtension!} - - <#include "individual-webpage.ftl"> - <#include "individual-overview.ftl"> - ${departmentalResearchAreas!} - - - - - -<#include "individual-vitro.ftl"> - -${stylesheets.add('')} - -${headScripts.add('')} -${scripts.add('')}