Commit Graph

132 Commits

Author SHA1 Message Date
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -04:00
Diana Huang
d779466f09 Make course tab refreshing safer. 2015-06-19 14:53:49 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab.
TNL-2321
2015-06-08 15:18:39 -04:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
2015-03-31 12:12:04 -04:00
Matt Drayer
cd05391335 Cleaned up milestones API references 2015-03-12 15:58:21 -04:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Usman Khalid
ae73f3eaa0 Puts module.render() in try statements.
LMS-1192
2014-03-19 19:30:22 +05:00
Adam Palay
8d2db05635 add i18n scraping to tabs.py (LMS-2166)
add dummy strings
2014-02-24 15:46:03 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
ichuang
fedfa7cab7 fix tabs.py to properly handle static_asset_path 2013-08-20 18:09:57 -04:00
Miles Steele
bc9cce5733 add instructor dash version switch 2013-08-02 09:52:13 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
2013-07-31 09:22:10 -04:00
Calen Pennington
5e4cf50086 Make sure that all tab types used by the default for the course.tabs field work correctly 2013-07-30 11:32:31 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Arthur Barrett
cd4bec8750 merged master branch into feature/abarrett/lms-notes-app 2013-05-07 12:32:22 -04:00
Arthur Barrett
ceefdf0161 user must be authenticated to view notes tab 2013-05-06 15:52:32 -04:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
Arthur Barrett
7120998938 refactoring notes js 2013-03-21 17:18:45 -04:00
Arthur Barrett
0710bbd70c Merge branch 'master' into feature/abarrett/lms-notes-app 2013-03-19 13:43:45 -04:00
Arthur Barrett
20767d5cc7 create notes djangoapp for annotator.js 2013-03-15 12:41:52 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
2013-03-12 07:23:28 -04:00
Brian Wilson
aee7d85694 fix bug in tabs 2013-03-07 02:01:42 -05:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
Brian Wilson
f0258b8dd0 first pass at pdfbook 2013-02-13 18:01:44 -05:00
Calen Pennington
bd822b9d2f Fix tests post-merge 2013-02-13 14:13:22 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
4d8165b2b6 Remove bad import of replace_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Vik Paruchuri
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -05:00
Vik Paruchuri
01f218b7f8 Fix some tab issues from the rebase 2013-01-29 21:36:55 -05:00
Vik Paruchuri
fde370bd92 Fix notification issue, sanitize input html 2013-01-29 21:24:04 -05:00
Vik Paruchuri
bd0b933ff2 Highlight the correct tab 2013-01-29 21:24:04 -05:00
Vik Paruchuri
665fb707b1 Cache notifications for 5 mins so that we don't hit the grading server on every web request 2013-01-29 21:24:03 -05:00
Vik Paruchuri
6412eb4080 Fix naming for overall need to check 2013-01-29 19:39:24 -05:00
Vik Paruchuri
d3d4e557d6 Fix notification display 2013-01-29 19:31:03 -05:00
Vik Paruchuri
457afaaeda Making tab render properly for open ended notifications 2013-01-29 19:31:03 -05:00
Vik Paruchuri
0f212cc8f2 Fix course id passing, template rendering 2013-01-29 19:31:02 -05:00
Vik Paruchuri
22a2bdaa3d Disable student problem list caching, build out notifications 2013-01-29 19:30:04 -05:00
Vik Paruchuri
4112f8ad8e Pass back dictionaries where needed from notifications functions 2013-01-29 19:30:04 -05:00