Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use separate templates for forum view and inline view

Browse Source
This commit is contained in:
Rocky Duan
2012-08-01 13:02:57 -04:00
parent 777c3ee42c
commit 51772c04f3
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/djangoapps/django_comment_client/forum/views.py
View File

@@ -29,7 +29,7 @@ def render_accordion(request, course, discussion_id):
return render_to_string('discussion/accordion.html', context)
def render_discussion(request, course_id, threads, discussion_id=None, with_search_bar=True, search_text=''):
def render_discussion(request, course_id, threads, discussion_id=None, with_search_bar=True, search_text='', template='discussion/inline.html'):
context = {
'threads': threads,
'discussion_id': discussion_id,
@@ -40,11 +40,17 @@ def render_discussion(request, course_id, threads, discussion_id=None, with_sear
'course_id': course_id,
'request': request,
}
return render_to_string('discussion/inline.html', context)
return render_to_string(template, context)
def render_inline_discussion(*args, **kwargs):
return render_discussion(template='discussion/inline.html', *args, **kwargs)
def render_forum_discussion(*args, **kwargs):
return render_discussion(template='discussion/forum.html', *args, **kwargs)
def inline_discussion(request, course_id, discussion_id):
threads = comment_client.get_threads(discussion_id, recursive=False)
html = render_discussion(request, course_id, threads, discussion_id=discussion_id)
html = render_inline_discussion(request, course_id, threads, discussion_id=discussion_id)
return HttpResponse(html, content_type="text/plain")
def render_search_bar(request, course_id, discussion_id=None, text=''):
@@ -71,7 +77,7 @@ def forum_form_discussion(request, course_id, discussion_id):
context = {
'csrf': csrf(request)['csrf_token'],
'course': course,
'content': render_discussion(request, course_id, threads, discussion_id=discussion_id, search_text=search_text),
'content': render_forum_discussion(request, course_id, threads, discussion_id=discussion_id, search_text=search_text),
'accordion': render_accordion(request, course, discussion_id),
}
@@ -133,7 +139,7 @@ def search(request, course_id):
context = {
'csrf': csrf(request)['csrf_token'],
'init': '',
'content': render_discussion(request, course_id, threads, search_text=text),
'content': render_forum_discussion(request, course_id, threads, search_text=text),
'accordion': '',
'course': course,
}

25
lms/templates/discussion/forum.html Normal file
View File

@@ -0,0 +1,25 @@
<%namespace name="renderer" file="thread.html"/>
<section class="discussion" _id="${discussion_id}">
<div class="discussion-non-content">
<div class="discussion-title-wrapper">
<a class="discussion-title" href="javascript:void(0)">Discussion</a>
</div>
${search_bar}
<div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
</div>
% for thread in threads:
${renderer.render_thread(course_id, thread, edit_thread=False, show_comments=False)}
% endfor
</section>
<%!
def escape_quotes(text):
return text.replace('\"', '\\\"').replace("\'", "\\\'")
%>
<script type="text/javascript">
var $$user_info = JSON.parse('${user_info | escape_quotes}');
var $$course_id = "${course_id}";
var $$tags = JSON.parse("${tags | escape_quotes}");
</script>