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

1) Added code for testing if an individual is an organization in IndividualTemplateModel.java

Browse source 
2) Couple of changes to the css of table in Temporal graph. -- in demo_table.css
3) Added section for temporal graph icon in individual.ftl
This commit is contained in:
bkoniden 2011-01-03 22:49:51 +00:00
parent 675adfab19
commit 4dac98f9c0
3 changed files with 70 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
View file

@ -79,6 +79,10 @@ public class IndividualTemplateModel extends BaseTemplateModel {
return individual.isVClass("http://xmlns.com/foaf/0.1/Person");
}
public boolean isOrganization() {
return individual.isVClass("http://xmlns.com/foaf/0.1/Organization");
}
public String getSearchView() {
return getView(ClassView.SEARCH);
}

60
webapp/web/js/jquery_plugins/datatable/demo_table.css
View file

@ -4,13 +4,8 @@ thead th, tr.even td{
background-color: white;
}
.searchbar{
margin-bottom: 15px;
text-align: center;
}
.paginatedtabs{
border-top: 1px #3D454E solid;
/* border-top: 1px #3D454E solid; */
text-align: center;
margin-bottom: 10px;
padding-top: 10px;
@ -22,19 +17,64 @@ thead th, tr.even td{
cursor: pointer;
}
.datatablewrapper td, th{
border-bottom: 1px #3D454E solid;
border-right: 1px #3D454E solid;
border-left: 1px #3D454E solid;
text-align: left;
padding: 5px;
}
.showentries {
text-align: center;
margin-bottom: 10px;
}
.datatablewrapper td{
border-bottom: 1px #3D454E solid;
border-right: 1px #3D454E solid;
.searchbar{
margin-bottom: 15px;
text-align: left;
}
.datatablewrapper th{
border-top: 1px #3D454E solid;
}
/*
.datatablewrapper th{
border-top: 1px #3D454E solid;
border-bottom: 1px #3D454E solid;
border-right: 1px #3D454E solid;
padding: 5px;
}
}
*/
.sorting_asc {
background: url('sort_asc.png') no-repeat center right;
}
.sorting_desc {
background: url('sort_desc.png') no-repeat center right;
}
.sorting {
background: url('sort_both.png') no-repeat center right;
}
.sorting_asc_disabled {
background: url('sort_asc_disabled.png') no-repeat center right;
}
.sorting_desc_disabled {
background: url('sort_desc_disabled.png') no-repeat center right;
}
tr.odd {
background-color: #E2E4FF;
}
tr.even {
background-color: white;
}

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

@ -2,11 +2,7 @@
<#-- 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 editingClass>
<#if editStatus.showEditLinks>editing<#else></#if>
@ -74,22 +70,15 @@ annotaiton has been implemented. -->
</ul>
</header>
<#-- Overview -->
<#assign overview = propertyGroups.getPropertyAndRemoveFromList("http://vivoweb.org/ontology/core#overview")>
<#if overview?has_content>
<p class="individual-overview">${overview.value}</p>
</#if>
<p class="individual-overview">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed est erat, tristique non bibendum eu, mollis non est. Cras vehicula velit quis elit porta vel molestie tellus blandit. Donec eget magna dolor. Phasellus faucibus mollis lorem at dapibus. Sed ultricies lobortis mauris in volutpat. Cras mattis neque ut sapien pellentesque fringilla. Mauris posuere dui quis massa mattis id mollis nibh accumsan. [+]</p>
<#-- Research Areas -->
<#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("http://vivoweb.org/ontology/core#hasResearchArea")>
<#if researchAreas?has_content>
<h2>Research Areas</h2>
<ul id="individual-areas" role="list">
<@p.objectProperty researchAreas />
</ul>
</#if>
<h2>Research Areas</h2>
<ul id ="individual-areas" role="list">
<li role="listitem"><a href="#">Researcher (5)</a></li>
<li role="listitem"><a href="#">Principal Investigator (3)</a></li>
<li role="listitem"><a href="#">Teacher (2)</a></li>
</ul>
</section>
</section>
@ -97,6 +86,14 @@ annotaiton has been implemented. -->
<section id="sparklines-publications" role="region">
<#include "individual-sparklineVisualization.ftl">
<#if individual.organization >
<div style="width: 100%;">
<div style="width: 30%;float:left;margin-top: 5%;margin-right: 10px;"><img src="${urls.images}/visualization/temporal_vis_icon.jpg"/></div>
<div><h3>Temporal Graph <br/><a class="view-all-style" href="${urls.base}/visualization?vis=entity_comparison&vis_mode=${individual.moniker}&render_mode=standalone&uri=${individual.uri}">View <span class= "pictos-arrow-10">4</span></a></h3></div>
</div>
<#--<div>VISMODE: ${individual.moniker}</div>-->
</#if>
<#--<header><img src="${urls.home}/images/individual/sparkline.gif" alt="" />
<h3><span class="grey">2</span> publications <span class="publication-year-range grey">within the last 10 years</span></h3>
</header>