diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index 522a23247..c8af38d29 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -1,6 +1,7 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -/* Style for individual display */ +@charset "UTF-8"; +/* CSS Document */ /* <------ INDIVIDUAL INTRO FOR ANY CLASS*/ #individual-intro{ @@ -291,8 +292,8 @@ p.view-all-coauthors{ #property-group-menus li:last-child{ background: none; } -/* PROPERTY GROUPS------> */ -.property-groups{ +/* PROPERTY GROUP------> */ +.property-group{ clear: both; width: 920px; border: 1px solid #dfebe5; @@ -302,27 +303,27 @@ p.view-all-coauthors{ margin-bottom: 20px; overflow: hidden; } -section.property-groups h2{ +section.property-group h2{ padding: 20px 25px 12px 35px; font-size: 20px; color: #2485ae; font-weight: normal; /*background:url(../../images/individual/arrow-down.gif) 120px 24px no-repeat;*/ } -article.property-group{ +article.property{ width: 852px; margin: 0 auto; border: 1px solid #dfe6e5; margin-bottom: 20px; } -article.property-group h3{ +article.property h3{ border-bottom: 1px solid #dfe6e5; background: #fafaf9; font-size: 17px; color: #8aa149; padding: 10px 20px 10px 20px; } -article.property-group .data-property{ +article.property .data-property-statement{ background: #fff; font-size: 16px; color: #5e6363; @@ -330,17 +331,17 @@ article.property-group .data-property{ line-height: 1.2em; margin-bottom: 0; } -article.property-group ul.object-property{ +article.property ul.property-list{ background: #fff; font-size: 16px; color:# 5e6363; } -article.property-group ul.object-property li{ +article.property ul.property-list li{ line-height: 1.2em; padding-bottom: 10px; padding: 10px 20px 10px 20px; } -article.property-group ul.object-property li a{ +article.property ul.property-list li a{ color: #2485ae; } /* MISCELLANEOUS------> */ diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl index d127630c6..35edb4cdf 100644 --- a/webapp/web/templates/freemarker/body/individual/individual.ftl +++ b/webapp/web/templates/freemarker/body/individual/individual.ftl @@ -90,11 +90,11 @@
<#include "individual-sparklineVisualization.ftl"> -
+ <#--

2 publications within the last 10 years

-

All VIVO publications & co-author network.

+

All VIVO publications & co-author network.

-->
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl index 95923eefe..5140f8732 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl @@ -17,7 +17,7 @@ <#assign groupName = ""> -
+
<#-- Display the group heading --> <#if groupName?has_content> @@ -26,23 +26,25 @@ <#-- List the properties in the group --> <#list group.properties as property> -
+
<#-- Property display name -->

${property.name}

<#-- List the statements for each property --> - <#-- data property --> - <#if property.type == "data"> - <#list property.statements as statement> -

${statement.value}

- - - <#-- object property --> - <#elseif property.collatedBySubclass> - <#include "objectPropertyList-collated.ftl"> - <#else> - <#include "objectPropertyList-statements.ftl"> - +
    + <#-- data property --> + <#if property.type == "data"> + <#list property.statements as statement> +

    ${statement.value}

    + + + <#-- object property --> + <#elseif property.collatedBySubclass> + <#include "objectPropertyList-collated.ftl"> + <#else> + <#include "objectPropertyList-statements.ftl"> + +
diff --git a/webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-statements.ftl b/webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-statements.ftl index 799aeb8fc..1b340ae21 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-statements.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-statements.ftl @@ -1,10 +1,8 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- Template to list statements for an object property --> -
    - <#list property.statements as statement> -
  • - <#include "${property.template}"> -
  • - -
+<#list property.statements as statement> +
  • + <#include "${property.template}"> +
  • +