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

Merge pull request #7085 from edx/dcikatic/SOL-258

Browse Source 
SOL-258 Removing preview and content type from search list for sequence ...
This commit is contained in:
Martyn James
2015-03-10 11:55:33 -04:00
parent 918b184ea2 bfa625ea78
commit af14d222fc
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/seq_module.py
View File

@@ -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

3
lms/static/js/search/views/search_item_view.js
View File

@@ -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 () {

3
lms/static/js/spec/search/search_spec.js
View File

@@ -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'

2
lms/templates/courseware/courseware.html
View File

@@ -24,7 +24,7 @@ ${page_title_breadcrumbs(course_name())}
</script>
% 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"]:
<script type="text/template" id="${template_name}-tpl">
<%static:include path="courseware_search/${template_name}.underscore" />
</script>

2
lms/templates/courseware_search/search_item.underscore
View File

@@ -1,4 +1,4 @@
<div class='sri-excerpt'><%= excerpt %></div>
<span class='sri-type'><%- content_type %></span>
<span class='sri-location'><%- location.join(' ▸ ') %></span>
<a class="sri-link" href="<%- url %>"><%= gettext("View") %> <i class="icon-arrow-right"></i></a>
<a class="sri-link" href="<%- url %>"><%= gettext("View") %> <i class="icon fa fa-arrow-right"></i></a>

4
lms/templates/courseware_search/search_item_seq.underscore Normal file
View File

@@ -0,0 +1,4 @@
<div class='sri-excerpt'></div>
<span class='sri-type'></span>
<span class='sri-location'><%- location.join(' ▸ ') %></span>
<a class="sri-link" href="<%- url %>"><%= gettext("View") %> <i class="icon fa fa-arrow-right"></i></a>