Commit Graph

1043 Commits

Author SHA1 Message Date
Bertrand Marron
1b2e410e4c Remove course ID from title in course about page 2014-06-20 15:35:54 +02:00
Piotr Mitros
4f303a623b XBlocks can disable navigation chrome.
There is an option to:
* Enable/disable accordion navigation
* Enable/disable/repoint tab navigation

This allows for full-screen XBlocks (e.g. a code IDE, or large video
player). It is also the first pass at allowing top-level XBlocks. It's
also now possible to make a chromeless XBlock, point a tab to it, and
make it point back to that tab.

Next steps down that path would be:
* Fix up how tabs are handled. The current version is a hack.
* Create appropriate XBlocks for courseware, tabbed navigation,
  etc. to reach feature parity
* Invert/rejigger the XML format.
2014-06-19 21:06:08 -04:00
Sarina Canelake
c68fce1f0a Fix i18n translation issues 2014-06-17 12:03:27 -04:00
Johnny Brown
0bd2286e5b show a friendly message for an empty course rather than an error page 2014-05-29 16:55:40 -05:00
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00:00
Sarina Canelake
1cd94cf5e5 Remove gradebook code from legacy.py (moved to instructor/views/api.py) 2014-05-27 10:59:16 -04:00
Sarina Canelake
faeee559fd Fix Instructor Dash UX (LMS-2748) 2014-05-22 16:53:20 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Calen Pennington
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
2014-05-16 14:01:20 -04:00
David Adams
9bc7a518ee Fixes issue with metrics tab click handlers
Click handlers were not getting attached to DOM elements in some cases on slow running machines.
  Added logic to attach handlers when elements are ready.

Added 2 buttons on metrics tab:
  Download Subsection Data for downloading to csv.
  Download Problem Data for downloading to csv.
2014-05-15 11:45:59 -07:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -04:00
Usman Khalid
7192fce2f5 A hack to get instructor email to work in Firefox while the video
annotator tool is refactored to not bundle its own tinymce globally.
2014-05-15 16:54:15 +05:00
Calen Pennington
661f37ecd6 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py
2014-05-14 15:57:38 -04:00
Calen Pennington
5c345b3b00 Fix more broken tests after merge from master 2014-05-13 16:21:18 -04:00
Adam Palay
9b313d732f fix bug 2014-05-13 15:32:46 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
2014-05-13 15:30:56 -04:00
Sarina Canelake
a5381db070 Only show banner on legacy dash for edx.org
LMS-1296
2014-05-12 12:42:19 -04:00
Frances Botsford
b90f1e41e5 UI cleanup of new instructor dashboard
Stylize warning banners; more UI touches for the intructor dash:
clean up nav structure, compact header so content is higher on the page

LMS-1296
2014-05-12 10:18:28 -04:00
Sarina Canelake
bc0c13828f Add segment.io tracking for legacy instructor dashboard
LMS-1296
2014-05-12 10:18:28 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard
Fix acceptance and unit tests

LMS-1296
2014-05-12 10:18:28 -04:00
Sarina Canelake
c224fe57ef Add banners to the instructor dashboard
Notification banner to default dash to announce the change

Warning banner on legacy instruction dashboard to explain it has been deprecated

LMS-1296
2014-05-12 10:18:27 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash
LMS-1296
2014-05-12 10:18:27 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug
add problem reset link to staff debug page
2014-05-09 13:29:29 -04:00
Calen Pennington
d5029abfdc Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/templates.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:49:55 -04:00
Victor Shnayder
9dd9422a74 Remove google analytics tracking from iframes used in Drupal course about pages
This fixes two issues:
 - if the course pointed to doesn't exist, GA was added to the iframe twice
 - more importantly, we don't want to count these as separate views anyway--
   we just care about the about page itself.
 - I also added a note about where we would put our segment.io widget if we want it
   later

LMS-2581
2014-04-30 14:34:45 -04:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button
Show a success button at the top of the Progress page
2014-04-25 16:56:58 -04:00
Carson Gee
5775634482 Added jasmine tests and factored out javascript functions to new file 2014-04-23 14:56:32 -04:00
ichuang
64a9ec5bf4 add problem reset link to staff debug page 2014-04-23 14:56:30 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page.
STUD-1306
2014-04-09 10:32:11 -04:00
Sarina Canelake
9a352b9125 Unicode support for course names in reverification flow 2014-04-08 13:11:41 -04:00
Sarina Canelake
034105d2e7 Put mailto and em tags outside i18n strings
Signup modal

Contact us form

courseware-error message
2014-04-08 13:09:08 -04:00
Filippo Valsorda
1ce7a24572 Make the SHOW_PROGRESS_SUCCESS_BUTTON feature more flexible
The button text default is now in the template and i18n-able, a
PROGRESS_SUCCESS_BUTTON_TEXT_OVERRIDE option is offered in settings.
The button url now uses string formatting.
2014-04-05 18:16:28 +02:00
Filippo Valsorda
da5ab6d222 Add SHOW_PROGRESS_SUCCESS_BUTTON feature
Show a button at the top of lms/templates/courseware/progress.html if the
lowest nonzero grade cutoff has been reached. Introduce two settings:
PROGRESS_SUCCESS_BUTTON_URL is the href of that button (the course id is
appended); PROGRESS_SUCCESS_BUTTON_TEXT is the text, defaults to
"Download your certificate"
2014-04-05 18:13:00 +02:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
2014-04-02 11:12:26 -04:00
Abdallah
fe847720ea Upgrade to TinyMCE 4.0.16.
Detailed commit messages:
deleted old tinymce

new tinymce
js changes to support new tinymce
scss changes for alignments

Include all the controls on the toolbar that we previously had.

Changes to support Bulk e-mail usage.

adding new studio skin for TinyMCE4

Get handling of static image links working again.

Delete old Studio skin.

Version 1.3 of CodeMirror plugin.

Modify paths for location of CodeMirror files.

Fire events when CodeMirror Editor is open and closed.

Needed to switch static links back and forth.

Remove CodeMirror tabbed editor.

fixed tinymce visual editor css

Change how we detect that an image has been inserted.

made the codemirror look more studio-like

reordered the tinymce buttons

Update unit tests.

Update acceptance test for image plugin.

Make sure to strip out temporary caret.

It can get left behind in style blocks.

Test for style block being maintained.

Allow TinyMCE to create p's, else formatting doesn't work.

Add tests for toolbar buttons and converting links.

Add test for code format toolbar button.

Remove unnecessary code.

Remove unused testing templates and unused tabs.

Update tinymce paths.

Fire an event with the link plugin closes so we can rewrite links.

pep8

Updates from code review.

Change the name of the button to "Edit HTML".

Changed menu name for consistency, but we don't show it.

Changed name of "code" toolbar button to "Code block".

Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422

Fire events before and after the image dialog is shown.

We use this to rewrite links.

Change the event handling for image plugin.

Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).

Code review feedback.

Fire events before and after the link dialog is shown.

This allows us to convert the static links.

Remove unnecessary helper method.

keeping the component editor inside the component window

Use compressed CodeMirror file.

replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar

Change code editor icon to say HTML.

Move code style block button.

Update tests for minor UI changes.

Code editor button no longer shows an icon, and code style toolbar button location has moved.

Fix typos.
2014-04-02 10:35:27 -04:00
louyihua
3b14ee8a04 Fix a decode error in course_about.html and make some string translatable
The strings in share links should be in unicode, otherwise when the name of a course is non-ascii, it will generate a decode error.
And some of these strings is actually translatable, so they should be collected into mako.po.
2014-04-01 23:49:32 +08:00
David Baumgold
cbfe12fc9c Merge pull request #3088 from fmyzjs/patch-3
Update course_about.html
2014-03-31 13:36:55 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Jason Zhu
a29485960d Update course_about.html
if course title use Chinese or other language got the 500 error when visit the course_about page ,and the log shows :UnicodeEncodeError: 'ascii' codec can't encode characters in position 0-3: ordinal not in range(128)
2014-03-27 23:00:02 +08:00
cahrens
2c79c1fe2f Revert to older version of TinyMCE.
We had trouble with Cloudfront/hashed files and need more time
to investigate.
This reverts commit e8f53ac9dc6d8a1d9928787635c7c5f7e409a9ec.
2014-03-26 11:06:59 -04:00
Gabe Mulley
3f31833178 Clean up references to answer distribution-like things
In the near future an answer distribution report will be displayed in the data download reports table.  In order to avoid confusion, we need to clean up several misleading labels and remove a redundant feature.

Note that the redundant feature is surrounded by a feature flag so that it can be disabled once the report goes live in the table.

Fixes: AN-694
2014-03-24 16:57:56 -04:00
Andy Armstrong
664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade
Upgrade TinyMCE and switch to CodeMirror plugin
2014-03-24 11:53:17 -04:00
cahrens
ffbba2ba0c Update tinymce paths. 2014-03-21 14:41:59 -04: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
c086cbc38d Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions
Catch module render exceptions
2014-03-21 21:12:30 +05:00
Dave St.Germain
3c1df5d96c Merge pull request #2904 from edx/dcs/a11y-header
Remove course name from page H1, and slightly improve sequence navigation
2014-03-20 14:07:32 -04:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds
a page level javascript SR object to enable reading of alert messages.
LMS-2158
2014-03-20 09:53:44 -04:00
Valera Rozuvan
2e8fe6a41c Move loading of YouTube API to video module.
The availability of the YouTube API will be stored in student's settings.
The YouTube API is loaded asynchronously now, so no need to pass a
parameter to the front-end telling it if YouTube API should not be loaded
because of it's unavailability.

Removing loading of YouTube API from Studio RequireJS config. Now loading
of YouTube API is handled by Video module.

BLD-531.
2014-03-19 19:30:45 +02:00