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
71d66316
Commit
71d66316
authored
Feb 02, 2015
by
Davorin Sego
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Courseware search: Change name of results page from "Searching [course name]"
and patch up some style issues
parent
76010467
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
lms/static/js/search/views/search_list_view.js
+0
-1
lms/static/js/spec/search/search_spec.js
+0
-1
lms/static/sass/course/courseware/_courseware_search.scss
+3
-2
lms/templates/courseware_search/search_list.underscore
+4
-4
No files found.
lms/static/js/search/views/search_list_view.js
View file @
71d66316
...
...
@@ -31,7 +31,6 @@ define([
render
:
function
()
{
this
.
$el
.
html
(
this
.
listTemplate
({
courseName
:
this
.
courseName
,
totalCount
:
this
.
collection
.
totalCount
,
totalCountMsg
:
this
.
totalCountMsg
(),
pageSize
:
this
.
collection
.
pageSize
,
...
...
lms/static/js/spec/search/search_spec.js
View file @
71d66316
...
...
@@ -348,7 +348,6 @@ define([
this
.
listView
.
render
();
expect
(
this
.
listView
.
$el
.
find
(
'ol'
)[
0
]).
toExist
();
expect
(
this
.
listView
.
$el
.
find
(
'li'
).
length
).
toEqual
(
1
);
expect
(
this
.
listView
.
$el
).
toContainHtml
(
'Test Course'
);
expect
(
this
.
listView
.
$el
).
toContainHtml
(
'this is a short excerpt'
);
this
.
collection
.
set
(
searchResults
);
...
...
lms/static/sass/course/courseware/_courseware_search.scss
View file @
71d66316
...
...
@@ -48,7 +48,8 @@
.search-info
{
padding-bottom
:
lh
(
.75
);
border-bottom
:
1px
solid
lighten
(
$border-color
,
10%
);
margin-bottom
:
lh
(
.50
);
border-bottom
:
1px
solid
$border-color-3
;
.search-count
{
float
:
right
;
color
:
$gray
;
...
...
@@ -61,7 +62,7 @@
.search-results-item
{
position
:
relative
;
border-bottom
:
1px
solid
lighten
(
$border-color
,
10%
)
;
border-bottom
:
1px
solid
$border-color-1
;
list-style-type
:
none
;
margin-bottom
:
lh
(
.75
);
padding-bottom
:
lh
(
.75
);
...
...
lms/templates/courseware_search/search_list.underscore
View file @
71d66316
<div class="search-info">
<%
- interpolate(gettext("Searching %s"), [courseName]
) %>
<div class="search-count"><%
-
totalCountMsg %></div>
<%
= gettext("Search Results"
) %>
<div class="search-count"><%
=
totalCountMsg %></div>
</div>
<% if (totalCount > 0 ) { %>
...
...
@@ -9,13 +9,13 @@
<% if (hasMoreResults) { %>
<a class="search-load-next" href="javascript:void(0);">
<%
-
interpolate(gettext("Load next %s results"), [pageSize]) %>
<%
=
interpolate(gettext("Load next %s results"), [pageSize]) %>
<i class="icon fa-spinner fa-spin"></i>
</a>
<% } %>
<% } else { %>
<p><%
-
gettext("Sorry, no results were found.") %></p>
<p><%
=
gettext("Sorry, no results were found.") %></p>
<% } %>
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