From d292100f8b2d29613f8ee9fbf7de10ecbb3ff4af Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 4 Jan 2011 16:38:22 +0000 Subject: [PATCH] NIHVIVO-1459 Add annotation for foaf:Person custom display view. Add template individual--foaf-person.ftl. Removed unused templates. --- .../webapp/controller/EntityController.java | 4 + .../individual/individual--foaf-person.ftl | 210 ------------------ .../individual/individual--generic-class.ftl | 177 --------------- .../freemarker/body/individual/individual.ftl | 3 - 4 files changed, 4 insertions(+), 390 deletions(-) delete mode 100644 webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl delete mode 100644 webapp/web/templates/freemarker/body/individual/individual--generic-class.ftl diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityController.java index d626dac26..9eeea9dc3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityController.java @@ -181,6 +181,10 @@ public class EntityController extends VitroHttpServlet { indiv.getVClassURI() + ": no class found with that URI"); } if (customView!=null) { + // RY Transitional hack: ignore Freemarker templates so we can load old individual page with default display view + if (customView.endsWith(".ftl")) { + customView = null; + } // insert test for whether a css files of the same name exists, and populate the customCss string for use when construction the header } String netid = iwDao.getNetId(indiv.getURI()); diff --git a/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl b/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl deleted file mode 100644 index 337bfc3d4..000000000 --- a/webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl +++ /dev/null @@ -1,210 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -
-
- - - 555 567 7878 - - -
- -
-
-

Hayworth, RitaActress, dancer

- -

Current Positions

- - -
- -

Born Margarita Carmen Cansino in Brooklyn, New York City, she was the daughter of flamenco dancer Eduardo Cansino, Sr., who was himself a Sephardic Jewish Spaniard from Castilleja de la Cuesta (Seville), and Ziegfeld girl Volga Hayworth who was of Irish and English descent. She was raised as a Roman Catholic. Her father wanted her to become a dancer while her mother hoped she would become an actress. Her grandfather, Antonio Cansino [+]

- -

Research Areas

- - - -
- -
-
-
-

2 publications within the last 10 years

-
- -

All VIVO publications & co-author network.

-
- -
-
-

10 Co-Authors

-
- -
    -
    • -
    • -
    • -
    • -
    • -
    • -
- -

View All 4

-
-
- - - -
-

Affiliation

- -
-

property-label

- -

data property

-
-
-

property-label

- -

In ante neque, adipiscing ut aliquet in, dictum eu est. Suspendisse lobortis nulla at ligula dictum et tincidunt nunc accumsan. Integer molestie faucibus lacinia. Integer lacinia, nisl a lobortis vehicula, nisl turpis molestie tortor, nec commodo augue erat ac enim. Aenean ac mauris risus. Donec vehicula eleifend purus ac porta. Fusce quis massa eu urna dignissim consequat rutrum quis libero. Donec pellentesque orci ac massa ornare facilisis. Aenean fringilla sem at enim tristique at ultrices lorem dapibus. Nulla ultricies laoreet sem ut tincidunt. Donec sit amet eros at lorem suscipit ultricies. Suspendisse nunc sem, vestibulum ac gravida a, sodales non purus. Curabitur sodales ultricies lectus et auctor. In in mi vel eros tempor hendrerit volutpat eu libero. Curabitur aliquam adipiscing bibendum. Suspendisse vel nibh sit amet tortor gravida viverra a sed neque. Curabitur bibendum turpis vel dui gravida sed rhoncus magna euismod. Etiam euismod, dui non hendrerit varius, elit lorem interdum risus, ultricies rutrum elit felis ac ante. Phasellus porttitor tempus tortor id dictum. Vestibulum in nulla vitae lectus porta placerat quis vel dolor.

-
-
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
- -
- -
-

Research

- -
-

property-label

- -

data property

-
-
-

property-label

- -

In ante neque, adipiscing ut aliquet in, dictum eu est. Suspendisse lobortis nulla at ligula dictum et tincidunt nunc accumsan. Integer molestie faucibus lacinia. Integer lacinia, nisl a lobortis vehicula, nisl turpis molestie tortor, nec commodo augue erat ac enim. Aenean ac mauris risus. Donec vehicula eleifend purus ac porta. Fusce quis massa eu urna dignissim consequat rutrum quis libero. Donec pellentesque orci ac massa ornare facilisis. Aenean fringilla sem at enim tristique at ultrices lorem dapibus. Nulla ultricies laoreet sem ut tincidunt. Donec sit amet eros at lorem suscipit ultricies. Suspendisse nunc sem, vestibulum ac gravida a, sodales non purus. Curabitur sodales ultricies lectus et auctor. In in mi vel eros tempor hendrerit volutpat eu libero. Curabitur aliquam adipiscing bibendum. Suspendisse vel nibh sit amet tortor gravida viverra a sed neque. Curabitur bibendum turpis vel dui gravida sed rhoncus magna euismod. Etiam euismod, dui non hendrerit varius, elit lorem interdum risus, ultricies rutrum elit felis ac ante. Phasellus porttitor tempus tortor id dictum. Vestibulum in nulla vitae lectus porta placerat quis vel dolor.

-
-
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
- -
- -
-

Teaching

- -
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
- -
-
-

Publications

- -
-

property-label

-

data property

-
- -
\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/individual/individual--generic-class.ftl b/webapp/web/templates/freemarker/body/individual/individual--generic-class.ftl deleted file mode 100644 index aa8a1e37c..000000000 --- a/webapp/web/templates/freemarker/body/individual/individual--generic-class.ftl +++ /dev/null @@ -1,177 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -
-

<individualName>Moniker

- - - - -
- - - -
-

propertyGroup1

- -
-

property-label

- -

data property

-
-
-

property-label

- -

In ante neque, adipiscing ut aliquet in, dictum eu est. Suspendisse lobortis nulla at ligula dictum et tincidunt nunc accumsan. Integer molestie faucibus lacinia. Integer lacinia, nisl a lobortis vehicula, nisl turpis molestie tortor, nec commodo augue erat ac enim. Aenean ac mauris risus. Donec vehicula eleifend purus ac porta. Fusce quis massa eu urna dignissim consequat rutrum quis libero. Donec pellentesque orci ac massa ornare facilisis. Aenean fringilla sem at enim tristique at ultrices lorem dapibus. Nulla ultricies laoreet sem ut tincidunt. Donec sit amet eros at lorem suscipit ultricies. Suspendisse nunc sem, vestibulum ac gravida a, sodales non purus. Curabitur sodales ultricies lectus et auctor. In in mi vel eros tempor hendrerit volutpat eu libero. Curabitur aliquam adipiscing bibendum. Suspendisse vel nibh sit amet tortor gravida viverra a sed neque. Curabitur bibendum turpis vel dui gravida sed rhoncus magna euismod. Etiam euismod, dui non hendrerit varius, elit lorem interdum risus, ultricies rutrum elit felis ac ante. Phasellus porttitor tempus tortor id dictum. Vestibulum in nulla vitae lectus porta placerat quis vel dolor.

-
-
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
- -
- -
-

propertyGroup2

- -
-

property-label

- -

data property

-
-
-

property-label

- -

In ante neque, adipiscing ut aliquet in, dictum eu est. Suspendisse lobortis nulla at ligula dictum et tincidunt nunc accumsan. Integer molestie faucibus lacinia. Integer lacinia, nisl a lobortis vehicula, nisl turpis molestie tortor, nec commodo augue erat ac enim. Aenean ac mauris risus. Donec vehicula eleifend purus ac porta. Fusce quis massa eu urna dignissim consequat rutrum quis libero. Donec pellentesque orci ac massa ornare facilisis. Aenean fringilla sem at enim tristique at ultrices lorem dapibus. Nulla ultricies laoreet sem ut tincidunt. Donec sit amet eros at lorem suscipit ultricies. Suspendisse nunc sem, vestibulum ac gravida a, sodales non purus. Curabitur sodales ultricies lectus et auctor. In in mi vel eros tempor hendrerit volutpat eu libero. Curabitur aliquam adipiscing bibendum. Suspendisse vel nibh sit amet tortor gravida viverra a sed neque. Curabitur bibendum turpis vel dui gravida sed rhoncus magna euismod. Etiam euismod, dui non hendrerit varius, elit lorem interdum risus, ultricies rutrum elit felis ac ante. Phasellus porttitor tempus tortor id dictum. Vestibulum in nulla vitae lectus porta placerat quis vel dolor.

-
-
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
- -
- -
-

propertyGroup3

- -
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
-
-

property-label

- -

data property

-
- -
- -
-

propertyGroup4

- -
-

property-label

- -

data property

-
- -
- -
-

propertyGroupN

- -
-

property-label

- -

data property

-
- -
diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl index b8490c308..9b9b8da72 100644 --- a/webapp/web/templates/freemarker/body/individual/individual.ftl +++ b/webapp/web/templates/freemarker/body/individual/individual.ftl @@ -2,9 +2,6 @@ <#-- Template for individual profile page --> -<#-- RY This is actually the person profile page, but we cannot move it to its proper location until selection of template by -annotaiton has been implemented. --> - <#import "lib-list.ftl" as l> <#import "lib-properties.ftl" as p> <#assign core = "http://vivoweb.org/ontology/core#">