Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
5f207518
Commit
5f207518
authored
Aug 01, 2012
by
Rocky Duan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use separate templates for forum view and inline view
parent
8f596e4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
5 deletions
+36
-5
lms/djangoapps/django_comment_client/forum/views.py
+11
-5
lms/templates/discussion/forum.html
+25
-0
No files found.
lms/djangoapps/django_comment_client/forum/views.py
View file @
5f207518
...
...
@@ -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
,
}
...
...
lms/templates/discussion/forum.html
0 → 100644
View file @
5f207518
<
%
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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment