From 71d66316fcab1427da8eea1acbbd037ca9ea3052 Mon Sep 17 00:00:00 2001 From: Davorin Sego Date: Mon, 2 Feb 2015 13:24:07 +0100 Subject: [PATCH] Courseware search: Change name of results page from "Searching [course name]" and patch up some style issues --- lms/static/js/search/views/search_list_view.js | 1 - lms/static/js/spec/search/search_spec.js | 1 - lms/static/sass/course/courseware/_courseware_search.scss | 5 +++-- lms/templates/courseware_search/search_list.underscore | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lms/static/js/search/views/search_list_view.js b/lms/static/js/search/views/search_list_view.js index b981264b4c..eae1230e74 100644 --- a/lms/static/js/search/views/search_list_view.js +++ b/lms/static/js/search/views/search_list_view.js @@ -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, diff --git a/lms/static/js/spec/search/search_spec.js b/lms/static/js/spec/search/search_spec.js index cf0aa5fa3a..f8e7c67fd1 100644 --- a/lms/static/js/spec/search/search_spec.js +++ b/lms/static/js/spec/search/search_spec.js @@ -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); diff --git a/lms/static/sass/course/courseware/_courseware_search.scss b/lms/static/sass/course/courseware/_courseware_search.scss index 3d91102e35..460e961c3d 100644 --- a/lms/static/sass/course/courseware/_courseware_search.scss +++ b/lms/static/sass/course/courseware/_courseware_search.scss @@ -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); diff --git a/lms/templates/courseware_search/search_list.underscore b/lms/templates/courseware_search/search_list.underscore index fdc2d843fc..6366b3893b 100644 --- a/lms/templates/courseware_search/search_list.underscore +++ b/lms/templates/courseware_search/search_list.underscore @@ -1,6 +1,6 @@
- <%- interpolate(gettext("Searching %s"), [courseName]) %> -
<%- totalCountMsg %>
+ <%= gettext("Search Results") %> +
<%= totalCountMsg %>
<% if (totalCount > 0 ) { %> @@ -9,13 +9,13 @@ <% if (hasMoreResults) { %> - <%- interpolate(gettext("Load next %s results"), [pageSize]) %> + <%= interpolate(gettext("Load next %s results"), [pageSize]) %> <% } %> <% } else { %> -

<%- gettext("Sorry, no results were found.") %>

+

<%= gettext("Sorry, no results were found.") %>

<% } %>