Changeset 7402

Timestamp:

03/11/09 16:52:49 (17 months ago)

Author:

josowski

Message:

Improvements on how we display the competing interest statement

References #1136

Location:

head/ambra

Files:

• libs/js/src/main/scripts/ambra/displayComment.js (modified) (3 diffs)
• webapp/src/main/webapp/discussion/threaded_replies.ftl (modified) (2 diffs)

head/ambra/libs/js/src/main/scripts/ambra/displayComment.js

@@ -263 +263 @@
 
     if (jsonObj.annotation.CIStatement) {
-      ciStatementFrag = this.ciStatementMsg + jsonObj.annotation.CIStatement;
+      ciStatementFrag = "<div class=\"cis\">" + this.ciStatementMsg + jsonObj.annotation.CIStatement + "</div>";
     } else {
-      ciStatementFrag = this.noCIStatementMsg;
+      ciStatementFrag = "<div class=\"cis\">" + this.noCIStatementMsg + "</div>";
     }
 
@@ -388 +388 @@
     }
 
-    contentDiv.innerHTML = this.buildDisplayBody(jsonObj);
+    contentDiv.innerHTML = this.buildDisplayBody(jsonObj) + this.buildDisplayCIStatement(jsonObj);
     
     var cDetailDiv = document.createElement('div');
@@ -406 +406 @@
     cDetailDiv.appendChild(commentLink);
     cDetailDiv.appendChild(responseLink);*/
-    cDetailDiv.appendChild(this.buildDisplayCIStatement(jsonObj));
     cDetailDiv.appendChild(this.buildDisplayViewLink(jsonObj));
     contentDiv.appendChild(cDetailDiv);

head/ambra/webapp/src/main/webapp/discussion/threaded_replies.ftl

@@ -39 +39 @@
                                 <blockquote>
                                         ${reply.commentWithUrlLinking}
-                                </blockquote>
-                                <blockquote class="cis">
-        <#if reply.CIStatement??>
-          <b>Competing interests declared:</b> ${reply.CIStatement}
-        <#else>
-          <b>No competing interests declared.</b>
-        </#if>
+          <div class="cis">
+          <#if reply.CIStatement??>
+            <b>Competing interests declared:</b> ${reply.CIStatement}
+          <#else>
+            <b>No competing interests declared.</b>
+          </#if>
+          </div>
                                 </blockquote>
                                 <!-- end : response body text -->
@@ -102 +102 @@
                                 ${baseAnnotation.commentWithUrlLinking}
                                 <#if citation??><div class="citation"><strong>Citation: </strong><#assign isCorrection=true/><#if baseAnnotation.type?index_of("Retraction") gte 0><#assign isRetraction=true/><#else><#assign isRetraction=false/></#if><#assign doi=baseAnnotation.id?replace("info:doi/","") /><#include "/article/citation.ftl"/></#if>
+        <div class="cis">
+          <#if baseAnnotation.CIStatement??>
+            <b>Competing interests declared:</b> ${baseAnnotation.CIStatement}
+          <#else>
+            <b>No competing interests declared.</b>
+          </#if>
+        </div>
                         </blockquote>
-      <blockquote class="cis">
-        <#if baseAnnotation.CIStatement??>
-          <b>Competing interests declared:</b> ${baseAnnotation.CIStatement}
-        <#else>
-          <b>No competing interests declared.</b>
-        </#if>
-      </blockquote>
                         <!-- end : response body text -->
                         <!-- begin : toolbar options -->