NIHVIVO-1316: Added Research Areas label, remove pictos fonts, added uri link, added new admin panel, and changed markup for visualitation.

This commit is contained in:
mb863 2011-01-21 03:24:14 +00:00
parent e758396216
commit 2c7d396b59

View file

@ -4,10 +4,6 @@
<#include "individual-setup.ftl"> <#include "individual-setup.ftl">
<#if individual.showAdminPanel>
<#include "individual-adminPanel.ftl">
</#if>
<section id="individual-intro-person" class="vcard" role="region"> <section id="individual-intro-person" class="vcard" role="region">
<section id="share-contact" role="region"> <section id="share-contact" role="region">
@ -17,12 +13,14 @@
<nav role="navigation"> <nav role="navigation">
<ul id ="individual-tools-people" role="list"> <ul id ="individual-tools-people" role="list">
<#--<li role="listitem"><a class="picto-font picto-uri" href="#">j</a></li> <#assign uriUrl = individual.uri>
<li role="listitem"><a class="picto-font picto-pdf" href="#">F</a></li> <#if uriUrl??>
<li role="listitem"><a class="picto-font picto-share" href="#">R</a></li>--> <li role="listitem"><a title="Individual uri" href="${uriUrl}"><img class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon" /></a></li>
</#if>
<#assign rdfUrl = individual.rdfUrl> <#assign rdfUrl = individual.rdfUrl>
<#if rdfUrl??> <#if rdfUrl??>
<li role="listitem"><a class="icon-rdf-people" href="${rdfUrl}">RDF</a></li> <li role="listitem"><a title="View this individual in RDF format" class="icon-rdf" href="${rdfUrl}">RDF</a></li>
</#if> </#if>
</ul> </ul>
</nav> </nav>
@ -64,6 +62,10 @@
</section> </section>
<section id="individual-info" role="region"> <section id="individual-info" role="region">
<#if individual.showAdminPanel>
<#include "individual-adminPanel.ftl">
</#if>
<header> <header>
<#if relatedSubject??> <#if relatedSubject??>
<h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2> <h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2>
@ -73,7 +75,7 @@
<#-- Label --> <#-- Label -->
<#assign label = individual.nameStatement> <#assign label = individual.nameStatement>
${label.value} ${label.value}
<@p.editingLinks label label editable /> <#-- <@p.editingLinks label label editable /> -->
<#-- Moniker --> <#-- Moniker -->
<#if individual.moniker?has_content> <#if individual.moniker?has_content>
@ -100,8 +102,9 @@
<#-- Research Areas --> <#-- Research Areas -->
<#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!>
<#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#--<h2>Research Areas <@p.addLink researchAreas editing /></h2> --> <h2>Research Areas <@p.addLink researchAreas editable /></h2>
<@p.addLinkWithLabel researchAreas editable />
<#--<@p.addLinkWithLabel researchAreas editable />-->
<#if researchAreas.statements?has_content> <#-- if there are any statements --> <#if researchAreas.statements?has_content> <#-- if there are any statements -->
<ul id="individual-areas" role="list"> <ul id="individual-areas" role="list">
<@p.simpleObjectPropertyList researchAreas editable/> <@p.simpleObjectPropertyList researchAreas editable/>
@ -112,7 +115,7 @@
</section> </section>
</section> </section>
<section id="publications-visualization" role="region"> <section id="visualization" role="region">
<section id="sparklines-publications" role="region"> <section id="sparklines-publications" role="region">
<#include "individual-sparklineVisualization.ftl"> <#include "individual-sparklineVisualization.ftl">
</section> </section>