From a2a1d7a67b1458cc342c0eb8d5a2732c806ddacf Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Thu, 20 Feb 2014 21:14:34 -0800 Subject: 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. --- src/templates/templates/communityfeed.ftl | 37 ++++++++++++++----------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'src/templates') 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 @@

The Feed

-
-
- Q: How has God worked in your life... -
Answer
-
-
- A: God has worked in an amazing way in my own life. I constantly - (continue) -
-
-
-
- Q: How has God worked in your life... -
Answer
-
-
- A: God has worked in an amazing way in my own life. I constantly - (continue) -
-
+ + <#assign threads = feeddata.getThreads(chapter)> + <#list threads as thread> + <#assign messages = feeddata.getMessages(chapter, thread.id)> +
+
+ Q: ${thread.message.message!""} +
Answer
+
+ <#list messages as msg> +
+ A: ${msg.message!""} + (continue) +
+ +
+
-- cgit v1.2.3