From 84e2aa4967ff9e5e3b1e514bf34c00aaa18ba86c Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 22 May 2014 17:22:38 -0400
Subject: [PATCH] VIVO-748: enable display of bulleted items on data properties

---
 webapp/web/css/individual/individual.css         | 16 ++++++++++++++++
 .../individual/propStatement-dataDefault.ftl     | 12 +++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css
index 92d24ec93..d9e5fc29b 100644
--- a/webapp/web/css/individual/individual.css
+++ b/webapp/web/css/individual/individual.css
@@ -284,4 +284,20 @@ a#manageLabels {
 /* <---- OpenSocial -----*/
 div#openSocial {
     display:inline-block;
+}
+/* MISC */
+ul.tinyMCEDisc {
+    list-style-type: disc;
+    margin-bottom: 10px;
+}
+ol.tinyMCENumeric {
+    list-style-type: decimal;
+}
+ul.tinyMCEDisc li {
+    padding: 0 !important;
+    margin-left: 30px;
+}
+ol.tinyMCENumeric li {
+    padding: 0 !important;
+    margin-left: 30px;
 }
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
index 5adbc6071..4c049c74a 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-dataDefault.ftl
@@ -9,7 +9,17 @@
 <@showStatement statement />
 
 <#macro showStatement statement>
-    ${statement.value!}
+    <#assign theValue = statement.value />
+    <#if theValue?contains("<ul>") >
+        <#assign theValue = theValue?replace("<ul>","<ul class='tinyMCEDisc'>") />
+    </#if>
+    <#if theValue?contains("<ol>") >
+        <#assign theValue = theValue?replace("<ol>","<ol class='tinyMCENumeric'>") />
+    </#if>
+    <#if theValue?contains("<p>") >
+        <#assign theValue = theValue?replace("<p>","")?replace("</p>","") />
+    </#if>
+    ${theValue}
 </#macro>