From 8712e249976e4d57d58fe15df15ae83e59ddbfff Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sat, 22 Feb 2014 19:15:46 -0800 Subject: Adding Author and Feed Cookie. * Adding an Author indicator on the feed. * Adding showfeed cookie to enable/disable feed demo. * Hiding the feed on the introduction chapter. * Adding whitespace compression to all pages. --- src/templates/macros/common-page.ftl | 2 ++ src/templates/macros/common.ftl | 1 - src/templates/templates/communityfeed.ftl | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/templates') diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 94cc5e3..1780036 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -1,4 +1,5 @@ <#macro commonpage> + <#compress> @@ -24,4 +25,5 @@ + diff --git a/src/templates/macros/common.ftl b/src/templates/macros/common.ftl index 513fc57..d388a4e 100644 --- a/src/templates/macros/common.ftl +++ b/src/templates/macros/common.ftl @@ -1,5 +1,4 @@ <#include "content.ftl"> <#include "noticebox.ftl"> - <#assign dynamicRoot = ""> <#assign staticRoot = ""> diff --git a/src/templates/templates/communityfeed.ftl b/src/templates/templates/communityfeed.ftl index 632a201..7e0fda5 100644 --- a/src/templates/templates/communityfeed.ftl +++ b/src/templates/templates/communityfeed.ftl @@ -1,3 +1,4 @@ +<#escape x as x?html>

The Feed

@@ -6,8 +7,9 @@ <#assign messages = feeddata.getMessages(chapter, thread.id)>
- Q: ${thread.message.message!""} -
Answer
+

Q: ${thread.message.message!""}

+
By ${thread.message.author.firstName}
+
Answer
<#list messages as msg>
- A: ${msg.message!""} +

A: ${msg.message!""}

+
By ${thread.message.author.firstName}
<#if msg_has_next && msg_index == 0> -
(show more)
+
(show more answers)
@@ -34,4 +37,4 @@
- + -- cgit v1.2.3