summaryrefslogtreecommitdiff
path: root/src/templates
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2014-02-20 21:14:34 -0800
committerJesse Morgan <jesse@jesterpm.net>2014-02-20 21:14:34 -0800
commit379c3fd79c4846b3453c1ad5195ca9b627176f06 (patch)
tree2cda81edbdd023ec3503a959d79b9861b1c13472 /src/templates
parent91f5eb337fb7223cc680582d42f2d31a906cfbca (diff)
Added support for displaying message on Feed.
Changed MessageThread so that a thread always contains one original message. Added support in JsonEncodedProvider for JavaTypes in addition to classes. Updated communityfeed.ftl to actually display questions and answers.
Diffstat (limited to 'src/templates')
-rw-r--r--src/templates/templates/communityfeed.ftl37
1 files changed, 17 insertions, 20 deletions
diff --git a/src/templates/templates/communityfeed.ftl b/src/templates/templates/communityfeed.ftl
index f3e9477..e1ef191 100644
--- a/src/templates/templates/communityfeed.ftl
+++ b/src/templates/templates/communityfeed.ftl
@@ -1,24 +1,21 @@
<div id="thefeed">
<h2>The Feed</h2>
- <article>
- <div class="question">
- Q: How has God worked in your life...
- <div><a class="reply" href="#">Answer</a></div>
- </div>
- <div class="answer">
- A: God has worked in an amazing way in my own life. I constantly
- <a class="readmore" href="#">(continue)</a>
- </div>
- </article>
- <article>
- <div class="question">
- Q: How has God worked in your life...
- <div><a class="reply" href="#">Answer</a></div>
- </div>
- <div class="answer">
- A: God has worked in an amazing way in my own life. I constantly
- <a class="readmore" href="#">(continue)</a>
- </div>
- </article>
+
+ <#assign threads = feeddata.getThreads(chapter)>
+ <#list threads as thread>
+ <#assign messages = feeddata.getMessages(chapter, thread.id)>
+ <article>
+ <div class="question" id="${thread.id}">
+ Q: ${thread.message.message!""}
+ <div><a class="reply" href="#">Answer</a></div>
+ </div>
+ <#list messages as msg>
+ <div class="answer" id="${msg.id}">
+ A: ${msg.message!""}
+ <a class="readmore" href="#">(continue)</a>
+ </div>
+ </#list>
+ </article>
+ </#list>
</div>