From 4b7322e3517777056efbeae26f697c2e19ddd8f2 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Sat, 8 Apr 2017 06:17:52 -0600 Subject: [PATCH] Hide past positions --- .../tenderfoot/css/individual-tenderfoot.css | 4 +++ .../individual/individual-positions.ftl | 32 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css index c8879869..fd824e7d 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css @@ -37,4 +37,8 @@ article.property li h3 { .visualization-buttons { text-align: center; +} + +.pastPosition { + display: none; } \ No newline at end of file diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl new file mode 100644 index 00000000..ca8b440f --- /dev/null +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl @@ -0,0 +1,32 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- List of positions for the individual --> +<#assign positions = propertyGroups.pullProperty("${core}relatedBy", "${core}Position")!> +<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> + <#assign localName = positions.localName> +

${positions.name?capitalize} <@p.addLink positions editable /> <@p.verboseDisplay positions />

+ + + +<#macro positionsList property editable statements=property.statements template=property.template> + <#list statements as statement> + <#if property.rangeUri?? > + <#local rangeUri = property.rangeUri /> + <#else> + <#local rangeUri = "" /> + + <#if statement.dateTimeEnd??> +
  • + <#include "${template}"> + <@p.editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/> +
  • + <#else> +
  • + <#include "${template}"> + <@p.editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/> +
  • + + +