From 8680be38a76891a42d33b28b0000769ec40c91e5 Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Tue, 4 Sep 2012 09:53:54 -0700 Subject: [PATCH 01/12] Including courseware context in _ template --- lms/templates/discussion/_underscore_templates.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index 1a5fe6158d..bf76ef7537 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -13,6 +13,11 @@
${'<%- body %>'}
+ ${'<% if (courseware_location) { %>'} +
+ (this post is about <% courseware_title %>) +
+ ${'<% } %>'}
${'<% if (closed) { %>'} This thread is closed. From 91aec6d38f5bd2d4c4950fa1d3e7c950a65c241d Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Tue, 4 Sep 2012 09:55:18 -0700 Subject: [PATCH 02/12] Including courseware context in threads for non inline discussion --- lms/djangoapps/django_comment_client/forum/views.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py index 4607cc10c5..03ee5a999a 100644 --- a/lms/djangoapps/django_comment_client/forum/views.py +++ b/lms/djangoapps/django_comment_client/forum/views.py @@ -71,6 +71,15 @@ def render_discussion(request, course_id, threads, *args, **kwargs): annotated_content_info = reduce(merge_dict, map(infogetter, threads), {}) + if discussion_type != 'inline': + course = get_course_with_access(request.user, course_id, 'load') + + for thread in threads: + courseware_context = get_courseware_context(thread, course) + if courseware_context: + thread['courseware_location'] = courseware_context['courseware_location'] + thread['courseware_title'] = courseware_context['courseware_title'] + context = { 'threads': threads, 'discussion_id': discussion_id, From 0e1b247a7be5559340f4dd79e0a378ebb398549d Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Tue, 4 Sep 2012 10:38:28 -0700 Subject: [PATCH 03/12] courseware context links in discussion --- .../django_comment_client/forum/views.py | 30 ++++++++++++------- lms/djangoapps/django_comment_client/utils.py | 18 +++++------ lms/static/sass/_discussion.scss | 6 ++++ .../discussion/_underscore_templates.html | 4 +-- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py index 03ee5a999a..af896f6f80 100644 --- a/lms/djangoapps/django_comment_client/forum/views.py +++ b/lms/djangoapps/django_comment_client/forum/views.py @@ -13,7 +13,7 @@ from courseware.access import has_access from urllib import urlencode from operator import methodcaller from django_comment_client.permissions import check_permissions_by_view -from django_comment_client.utils import merge_dict, extract, strip_none, strip_blank +from django_comment_client.utils import merge_dict, extract, strip_none, strip_blank, get_courseware_context import json import django_comment_client.utils as utils @@ -240,15 +240,23 @@ def single_thread(request, course_id, discussion_id, thread_id): category_map = utils.get_discussion_category_map(course) threads, query_params = get_threads(request, course_id) - recent_active_threads = cc.search_recent_active_threads( - course_id, - recursive=False, - query_params={'follower_id': request.user.id}, - ) + course = get_course_with_access(request.user, course_id, 'load') - trending_tags = cc.search_trending_tags( - course_id, - ) + for thread in threads: + courseware_context = get_courseware_context(thread, course) + if courseware_context: + thread['courseware_location'] = courseware_context['courseware_location'] + thread['courseware_title'] = courseware_context['courseware_title'] + + #recent_active_threads = cc.search_recent_active_threads( + # course_id, + # recursive=False, + # query_params={'follower_id': request.user.id}, + #) + + #trending_tags = cc.search_trending_tags( + # course_id, + #) user_info = cc.User.from_django_user(request.user).to_dict() escapedict = {'"': '"'} @@ -265,8 +273,8 @@ def single_thread(request, course_id, discussion_id, thread_id): 'user_info': saxutils.escape(json.dumps(user_info),escapedict), 'annotated_content_info': saxutils.escape(json.dumps(annotated_content_info), escapedict), 'course': course, - 'recent_active_threads': recent_active_threads, - 'trending_tags': trending_tags, + #'recent_active_threads': recent_active_threads, + #'trending_tags': trending_tags, 'course_id': course.id, 'thread_id': thread_id, 'threads': saxutils.escape(json.dumps(threads), escapedict), diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py index 373611380d..b0a570caad 100644 --- a/lms/djangoapps/django_comment_client/utils.py +++ b/lms/djangoapps/django_comment_client/utils.py @@ -124,10 +124,7 @@ def initialize_discussion_info(course): category_map['entries'][topic] = {"id": entry["id"], "sort_key": entry.get("sort_key", topic)} - sort_map_entries(category_map) - #for level in category_map["subcategories"].values(): - # sort_map_entries(level) _DISCUSSIONINFO = {} @@ -135,12 +132,15 @@ def initialize_discussion_info(course): _DISCUSSIONINFO['category_map'] = category_map - # TODO delete me when you've used me - #_DISCUSSIONINFO['categorized']['General'] = [{ - # 'title': 'General', - # 'discussion_id': url_course_id, - # 'category': 'General', - #}] +def get_courseware_context(content, course): + id_map = get_discussion_id_map(course) + id = content['commentable_id'] + content_info = None + if id in id_map: + location = id_map[id]["location"].url() + title = id_map[id]["title"] + content_info = { "courseware_location": location, "courseware_title": title} + return content_info class JsonResponse(HttpResponse): def __init__(self, data=None): diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 9a0fddbcc8..c6cebe9517 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -1056,6 +1056,12 @@ body.discussion { color: #888; } + .post-context{ + margin-top: 20px; + font-size: 12px; + color: #888; + } + p + p { margin-top: 20px; } diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index bf76ef7537..a86644de9f 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -13,9 +13,9 @@
${'<%- body %>'}
- ${'<% if (courseware_location) { %>'} + ${'<% if (obj.courseware_location) { %>'}
- (this post is about <% courseware_title %>) + (this post is about ${'<%- courseware_title %>'})
${'<% } %>'}
From 398e79dc8cf742c1d931e3b42ab2536abf2cdfd2 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 4 Sep 2012 13:40:21 -0400 Subject: [PATCH 04/12] simple blank slate view --- lms/static/coffee/src/discussion/discussion_router.coffee | 2 +- lms/static/sass/_discussion.scss | 8 ++++++++ lms/templates/discussion/_underscore_templates.html | 2 +- lms/templates/discussion/index.html | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lms/static/coffee/src/discussion/discussion_router.coffee b/lms/static/coffee/src/discussion/discussion_router.coffee index 4dc599898a..824ef896fb 100644 --- a/lms/static/coffee/src/discussion/discussion_router.coffee +++ b/lms/static/coffee/src/discussion/discussion_router.coffee @@ -15,7 +15,7 @@ class @DiscussionRouter extends Backbone.Router allThreads: -> # TODO: Do something reasonable here - $(".discussion-column").html("No thread selected.") + # $(".discussion-column").html($('#blank-slate-template').html()) setActiveThread: => if @thread diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index a00639792e..3c0ba1fee0 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -1038,9 +1038,17 @@ body.discussion { } } + .blank-slate h1 { + margin-top: 195px; + text-align: center; + color: #ccc; + } + + .blank-slate, .discussion-article { position: relative; padding: 40px; + min-height: 468px; h1 { margin-bottom: 10px; diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index 1a5fe6158d..3d86c92796 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -60,4 +60,4 @@ + \ No newline at end of file diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html index 48ed88fdfb..545b218e54 100644 --- a/lms/templates/discussion/index.html +++ b/lms/templates/discussion/index.html @@ -26,7 +26,12 @@
-
+
+
+

${course.title} discussion forum

+ +
+
From 4a3f85b41723b29651a404db4c4ef88bd677d4e4 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 4 Sep 2012 14:05:09 -0400 Subject: [PATCH 05/12] styled closed post notice --- lms/static/sass/_discussion.scss | 10 ++++++++++ lms/templates/discussion/_underscore_templates.html | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 3c0ba1fee0..e970c2d6d0 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -1022,6 +1022,16 @@ body.discussion { + .bottom-post-status { + padding: 30px; + font-size: 20px; + font-weight: 700; + color: #ccc; + text-align: center; + } + + + .discussion-column { float: right; diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index b005c4567c..3959b336e4 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -13,9 +13,6 @@
${'<%- body %>'}
-
  • Edit
  • Delete
    • @@ -25,6 +22,9 @@
    +

    Post a response:

      From ffab52be36b221d202f7a90620db88508ebbd2df Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 4 Sep 2012 14:11:24 -0400 Subject: [PATCH 06/12] fixed typo on profile page and reworded button text --- lms/templates/discussion/_user_profile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/discussion/_user_profile.html b/lms/templates/discussion/_user_profile.html index 8660d8035f..7bf58a256a 100644 --- a/lms/templates/discussion/_user_profile.html +++ b/lms/templates/discussion/_user_profile.html @@ -15,7 +15,7 @@
      ${profiled_user['comments_count'] | h} ${pluralize('comment', profiled_user['comments_count']) | h}
      % if check_permissions_by_view(user, course.id, content=None, name='update_moderator_status'): % if "Moderator" in role_names: - Revoke Moderator provileges + Revoke Moderator rights % else: Promote to Moderator % endif From 0129be36c92aaaec664cca34e8753b6b0e6ec1b7 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Tue, 4 Sep 2012 14:26:37 -0400 Subject: [PATCH 07/12] Get highlighting working. --- .../src/discussion/views/discussion_thread_view.coffee | 5 +++++ .../coffee/src/discussion/views/thread_list_item_view.coffee | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee index 3dddb7d901..37483e49d8 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -23,6 +23,8 @@ class @DiscussionThreadView extends DiscussionContentView Markdown.makeWmdEditor @$(".reply-body"), "", DiscussionUtil.urlFor("upload"), (text) -> DiscussionUtil.postMathJaxProcessor(text) @convertMath() @renderResponses() + @highlight @$(".post-body") + @highlight @$("h1") @ renderDogear: -> @@ -151,3 +153,6 @@ class @DiscussionThreadView extends DiscussionContentView type: "POST" success: (response, textStatus) => @model.set('endorsed', not endorsed) + + highlight: (el) -> + el.html(el.html().replace(/<mark>/g, "").replace(/<\/mark>/g, "")) diff --git a/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee b/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee index 5cf2954357..6f04924dc6 100644 --- a/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee +++ b/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee @@ -12,6 +12,7 @@ class @ThreadListItemView extends Backbone.View @$el.html(@template(@model.toJSON())) if window.user.following(@model) @follow() + @highlight @$(".title") @ threadSelected: (event) -> event.preventDefault() @@ -25,3 +26,6 @@ class @ThreadListItemView extends Backbone.View addComment: => @$(".comments-count").html(parseInt(@$(".comments-count").html()) + 1) + + highlight: (el) -> + el.html(el.html().replace(/<mark>/g, "").replace(/<\/mark>/g, "")) From 2380e7fff46be16d9d952ddf034c520e72b2bed9 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Tue, 4 Sep 2012 14:35:46 -0400 Subject: [PATCH 08/12] Change default text to All. --- lms/templates/discussion/_new_post.html | 2 +- lms/templates/discussion/_thread_list_template.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/templates/discussion/_new_post.html b/lms/templates/discussion/_new_post.html index dde21c5a95..8081829ec1 100644 --- a/lms/templates/discussion/_new_post.html +++ b/lms/templates/discussion/_new_post.html @@ -29,7 +29,7 @@
      - Homework / Week 1 ▾ + All▾
      diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html index 4a8a78e0bb..5e1c826b45 100644 --- a/lms/templates/discussion/_thread_list_template.html +++ b/lms/templates/discussion/_thread_list_template.html @@ -2,7 +2,7 @@
      - Homework / Week 1 ▾ + All ▾
      <%include file="_filter_dropdown.html" />
      @@ -23,4 +23,4 @@
      - \ No newline at end of file + From 9da7a337a83c20fdaba5f450c473d589883e98a5 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Tue, 4 Sep 2012 15:27:55 -0400 Subject: [PATCH 09/12] Sorting should keep trace of comment and like updates. --- lms/static/coffee/src/discussion/content.coffee | 3 +++ .../discussion/views/discussion_thread_list_view.coffee | 9 +++++---- .../src/discussion/views/discussion_thread_view.coffee | 2 +- .../src/discussion/views/thread_list_item_view.coffee | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lms/static/coffee/src/discussion/content.coffee b/lms/static/coffee/src/discussion/content.coffee index ee6c50ecf7..39bb261136 100644 --- a/lms/static/coffee/src/discussion/content.coffee +++ b/lms/static/coffee/src/discussion/content.coffee @@ -439,6 +439,9 @@ if Backbone? @set('thread', @) super() + comment: -> + @set("comments_count", parseInt(@get("comments_count")) + 1) + follow: -> @set('subscribed', true) @trigger "thread:follow" diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index e485fbfb60..85e0d8d614 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -10,6 +10,11 @@ class @DiscussionThreadListView extends Backbone.View initialize: -> @displayedCollection = new Discussion(@collection.models) + @collection.on "change", @reloadDisplayedCollection + + reloadDisplayedCollection: => + @displayedCollection.reset(@collection.models) + # Because we want the behavior that when the body is clicked the menu is # closed, we need to ignore clicks in the search field and stop propagation. @@ -96,10 +101,6 @@ class @DiscussionThreadListView extends Backbone.View @displayedCollection.comparator = @displayedCollection.sortByComments @displayedCollection.sort() - delay: (callback, ms) => - clearTimeout(@timer) - @timer = setTimeout(callback, ms) - performSearch: (event) -> if event.which == 13 event.preventDefault() diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee index 37483e49d8..8bb2d663a1 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -62,7 +62,7 @@ class @DiscussionThreadView extends DiscussionContentView @$(".responses").append(view.el) addComment: => - @model.trigger "comment:add" + @model.comment() toggleVote: (event) -> event.preventDefault() diff --git a/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee b/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee index 6f04924dc6..1ca5f33c70 100644 --- a/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee +++ b/lms/static/coffee/src/discussion/views/thread_list_item_view.coffee @@ -1,13 +1,15 @@ class @ThreadListItemView extends Backbone.View tagName: "li" template: _.template($("#thread-list-item-template").html()) + events: "click a": "threadSelected" + initialize: -> @model.on "change", @render @model.on "thread:follow", @follow @model.on "thread:unfollow", @unfollow - @model.on "comment:add", @addComment + render: => @$el.html(@template(@model.toJSON())) if window.user.following(@model) From d8e3108a25dd713e9fb7082dca09c157a11e729a Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Tue, 4 Sep 2012 17:25:57 -0400 Subject: [PATCH 10/12] Sidebar positioning and height. --- .../src/discussion/discussion_router.coffee | 3 ++ .../views/discussion_thread_list_view.coffee | 39 +++++++++++++++++++ .../views/discussion_thread_view.coffee | 1 + lms/static/js/discussions-temp.js | 14 +++---- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/lms/static/coffee/src/discussion/discussion_router.coffee b/lms/static/coffee/src/discussion/discussion_router.coffee index 824ef896fb..1a8949720b 100644 --- a/lms/static/coffee/src/discussion/discussion_router.coffee +++ b/lms/static/coffee/src/discussion/discussion_router.coffee @@ -14,6 +14,7 @@ class @DiscussionRouter extends Backbone.Router @newPostView.on "thread:created", @navigateToThread allThreads: -> + @nav.updateSidebar() # TODO: Do something reasonable here # $(".discussion-column").html($('#blank-slate-template').html()) @@ -29,6 +30,8 @@ class @DiscussionRouter extends Backbone.Router @main = new DiscussionThreadView(el: $(".discussion-column"), model: @thread) @main.render() + @main.on "thread:responses:rendered", => + @nav.updateSidebar() navigateToThread: (thread_id) => thread = @discussion.get(thread_id) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 85e0d8d614..12d75e8ed7 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -11,9 +11,44 @@ class @DiscussionThreadListView extends Backbone.View initialize: -> @displayedCollection = new Discussion(@collection.models) @collection.on "change", @reloadDisplayedCollection + @sidebar_padding = 10 + @sidebar_header_height = 87 reloadDisplayedCollection: => @displayedCollection.reset(@collection.models) + @updateSidebar() + + updateSidebar: => + + scrollTop = $(window).scrollTop(); + windowHeight = $(window).height(); + + $discussionBody = $(".discussion-body") + discussionsBodyTop = $discussionBody.offset().top; + discussionsBodyBottom = discussionsBodyTop + $discussionBody.height(); + + $sidebar = $(".sidebar") + if scrollTop > discussionsBodyTop - @sidebar_padding + $sidebar.addClass('fixed'); + $sidebar.css('top', @sidebar_padding); + else + $sidebar.removeClass('fixed'); + $sidebar.css('top', '0'); + + sidebarWidth = .32 * $discussionBody.width() - 10; + $sidebar.css('width', sidebarWidth + 'px'); + + sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, @sidebar_padding) + + topAmount = scrollTop + windowHeight + bottomAmount = discussionsBodyBottom + @sidebar_padding + amount = Math.max(topAmount - bottomAmount, 0) + + sidebarHeight = sidebarHeight - @sidebar_padding - amount + $sidebar.css 'height', Math.max(sidebarHeight, 400) + + $postListWrapper = @$('.post-list-wrapper') + $postListWrapper.css('height', (sidebarHeight - @sidebar_header_height - 4) + 'px'); # Because we want the behavior that when the body is clicked the menu is @@ -25,6 +60,10 @@ class @DiscussionThreadListView extends Backbone.View render: -> @timer = 0 @$el.html(@template()) + + $(window).bind "scroll", @updateSidebar + $(window).bind "resize", @updateSidebar + @displayedCollection.on "reset", @renderThreads @renderThreads() @ diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee index 8bb2d663a1..5e2c604bee 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -54,6 +54,7 @@ class @DiscussionThreadView extends DiscussionContentView Content.loadContentInfos(data['annotated_content_info']) comments = new Comments(data['content']['children']) comments.each @renderResponse + @trigger "thread:responses:rendered" renderResponse: (response) => view = new ThreadResponseView(model: response) diff --git a/lms/static/js/discussions-temp.js b/lms/static/js/discussions-temp.js index 71a5c16e67..3ab289294e 100644 --- a/lms/static/js/discussions-temp.js +++ b/lms/static/js/discussions-temp.js @@ -67,13 +67,13 @@ $(document).ready(function() { $body.delegate('.browse-topic-drop-search-input, .form-topic-drop-search-input', 'keyup', filterDrop); - $(window).bind('resize', updateSidebar); - $(window).bind('scroll', updateSidebar); - $('.discussion-column').bind("input", function (e) { - console.log("resized"); - updateSidebar(); - }) - updateSidebar(); +// $(window).bind('resize', updateSidebar); +// $(window).bind('scroll', updateSidebar); +// $('.discussion-column').bind("input", function (e) { +// console.log("resized"); +// updateSidebar(); +// }) +// updateSidebar(); }); function filterDrop(e) { From 3b07fd366e065e21c992fbddcd09f199bb2f42e0 Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Tue, 4 Sep 2012 17:27:41 -0400 Subject: [PATCH 11/12] added keyboard nav to dropdown; doesn't work yet when filtered --- .../views/discussion_thread_list_view.coffee | 34 +++++++++++++++++++ lms/static/js/discussions-temp.js | 5 +-- lms/static/sass/_discussion.scss | 8 ++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 85e0d8d614..e41e11fd8f 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -59,9 +59,11 @@ class @DiscussionThreadListView extends Backbone.View if @$(".browse").hasClass('is-dropped') @$(".browse-topic-drop-menu-wrapper").show() $('body').bind 'click', @toggleTopicDrop + $('body').bind 'keyup', @setActiveItem else @$(".browse-topic-drop-menu-wrapper").hide() $('body').unbind 'click', @toggleTopicDrop + $('body').unbind 'keyup', @setActiveItem setTopic: (event) -> item = $(event.target).closest('a') @@ -115,3 +117,35 @@ class @DiscussionThreadListView extends Backbone.View if textStatus == 'success' @collection.reset(response.discussion_data) @displayedCollection.reset(@collection.models) + + + setActiveItem: (event) -> + if event.which == 13 + console.log($(".browse-topic-drop-menu-wrapper .focused")) + $(".browse-topic-drop-menu-wrapper .focused").click() + return + if event.which != 40 && event.which != 38 + return + event.preventDefault() + + items = $(".browse-topic-drop-menu-wrapper a").not(".hidden") + totalItems = items.length + index = $(".browse-topic-drop-menu-wrapper .focused").parent().index() + # index = parseInt($(".browse-topic-drop-menu-wrapper").attr("data-focused")) || 0 + + + if event.which == 40 + index = index + 1 + else if event.which == 38 + index = index - 1 + if index == totalItems + index = 0 + + console.log(index) + + $(".browse-topic-drop-menu-wrapper .focused").removeClass("focused") + $(".browse-topic-drop-menu-wrapper li").eq(index).find('a').addClass("focused") + # $(items[index]).addClass("focused") + $(".browse-topic-drop-menu-wrapper").attr("data-focused", index) + + diff --git a/lms/static/js/discussions-temp.js b/lms/static/js/discussions-temp.js index 71a5c16e67..e03d7e7333 100644 --- a/lms/static/js/discussions-temp.js +++ b/lms/static/js/discussions-temp.js @@ -132,7 +132,7 @@ function filterDrop(e) { return; } - $items.hide(); + $items.addClass('hidden'); $items.each(function(i) { var thisText = $(this).children().not('.unread').text(); $(this).parents('ul').siblings('a').not('.unread').each(function(i) { @@ -147,7 +147,7 @@ function filterDrop(e) { } if(test) { - $(this).show(); + $(this).removeClass('hidden'); // show children $(this).parent().find('a').show(); @@ -225,6 +225,7 @@ function showTopicDrop(e) { $topicDrop.show(); $browse.unbind('click', showTopicDrop); + $body.bind('keyup', setActiveDropItem); $browse.bind('click', hideTopicDrop); setTimeout(function() { $body.bind('click', hideTopicDrop); diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index 7f0f6dba78..2070abb8ce 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -732,8 +732,14 @@ body.discussion { line-height: 22px; color: #fff; @include clearfix; + @include transition(none); - &:hover { + &.hidden { + display: none; + } + + &:hover, + &.focused { background-color: #636363; } From 1caef344c3e207c8d17c47b6df93276976f329d7 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Tue, 4 Sep 2012 17:46:29 -0400 Subject: [PATCH 12/12] Fix sidebar alignment --- .../views/discussion_thread_list_view.coffee | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 9e518c9c81..bfaef682df 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -23,32 +23,32 @@ class @DiscussionThreadListView extends Backbone.View scrollTop = $(window).scrollTop(); windowHeight = $(window).height(); - $discussionBody = $(".discussion-body") - discussionsBodyTop = $discussionBody.offset().top; - discussionsBodyBottom = discussionsBodyTop + $discussionBody.height(); + discussionBody = $(".discussion-article") + discussionsBodyTop = discussionBody.offset().top; + discussionsBodyBottom = discussionsBodyTop + discussionBody.outerHeight(); - $sidebar = $(".sidebar") + sidebar = $(".sidebar") if scrollTop > discussionsBodyTop - @sidebar_padding - $sidebar.addClass('fixed'); - $sidebar.css('top', @sidebar_padding); + sidebar.addClass('fixed'); + sidebar.css('top', @sidebar_padding); else - $sidebar.removeClass('fixed'); - $sidebar.css('top', '0'); + sidebar.removeClass('fixed'); + sidebar.css('top', '0'); - sidebarWidth = .32 * $discussionBody.width() - 10; - $sidebar.css('width', sidebarWidth + 'px'); + sidebarWidth = .32 * $(".discussion-body").width() - 10; + sidebar.css('width', sidebarWidth + 'px'); sidebarHeight = windowHeight - Math.max(discussionsBodyTop - scrollTop, @sidebar_padding) - topAmount = scrollTop + windowHeight - bottomAmount = discussionsBodyBottom + @sidebar_padding - amount = Math.max(topAmount - bottomAmount, 0) + topOffset = scrollTop + windowHeight + discussionBottomOffset = discussionsBodyBottom + @sidebar_padding + amount = Math.max(topOffset - discussionBottomOffset, 0) sidebarHeight = sidebarHeight - @sidebar_padding - amount - $sidebar.css 'height', Math.max(sidebarHeight, 400) + sidebar.css 'height', Math.min(Math.max(sidebarHeight, 400), discussionBody.outerHeight()) - $postListWrapper = @$('.post-list-wrapper') - $postListWrapper.css('height', (sidebarHeight - @sidebar_header_height - 4) + 'px'); + postListWrapper = @$('.post-list-wrapper') + postListWrapper.css('height', (sidebarHeight - @sidebar_header_height - 4) + 'px'); # Because we want the behavior that when the body is clicked the menu is