diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2014-02-22 19:15:46 -0800 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2014-02-22 19:15:46 -0800 |
| commit | 3249693ea33fdfa17612493e0f7ffc19d7649301 (patch) | |
| tree | 795ebe5fbd2667c0aa9e13ef80d302852ebf8c68 /src/templates | |
| parent | 42503d407a5ec4efdb61a4d009f1bd46ffc8a965 (diff) | |
Adding Author and Feed Cookie.20140222a
* 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.
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/macros/common-page.ftl | 2 | ||||
| -rw-r--r-- | src/templates/macros/common.ftl | 1 | ||||
| -rw-r--r-- | src/templates/templates/communityfeed.ftl | 13 |
3 files changed, 10 insertions, 6 deletions
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> <!doctype html> <html> <head> @@ -24,4 +25,5 @@ </body> </html> + </#compress> </#macro> 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> <div id="thefeed"> <h2>The Feed</h2> @@ -6,8 +7,9 @@ <#assign messages = feeddata.getMessages(chapter, thread.id)> <article> <div class="question" id="${thread.id}"> - Q: ${thread.message.message!""} - <div><a class="reply" href="#" onclick="answerQuestion('${thread.id}'); return false;">Answer</a></div> + <p>Q: ${thread.message.message!""}</p> + <div class="author">By ${thread.message.author.firstName}</div> + <div> <a class="reply" href="#" onclick="answerQuestion('${thread.id}'); return false;">Answer</a></div> </div> <div class="answer hidden" id="answer-${thread.id}"> <form action="${dynamicRoot}/account/feed/${chapter}/${thread.id}" method="post"> @@ -17,9 +19,10 @@ </div> <#list messages as msg> <div class="answer slider" id="${msg.id}"> - A: ${msg.message!""} + <p>A: ${msg.message!""}</p> + <div class="author">By ${thread.message.author.firstName}</div> <#if msg_has_next && msg_index == 0> - <div><a class="readmore" href="#" onclick="showAnswers(this); return false;">(show more)</a></div> + <div><a class="readmore" href="#" onclick="showAnswers(this); return false;">(show more answers)</a></div> </#if> </div> </#list> @@ -34,4 +37,4 @@ </div> </article> </div> - +</#escape> |