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

updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming

Browse Source
This commit is contained in:
Marco Morales
2015-08-04 11:19:47 -04:00
committed by Andy Armstrong
parent 41173fefee
commit dd67f8aa72
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/static/coffee/spec/discussion/view/discussion_user_profile_view_spec.coffee
View File

@@ -205,7 +205,7 @@ describe "DiscussionUserProfileView", ->
) )
{always: ->} {always: ->}
) )
@view.$(".pagination a").first().click() @view.$(".discussion-pagination a").first().click()
expect(@view.$(".current-page").text()).toEqual("42") expect(@view.$(".current-page").text()).toEqual("42")
expect(@view.$(".last-page").text()).toEqual("99") expect(@view.$(".last-page").text()).toEqual("99")
@@ -216,5 +216,5 @@ describe "DiscussionUserProfileView", ->
params.error() params.error()
{always: ->} {always: ->}
) )
@view.$(".pagination a").first().click() @view.$(".discussion-pagination a").first().click()
expect(DiscussionUtil.discussionAlert).toHaveBeenCalled() expect(DiscussionUtil.discussionAlert).toHaveBeenCalled()

2
common/static/coffee/src/discussion/discussion_module_view.coffee
View File

@@ -155,7 +155,7 @@ if Backbone?
"?discussion_page=#{number}" "?discussion_page=#{number}"
params = DiscussionUtil.getPaginationParams(@page, numPages, pageUrl) params = DiscussionUtil.getPaginationParams(@page, numPages, pageUrl)
pagination = _.template($("#pagination-template").html())(params) pagination = _.template($("#pagination-template").html())(params)
@$('section.pagination').html(pagination) @$('section.discussion-pagination').html(pagination)
navigateToPage: (event) => navigateToPage: (event) =>
event.preventDefault() event.preventDefault()

2
common/static/coffee/src/discussion/views/discussion_user_profile_view.coffee
View File

@@ -18,7 +18,7 @@ if Backbone?
baseUri = URI(window.location).removeSearch("page") baseUri = URI(window.location).removeSearch("page")
pageUrlFunc = (page) -> baseUri.clone().addSearch("page", page) pageUrlFunc = (page) -> baseUri.clone().addSearch("page", page)
paginationParams = DiscussionUtil.getPaginationParams(@page, @numPages, pageUrlFunc) paginationParams = DiscussionUtil.getPaginationParams(@page, @numPages, pageUrlFunc)
@$el.find(".pagination").html(_.template($("#pagination-template").html())(paginationParams)) @$el.find(".discussion-pagination").html(_.template($("#pagination-template").html())(paginationParams))
changePage: (event) -> changePage: (event) ->
event.preventDefault() event.preventDefault()

2
common/static/common/templates/discussion/inline-discussion.underscore
View File

@@ -8,6 +8,6 @@
<% }); %> <% }); %>
</section> </section>
<section class="pagination"> <section class="discussion-pagination">
</section> </section>
</section> </section>

2
common/static/common/templates/discussion/user-profile.underscore
View File

@@ -4,4 +4,4 @@
<article class="discussion-thread" id="thread_<%= thread.id %>"/> <article class="discussion-thread" id="thread_<%= thread.id %>"/>
<% }); %> <% }); %>
</section> </section>
<section class="pagination"/> <section class="discussion-pagination"/>

6
lms/static/sass/discussion/_discussion.scss
View File

@@ -753,10 +753,10 @@ body.discussion {
} }
section.discussion { section.discussion {
margin-top: ($baseline*1.5); clear: both;
padding-top: $baseline;
.threads { .threads {
margin-top: $baseline;
} }
.discussion-thread { .discussion-thread {
@@ -936,7 +936,7 @@ body.discussion {
color: $white; color: $white;
} }
section.pagination { section.discussion-pagination {
margin-top: ($baseline*1.5); margin-top: ($baseline*1.5);
nav.discussion-paginator { nav.discussion-paginator {