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

Browse source
This commit is contained in:
rjy7 2010-12-17 15:37:34 +00:00
parent dd2cdb9991
commit 92566579f5
3 changed files with 27 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@
<#-- Template for individual profile page -->
<#import "lib-property.ftl" as p>
<#import "lib-list.ftl" as l>
<#assign editingClass>
@ -117,15 +116,14 @@
<nav id="property-group-menus" role="navigation">
<ul role="list">
<li role="listitem"><a href="#propertyGroup1">Affiliations</a></li>
<li role="listitem"><a href="#publications">Publications</a></li>
<li role="listitem"><a href="#research">Research</a></li>
<li role="listitem"><a href="#teaching">Teaching</a></li>
<li role="listitem"><a href="#service">Service</a></li>
<li role="listitem"><a href="#background">Background</a></li>
<li role="listitem"><a href="#contact">Contact</a></li>
<li role="listitem"><a href="#identity">Identity</a></li>
<li role="listitem"><a href="#other">Other</a></li>
<#list propertyGroups as group>
<#assign groupname = groupName(group)>
<#if groupname?has_content>
<#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
function to capitalize all except function words. -->
<li role="listitem"><a href="#${groupname}">${groupname?capitalize}</a></li>
</#if>
</#list>
</ul>
</nav>
@ -150,3 +148,19 @@ ${headScripts.add("/js/jquery_plugins/getUrlParam.js",
"/js/toggle.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
<#-- RY TEMPORARY Replace with Java method on group - pass "other" as a parameter -->
<#function groupName group>
<#if group.name??>
<#if group.name?has_content>
<#assign name = group.name>
<#else>
<#-- This is the group for properties not assigned to any group. It has an empty name. -->
<#assign name = "other">
</#if>
<#else>
<#-- If there are no groups, a dummy group has been created with a null (as opposed to empty) name. -->
<#assign name = "">
</#if>
<#return name>
</#function>

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

@ -4,24 +4,13 @@
<#list propertyGroups as group>
<#-- Get the group name -->
<#if group.name??>
<#if group.name?has_content>
<#assign groupName = group.name>
<#else>
<#-- This is the group for properties not assigned to any group. It has an empty name. -->
<#assign groupName = "other">
</#if>
<#else>
<#-- If there are no groups, a dummy group has been created with a null (as opposed to empty) name. -->
<#assign groupName = "">
</#if>
<#assign groupname = groupName(group)>
<section class="property-group" role="region">
<#-- Display the group heading -->
<#if groupName?has_content>
<h2><a name="${groupName}"></a>${groupName}</h2>
<#if groupname?has_content>
<h2><a name="${groupname}"></a>${groupname}</h2>
</#if>
<#-- List the properties in the group -->

43
webapp/web/templates/freemarker/lib/lib-property.ftl
View file

@ -1,43 +0,0 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Macros for display of individual properties -->
<#--
Macro: dataPropWrapper
Wrap a dataproperty in the appropriate divs
Usage:
<@dataPropWrapper id="myId" editStatus=true>
<#nested>
</@dataPropWrapper>
-->
<#macro dataPropWrapper id editStatus=false>
<div class="datatypePropertyValue" id="${id}">
<div class="statementWrap">
<#nested>
</div>
</div>
</#macro>
<#---------------------------------------------------------------------------->
<#--
Macro: dataPropsWrapper
Wrap a dataproperty in the appropriate divs
Usage:
<@dataPropsWrapper id="myId" editStatus=true>
<#nested>
</@dataPropsWrapper>
-->
<#macro dataPropsWrapper id editStatus=false>
<div class="datatypeProperties">
<@dataPropWrapper id=id editStatus=editStatus>
<#nested>
</@dataPropWrapper>
</div>
</#macro>