diff options
| author | Jesse Morgan <jesse@jesterpm.net> | 2014-02-22 18:15:15 -0800 |
|---|---|---|
| committer | Jesse Morgan <jesse@jesterpm.net> | 2014-02-22 18:15:15 -0800 |
| commit | 42503d407a5ec4efdb61a4d009f1bd46ffc8a965 (patch) | |
| tree | 59933de4d81225f748a218f84c80f5e3edea77ce /src/templates | |
| parent | 9526fe75f2343e50f35c436dc0b4a4beb7de7eff (diff) | |
Adding support to post new messages.
Other Changes:
* JsonEncodedProvider no longer implements Provider.
* Only the first answer is shown. Others slide down.
* Switch going deeper and the feed.
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/templates/communityfeed.ftl | 10 | ||||
| -rw-r--r-- | src/templates/templates/training.ftl | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/templates/templates/communityfeed.ftl b/src/templates/templates/communityfeed.ftl index b80ef9c..632a201 100644 --- a/src/templates/templates/communityfeed.ftl +++ b/src/templates/templates/communityfeed.ftl @@ -10,22 +10,24 @@ <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}/feed/${chapter}/${thread.id}" method="post"> + <form action="${dynamicRoot}/account/feed/${chapter}/${thread.id}" method="post"> <textarea name="question" rows="5" defaultValue="Write your reply."></textarea> <div><a class="send" href="#" onclick="$(this).closest('form').submit(); return false;">Send</a></div> </form> </div> <#list messages as msg> - <div class="answer" id="${msg.id}"> + <div class="answer slider" id="${msg.id}"> A: ${msg.message!""} - <#--<a class="readmore" href="#">(continue)</a>--> + <#if msg_has_next && msg_index == 0> + <div><a class="readmore" href="#" onclick="showAnswers(this); return false;">(show more)</a></div> + </#if> </div> </#list> </article> </#list> <article> <div class="question"> - <form action="${dynamicRoot}/feed/${chapter}" name="newquestion" method="post"> + <form action="${dynamicRoot}/account/feed/${chapter}" name="newquestion" method="post"> <textarea name="question" rows="5" defaultValue="Ask your own question."></textarea> <div><a class="send" href="#" onclick="$(this).closest('form').submit(); return false;">Send</a></div> </form> diff --git a/src/templates/templates/training.ftl b/src/templates/templates/training.ftl index 65ca5d9..ca1ebbd 100644 --- a/src/templates/templates/training.ftl +++ b/src/templates/templates/training.ftl @@ -66,10 +66,6 @@ </#list> </div> - <#if showfeed!false> - <#include "/templates/communityfeed.ftl"> - </#if> - <#if deeperinclude?has_content> <div id="deeper"> <h2>Going Deeper</h2> @@ -81,6 +77,10 @@ <#include deeperinclude> </div> </#if> + + <#if showfeed!false> + <#include "/templates/communityfeed.ftl"> + </#if> </div> <div id="videoplayer"> |