litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1459 Add annotation for foaf:Person custom display view. Add template individual--foaf-person.ftl. Removed unused templates.

Browse source
This commit is contained in:
rjy7 2011-01-04 16:38:22 +00:00
parent ab927b494a
commit d292100f8b
4 changed files with 4 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/EntityController.java
View file

@ -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());

210
webapp/web/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -1,210 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<section id="individual-intro-person" class="vcard">
<section id="left-side"> <img class="individual-photo2" src="${urls.images}/individual/individual--foaf-person.png" /><!-- mb863 get rid off div-->
<nav>
<ul id ="individual-tools-people">
<li><a class="picto-font picto-uri" href="#">j</a></li>
<li><a class="picto-font picto-pdf" href="#">F</a></li>
<li><a class="picto-font picto-share" href="#">R</a></li>
<li><a class="icon-rdf" href="#">RDF</a></li>
</ul>
</nav>
<a class="email" href="#"><span class ="picto-font picto-email">M</span> email@cornell.edu</a> <a class="tel" href="#"><img class ="icon-phone" src="${urls.images}/individual/phone-icon.gif" />555 567 7878</a>
<nav>
<ul id ="individual-urls-people">
<li><a href="#">&lt;core:PrimaryURLLink&gt;</a></li>
<li><a href="#">&lt;core:URLLink&gt;</a></li>
<li><a href="#">&lt;core:URLLink&gt;</a></li>
<li><a href="#">&lt;core:URLLink&gt;</a></li>
</ul>
</nav>
</section>
<section id="individual-info">
<header>
<h1 class="fn">Hayworth, Rita<span class="preferred-title">Actress, dancer</span></h1>
<h2>Current Positions</h2>
<ul id ="individual-positions">
<li><a href="#">Dancing in heaven with other famous people</a></li>
<li><a href="#">Sabbatic year for ever</a></li>
</ul>
</header>
<p class="individual-overview">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 [+]</p>
<h2>Research Areas</h2>
<ul id ="individual-areas">
<li><a href="#">Researcher (5)</a></li>
<li><a href="#">Principal Investigator (3)</a></li>
<li><a href="#">Teacher (2)</a></li>
</ul>
</div>
</section>
<section id="publications-visualization">
<section id="sparklines-publications">
<header><img src="${urls.home}/images/individual/sparkline.gif" />
<h3><span class="grey">2</span> publications <span class="publication-year-range grey">within the last 10 years</span></h3>
</header>
<p><a class="all-vivo-publications" href="#">All VIVO publications & co-author network.</a></p>
</section>
<section id="co-authors">
<header>
<h3><span class="grey">10 </span>Co-Authors</h3>
</header>
<ul>
<li><a href="#"><img class="co-author" src="${urls.images}/individual/Bacall.jpg" /></a></li>
<li><a href="#"><img class="co-author" src="${urls.images}/individual/Bogart.jpg" /></a></li>
<li><a href="#"><img class="co-author" src="${urls.images}/individual/Gable.jpg" /></a></li>
<li><a href="#"><img class="co-author" src="${urls.images}/individual/Grant.jpg" /></a></li>
<li><a href="#"><img class="co-author" src="${urls.images}/individual/Leigh.jpg" /></a></li>
<li><a href="#"><img class="co-author" src="${urls.images}/individual/Welles.jpg" /></a></li>
</ul>
<p class="view-all-coauthors"><a class="view-all-style" href="#">View All <span class="pictos-arrow-10">4</span></a></p>
</section>
</section>
<nav id="property-group-menus">
<ul>
<li><a href="#propertyGroup1">Affiliations</a></li>
<li><a href="#publications">Publications</a></li>
<li><a href="#research">Research</a></li>
<li><a href="#teaching">Teaching</a></li>
<li><a href="#service">Service</a></li>
<li><a href="#background">Background</a></li>
<li><a href="#contact">Contact</a></li>
<li><a href="#identity">Identity</a></li>
<li><a href="#other">Other</a></li>
</ul>
</nav>
<section class="property-groups">
<h2><a name="affiliations"></a>Affiliation</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">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.</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="research"></a>Research</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">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.</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="teaching"></a>Teaching</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="publications"></a>Publications</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>

177
webapp/web/templates/freemarker/body/individual/individual--generic-class.ftl
View file

@ -1,177 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<section id="individual-intro">
<h1>&lt;individualName&gt;<span class="preferred-title">Moniker</span></h1>
<nav>
<ul id ="individual-tools">
<li><a class="picto-font picto-uri" href="#">j</a></li>
<li><a class="picto-font picto-share" href="#">R</a></li>
<li><a class="icon-rdf" href="#">RDF</a></li>
</ul>
</nav>
<nav>
<ul id ="individual-urls">
<li><a href="#">&lt;core:PrimaryURLLink&gt;</a></li>
<li><a href="#">&lt;core:URLLink&gt;</a></li>
<li><a href="#">&lt;core:URLLink&gt;</a></li>
<li><a href="#">&lt;core:URLLink&gt;</a></li>
</ul>
</nav>
</section>
<nav id="property-group-menus">
<ul>
<li><a href="#propertyGroup1">&lt;propertyGroup1&gt;</a></li>
<li><a href="#propertyGroup2">&lt;propertyGroup2&gt;</a></li>
<li><a href="#propertyGroup3">&lt;propertyGroup3&gt;</a></li>
<li><a href="#propertyGroup4">&lt;propertyGroup4&gt;</a></li>
<li><a href="#propertyGroupN">&lt;propertyGroupN&gt;</a></li>
</ul>
</nav>
<section class="property-groups">
<h2><a name="propertyGroup1"></a>propertyGroup1</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">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.</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="propertyGroup2"></a>propertyGroup2</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">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.</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="propertyGroup3"></a>propertyGroup3</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="propertyGroup4"></a>propertyGroup4</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>
<section class="property-groups">
<h2><a name="propertyGroupN"></a>propertyGroupN</h2>
<article class="property-group">
<h3>property-label</h3>
<p class="data-property">data property</p>
</article>
<article class="property-group">
<h3>property-label</h3>
<ul class="object-property">
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
<li><a href="#">&lt;object property&gt;</a> | Moniker</li>
</ul>
</article>
</section>

3
webapp/web/templates/freemarker/body/individual/individual.ftl
View file

@ -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#">