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

Moved display of personInPosition and hasResearchArea properties to a macro. Adjusted css selectors accordingly to align with auto-generated ids.

Browse source
This commit is contained in:
rjy7 2011-01-27 16:07:55 +00:00
parent 00998c2cb0
commit c633d3fbd0
2 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -111,12 +111,7 @@
<#-- Positions --> <#-- Positions -->
<#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <@p.objectPropertyListing positions editable />
<h2 id="${positions.localName}">${positions.name?capitalize} <@p.addLink positions editable /></h2>
<ul id="individual-positions" role="list">
<@p.objectProperty positions editable />
</ul>
</#if>
</header> </header>
<#-- Overview --> <#-- Overview -->
@ -124,12 +119,7 @@
<#-- 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) --> <@p.objectPropertyListing researchAreas editable />
<h2 id="${researchAreas.localName}">${researchAreas.name?capitalize} <@p.addLink researchAreas editable /></h2>
<ul id="individual-areas" role="list">
<@p.objectProperty researchAreas editable "propStatement-simple.ftl" />
</ul>
</#if>
</section> </section>
</section> </section>

14
themes/wilma/css/wilma.css
View file

@ -1078,14 +1078,14 @@ h1.fn .preferred-title {
font-size: 1.125em; font-size: 1.125em;
line-height: 1.2em; line-height: 1.2em;
} }
ul#individual-positions{ ul#individual-personInPosition {
font-size: 1em; font-size: 1em;
list-style: url("../../../images/individual/arrow-green.gif"); list-style: url("../../../images/individual/arrow-green.gif");
} }
ul#individual-positions li{ ul#individual-personInPosition li{
line-height: 1.8em; line-height: 1.8em;
} }
ul#individual-positions li a{ ul#individual-personInPosition li a{
color: #2485ae; color: #2485ae;
} }
.individual-overview{ .individual-overview{
@ -1094,16 +1094,16 @@ ul#individual-positions li a{
padding-top: 10px; padding-top: 10px;
width: 100%; width: 100%;
} }
ul#individual-areas{ ul#individual-hasResearchArea{
padding-bottom: 24px; padding-bottom: 24px;
} }
ul#individual-areas li{ ul#individual-hasResearchArea li{
border-right: 1px solid #A6B1B0; border-right: 1px solid #A6B1B0;
} }
ul#individual-areas li:last-child{ ul#individual-hasResearchArea li:last-child{
border-right: none; border-right: none;
} }
ul#individual-areas li a{ ul#individual-hasResearchArea li a{
color: #2485ae; color: #2485ae;
} }
/* INDIVIDUAL VISUALIZATION ------> */ /* INDIVIDUAL VISUALIZATION ------> */