diff --git a/common/lib/xmodule/xmodule/seq_module.py b/common/lib/xmodule/xmodule/seq_module.py index 4c4d9b26af..1bdc289440 100644 --- a/common/lib/xmodule/xmodule/seq_module.py +++ b/common/lib/xmodule/xmodule/seq_module.py @@ -204,6 +204,6 @@ class SequenceDescriptor(SequenceFields, MakoModuleDescriptor, XmlDescriptor): xblock_body["content"].update(html_body) else: xblock_body["content"] = html_body - xblock_body["content_type"] = self.category.title() + xblock_body["content_type"] = "Sequence" return xblock_body diff --git a/lms/static/js/search/views/search_item_view.js b/lms/static/js/search/views/search_item_view.js index 439c4fd357..4811087923 100644 --- a/lms/static/js/search/views/search_item_view.js +++ b/lms/static/js/search/views/search_item_view.js @@ -18,7 +18,8 @@ define([ }, initialize: function () { - this.tpl = _.template($('#search_item-tpl').html()); + var template_name = (this.model.attributes.content_type === "Sequence") ? '#search_item_seq-tpl' : '#search_item-tpl'; + this.tpl = _.template($(template_name).html()); }, render: function () { diff --git a/lms/static/js/spec/search/search_spec.js b/lms/static/js/spec/search/search_spec.js index 49a5636b0d..d283e7446a 100644 --- a/lms/static/js/spec/search/search_spec.js +++ b/lms/static/js/spec/search/search_spec.js @@ -89,6 +89,7 @@ define([ beforeEach(function () { TemplateHelpers.installTemplate('templates/courseware_search/search_item'); + TemplateHelpers.installTemplate('templates/courseware_search/search_item_seq'); this.model = { attributes: { location: ['section', 'subsection', 'unit'], @@ -279,6 +280,7 @@ define([ TemplateHelpers.installTemplates([ 'templates/courseware_search/search_item', + 'templates/courseware_search/search_item_seq', 'templates/courseware_search/search_list', 'templates/courseware_search/search_loading', 'templates/courseware_search/search_error' @@ -416,6 +418,7 @@ define([ ); TemplateHelpers.installTemplates([ 'templates/courseware_search/search_item', + 'templates/courseware_search/search_item_seq', 'templates/courseware_search/search_list', 'templates/courseware_search/search_loading', 'templates/courseware_search/search_error' diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html index a4e81911e2..215036f64a 100644 --- a/lms/templates/courseware/courseware.html +++ b/lms/templates/courseware/courseware.html @@ -24,7 +24,7 @@ ${page_title_breadcrumbs(course_name())} % endfor -% for template_name in ["search_item", "search_list", "search_loading", "search_error"]: +% for template_name in ["search_item", "search_item_seq", "search_list", "search_loading", "search_error"]: diff --git a/lms/templates/courseware_search/search_item.underscore b/lms/templates/courseware_search/search_item.underscore index 4bf7724ce0..77efc34d2c 100644 --- a/lms/templates/courseware_search/search_item.underscore +++ b/lms/templates/courseware_search/search_item.underscore @@ -1,4 +1,4 @@
<%= excerpt %>
<%- content_type %> <%- location.join(' ▸ ') %> -<%= gettext("View") %> +<%= gettext("View") %> diff --git a/lms/templates/courseware_search/search_item_seq.underscore b/lms/templates/courseware_search/search_item_seq.underscore new file mode 100644 index 0000000000..5261d89206 --- /dev/null +++ b/lms/templates/courseware_search/search_item_seq.underscore @@ -0,0 +1,4 @@ +
+ +<%- location.join(' ▸ ') %> +<%= gettext("View") %>