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

Merge pull request #16961 from edx/schen/EDUCATOR-1549

Browse Source 
Programmatically indicate nested discussions in filter
This commit is contained in:
Simon Chen
2017-12-19 13:40:05 -05:00
committed by GitHub
parent e063a8bdd8 3de6e7789b
commit 131b14b111
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lms/templates/discussion/_filter_dropdown.html
View File

@@ -5,37 +5,47 @@ from lms.djangoapps.django_comment_client.constants import TYPE_ENTRY
from openedx.core.djangolib.markup import HTML
%>
<%def name="render_dropdown(map)">
<%def name="render_dropdown(map, topic_list)">
% for child, c_type in map["children"]:
% if child in map["entries"] and c_type == TYPE_ENTRY:
${HTML(render_entry(map["entries"], child))}
${HTML(render_entry(map["entries"], child, topic_list))}
%else:
${HTML(render_category(map["subcategories"], child))}
${HTML(render_category(map["subcategories"], child, topic_list))}
%endif
%endfor
</%def>
<%def name="render_entry(entries, entry)">
<%def name="render_entry(entries, entry, topic_list)">
<li
class="forum-nav-browse-menu-item"
data-discussion-id='${entries[entry]["id"]}'
id='${entries[entry]["id"]}'
data-divided="${str(entries[entry]['is_divided']).lower()}"
role="option"
role="presentation"
>
% if entry:
<span class="forum-nav-browse-title">${entry}</span>
%endif
%if entry:
<span class="forum-nav-browse-title" role="option">
%if topic_list:
<span class="sr">
${', '.join(topic_list)},
</span>
%endif
${entry}
</span>
%endif
</li>
</%def>
<%def name="render_category(categories, category)">
<%def name="render_category(categories, category, topic_list)">
<li class="forum-nav-browse-menu-item"
id='${category | u}'
role="presentation"
>
<span class="forum-nav-browse-title">${category}</span>
<ul class="forum-nav-browse-submenu">
${HTML(render_dropdown(categories[category]))}
<span class="forum-nav-browse-title" role="option">${category}</span>
<ul class="forum-nav-browse-submenu" role="presentation">
<% topic_list.append(category) %>
${HTML(render_dropdown(categories[category], topic_list))}
<% topic_list.remove(category) %>
</ul>
</li>
</%def>
@@ -49,13 +59,13 @@ from openedx.core.djangolib.markup import HTML
</label>
</form>
<ul class="forum-nav-browse-menu" role="listbox" id="discussion_topics_listbox">
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-all" role="option" id="all_discussions">
<span class="forum-nav-browse-title">${_("All Discussions")}</span>
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-all" role="presentation" id="all_discussions">
<span class="forum-nav-browse-title" role="option">${_("All Discussions")}</span>
</li>
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-following" role="option" id="posts_following">
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-following" role="presentation" id="posts_following">
<span class="icon fa fa-star" aria-hidden="true"></span>
<span class="forum-nav-browse-title">${_("Posts I'm Following")}</span>
<span class="forum-nav-browse-title" role="option">${_("Posts I'm Following")}</span>
</li>
${HTML(render_dropdown(category_map))}
${HTML(render_dropdown(category_map, []))}
</ul>
</div>