Commit Graph

69 Commits

Author SHA1 Message Date
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
2014-09-05 13:20:15 -04:00
Adam Palay
58553a7fb8 escape html for inline discussions (TNL-182) 2014-09-05 11:02:17 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly
TNL-25
2014-09-04 13:47:48 -04:00
jsa
50741304dc remove use of ngettext in discussion jasmine test 2014-09-03 15:09:44 -04:00
Greg Price
988e4e6da5 Update UI for forum actions
The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>
2014-08-29 15:59:33 -04:00
Greg Price
748d76600f Remove "flagged discussions" from forum topic menu
This feature is supplanted by the flagged option in the filter menu,
which can work within topics as well as across all topics.
2014-08-29 15:59:33 -04:00
Greg Price
80d1cae6a0 Add filter menu to forum nav sidebar
The menu allows filtering to unread, unanswered, or flagged threads.
This includes passing through the appropriate query parameters to the
comments service.
2014-08-29 15:59:33 -04:00
Greg Price
eaa93bf615 Hide comments in marked answers in forum questions
A link to show the comments appears in their place.
2014-08-29 15:59:33 -04:00
Greg Price
ec482c0dc2 Allow authors of forum questions to mark answers
Co-authored-by: jsa <jsa@edx.org>
2014-08-29 15:59:32 -04:00
Greg Price
2e30874180 Add post type indicators to forum sidebar nav
The previously existing checkmark for threads with endorsed responses is
removed, as it is mostly redundant.
2014-08-29 15:59:32 -04:00
Greg Price
dd05423732 Re-render forum responses when marked as answer 2014-08-29 15:59:32 -04:00
Greg Price
182ae7aeb0 Add endorsement info to marked answers in forum
Co-authored-by: jsa <jsa@edx.org>
2014-08-29 15:59:31 -04:00
Greg Price
10063a3120 Distinguish forum thread types in rendering
Each thread's type is now included in its post details, and question
threads have marked answers shown immediately below the body of the
initial post.
2014-08-29 15:59:31 -04:00
Greg Price
7470e60004 Unify forum thread views (and templates) 2014-08-29 15:59:31 -04:00
Greg Price
854621be60 Update forum new post form
Add help text to several fields, update visual styling, and make it
appear in the right-hand pane of the discussion tab instead of sliding
down from the top.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
2014-08-29 15:59:31 -04:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view
FOR-581
2014-08-20 14:33:23 +05:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request
[STUD-2903]
2014-08-15 11:04:52 -04:00
Waqas Khalid
f1df9a1093 Fix anonymous posts appear are labeled with the logged in user's role
FOR-156
2014-07-14 17:01:23 +05:00
Adam
379edd2317 Merge pull request #4352 from edx/release
Release
2014-07-10 10:54:16 -04:00
Greg Price
c3845de76a Fix bug in inline discussion post creation
Commit 994ccd1 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
2014-07-09 12:00:14 -04:00
Greg Price
a4de82e1c3 Remove sidebar class from forum nav
This will enable much cleanup of the relevant SASS rules.
2014-07-07 14:21:53 -04:00
Greg Price
6d87443a39 Update discussion tab sidebar header
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
2014-07-02 16:58:34 -04:00
Greg Price
05d8eeecd7 Improve forum sorting and cohort filtering UX
Thread entries now show an activity count that includes the original
post, and only one of the vote count and activity count is displayed
based on the user's selected sort. The sorting and filtering options now
both use a select and are somewhat more verbose, and the visual styling
of the sort/filter bar is updated.

Originally reviewed in #4165 with a bugfix in #4211
2014-07-02 16:58:34 -04:00
Greg Price
551cea9379 Add labels to forum thread list
A thread will be labeled if it is pinned, if the user is following it,
or if it was authored by a staff member or community TA. This also
slightly changes the color used for community TA labels.

Originally reviewed in #4072
2014-07-02 16:58:33 -04:00
Greg Price
89ba90a695 Re-design forum thread list
Use larger and lighter title font, decrease padding, and use lighter
solid backgrounds instead of gradients. Also, refactor SASS code to
conform better to our new style, including using more specific class
names.

Originally reviewed in #4072
2014-07-02 15:31:55 -04:00
Greg Price
1a0d8827f5 Refactor global var setup for forum Jasmine tests
Originally reviewed in #4072
2014-07-02 15:31:35 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Waqas Khalid
3b9afe7eeb Update the discussion area broken span tags
FOR-578
2014-06-26 12:55:12 +05:00
jsa
e6871af2d3 forums: add UX for username search results.
JIRA: FOR-627
2014-06-19 11:33:52 -04:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference
FOR-545
2014-06-18 14:26:30 +05:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX.
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
2014-06-05 15:00:29 -04:00
jsa
03977a4666 crude fix for intermittent jasmine test failures 2014-04-29 14:26:12 -04:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00
Greg Price
643069c64c Remove cruft from user profile threads
This removes the vote button from threads on the user profile, which was
the only interaction available on the page other than the link to view
the thread in the main discussion view.
2014-04-23 16:07:36 -04:00
Greg Price
92151e3bd6 Render markup in inline threads on expand/collapse
This was a bug in 3af90ef.
2014-04-17 15:13:00 -04:00
Greg Price
862a16cac0 Show full body when expanding inline forum thread
This was a bug in 3af90ef.

JIRA: FOR-559
2014-04-17 12:36:03 -04:00
Greg Price
3af90ef256 Add repsonse pagination to inline discussions 2014-04-02 14:32:58 -04:00
Greg Price
b4caf75cbb Make forum comment buttons activate by keyboard
Neither edit nor delete activated on pressing the space key.
2014-03-04 10:42:07 -05:00
Greg Price
29e77ed25f Improve UX of pinning feature
Students no longer see a tooltip nor any button affordance (i.e. cursor
and color change on hover/focus) on the pinning feature. For moderators,
the tooltip is now correct when a thread is pinned, the button is
accessible for keyboard-only users and screen readers, and an error
dialog now appears if an error occurs in attempting to pin/unpin.

JIRA: FOR-192
2014-02-26 13:59:54 -05:00
Greg Price
c3dc40d729 Add UI for editing forum third-level content 2014-02-26 10:00:50 -05:00
Jim Abramson
e3a71b1625 Merge pull request #2646 from edx/jsa/forum-delete-comments
add ability to delete comments on responses in discussions.
2014-02-22 19:14:59 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
2014-02-21 15:01:20 -05:00
jsa
7d32a90ae2 add ability to delete comments on responses in discussions. 2014-02-20 13:14:11 -05:00
Calen Pennington
f6731342de Make Studio load XBlock fragment js and css on the client-side
[LMS-1421][LMS-1517]
2014-02-04 15:38:13 -05:00
Greg Price
062025eeec Add pagination of repsonses to forum threads
Users will first be shown the first 25 responses of a viewed thread and
then have the option of loading 100 more at a time until all responses
have been loaded. This mitigates the performance impact of very large
threads by avoiding the need to render and transfer over the network
all content of a large thread at once. It will also allow students with
slower browsers to interact with large threads even if they cannot load
all of the responses.
2014-01-31 18:17:04 -05:00
Greg Price
2014d34c8a Fix forum button keyboard activation
Previously, buttons were activated on pressing Enter, but the expected
behavior is to activate on pressing Space. Several JavaScript errors
that prevented various buttons from properly activating via the keyboard
are also fixed.
2014-01-17 16:38:51 -05:00
Greg Price
a8e3bca8c8 Internationalize forums CoffeeScript code 2014-01-14 13:04:51 -05:00
Greg Price
b7d7751dc2 Improve accessibility of forum vote buttons
This change involves substantial refactoring of the relevant code to
reduce duplication. It also makes the templates for the vote buttons
more consistent and cleaner.

JIRA: FOR-64
2014-01-06 17:08:53 -05:00
Calen Pennington
d937da8d47 Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
[LMS-1613]
2013-12-10 12:04:18 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00