litvinovg/vitro
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:51 +00:00
parent f33d0eac83
commit 43e18bf8af
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webapp/web/css/individual/individual.css
View file

@ -187,26 +187,26 @@ h1.fn .preferred-title {
#individual-info h2{ #individual-info h2{
padding-bottom: 10px; padding-bottom: 10px;
} }
ul#individual-positions{ ul#individual-personInPosition{
list-style-type: circle; list-style-type: circle;
padding-left: 20px; padding-left: 20px;
} }
ul#individual-positions li{ ul#individual-personInPosition li{
line-height: 1em; line-height: 1em;
} }
ul#individual-positions li:last-child{ ul#individual-personInPosition li:last-child{
padding-bottom: 15px; padding-bottom: 15px;
} }
ul#individual-areas{ ul#individual-hasResearchArea{
padding-bottom: 24px; padding-bottom: 24px;
} }
ul#individual-areas li{ ul#individual-hasResearchArea li{
float: left; float: left;
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
border-right: 1px solid #5e6363; border-right: 1px solid #5e6363;
} }
ul#individual-areas li:first-child{ ul#individual-hasResearchArea li:first-child{
padding-left: 0; padding-left: 0;
} }
#individual-info nav{ #individual-info nav{

11
webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
View file

@ -33,6 +33,17 @@
</#list> </#list>
</#macro> </#macro>
<#-- Full object property listing, including heading and ul wrapper element. -->
<#macro objectPropertyListing property editable template=property.template>
<#if property?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#local localName = property.localName>
<h2 id="${localName}">${property.name?capitalize} <@addLink property editable /></h2>
<ul id="individual-${localName}" role="list">
<@p.objectProperty property editable />
</ul>
</#if>
</#macro>
<#macro objectPropertyList property editable statements=property.statements template=property.template> <#macro objectPropertyList property editable statements=property.statements template=property.template>
<#list statements as statement> <#list statements as statement>
<@propertyListItem property statement editable><#include "${template}"></@propertyListItem> <@propertyListItem property statement editable><#include "${template}"></@propertyListItem>